From d12563475acaf53ccca65b5c02e0d751c3f3f9f2 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 13 Aug 2015 08:13:31 -0400 Subject: [PATCH 001/188] libreoffice: improvements. Icons no longer missing (fix #5509). In `*.desktop` files: - Replaced absolute path to the the store by the program name. This is so that files can be dragged elsewhere by the user (e.g.: desktop, bar) and still work after upgrade + garbage collection and can be shared between machines. - Replace program name `soffice` by program name `libreoffice` so that we're sure the desktop file really refers to our package's binary and not start office or open office. Add the possibility of building without the help. This build is not modular and take a really long time to complete so I want a mean of improving shortcuts without having to rebuild the whole thing (see #899). A wrapper script is the next step. Tested (build and ran the program) with `en_US` only and without the help module. --- pkgs/applications/office/libreoffice/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 833b93b8272..3f2e039bd56 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -18,6 +18,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] +, withHelp ? true }: let @@ -136,6 +137,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" "--with-lang=${langsSpaces}" + "${if withHelp then "" else "--without-help"}" + ); chmod a+x ./bin/unpack-sources @@ -176,13 +179,13 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" done mkdir -p "$out/share/desktop" - cp -r sysui/desktop/icons "$out/share/desktop" + cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; From d3bc5765ddbccc9ee116f7a6c11871b081683cfc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2015 12:36:11 +0200 Subject: [PATCH 002/188] python-packages xray: init at 0.6.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42db423a451..715d1df5e35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14752,6 +14752,25 @@ let license = licenses.mit; }; }); + + xray = buildPythonPackage rec { + name = "xray-${version}"; + version = "0.6.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz"; + sha256 = "c8c4aadb0d39662a81c259bd609f42708ff31c90012a9dd0a1f9ee56a798196f"; + }; + + buildInputs = with self; [nose]; + propagatedBuildInputs = with self; [numpy pandas]; + + meta = { + description = "N-D labeled arrays and datasets in Python"; + homepage = https://github.com/xray/xray; + license = licenses.asl20; + }; + }; youtube-dl = callPackage ../tools/misc/youtube-dl { # Release versions don't need pandoc because the formatted man page From cd142cea4f80858bc1e935c1e00ae860c425052b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 28 Aug 2015 19:32:11 -0700 Subject: [PATCH 003/188] vimPlugins.unite: Init at 2015-08-29 unite works nicely together with vimshell. --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e57d498411e..8799ff867c1 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1089,6 +1089,17 @@ rec { }; + unite = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "unite-2015-08-29"; + src = fetchgit { + url = "git://github.com/shougo/unite.vim"; + rev = "7e1152d8fec124a07c7ea953b792dec3816a97f8"; + sha256 = "8284ad86ac3fa130a96618292da2a49421d726174a329b32a8d9fd020b8cfc8b"; + }; + dependencies = []; + + }; + vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-actions-2014-09-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5123e5a72b6..50688011aa4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -51,6 +51,7 @@ "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" +"github:shuogo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:takac/vim-hardtime" From 721dc5164059f235e073d11f8a1e6e1d225be9e4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 28 Aug 2015 20:36:46 +0000 Subject: [PATCH 004/188] telegram-cli: keep arguments passed to the wrapper Also break long lines --- .../instant-messengers/telegram-cli/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 99366da2c84..b5bd22f8877 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib -, libevent, pkgconfig, python, jansson, bash +{ stdenv, fetchgit, bash, libconfig, libevent, openssl, + readline, zlib, lua5_2, python, pkgconfig, jansson }: stdenv.mkDerivation rec { @@ -11,14 +11,17 @@ stdenv.mkDerivation rec { rev = "2052f4b381337d75e783facdbfad56b04dec1a9c"; }; - buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ]; + buildInputs = [ + libconfig libevent openssl readline zlib + lua5_2 python pkgconfig jansson + ]; installPhase = '' mkdir -p $out/bin cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli < Date: Mon, 31 Aug 2015 16:04:32 +0200 Subject: [PATCH 005/188] bdf2psf: init at 1.132 --- pkgs/tools/misc/bdf2psf/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/bdf2psf/default.nix diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix new file mode 100644 index 00000000000..342c014faaa --- /dev/null +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, dpkg }: + +stdenv.mkDerivation rec { + name = "bdf2psf-${version}"; + version = "1.132"; + + src = fetchurl { + url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; + sha256 = "01r8v6qi6klsgi66ld86c78cdz308mywrm9j101d73nsxgx6qhzz"; + }; + + buildInputs = [ dpkg ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = "dpkg-deb -x $src ."; + installPhase = " + substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl + mv usr/bin . + cp -r . $out + "; + + meta = { + description = "BDF to PSF converter"; + homepage = https://packages.debian.org/sid/bdf2psf; + longDescription = '' + Font converter to generate console fonts from BDF source fonts + ''; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ddc4714693..27b24ece369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -721,6 +721,8 @@ let bc = callPackage ../tools/misc/bc { }; + bdf2psf = callPackage ../tools/misc/bdf2psf { }; + bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; From cb976a40ab6de82b17d047944078c63abff7507c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 31 Aug 2015 16:06:22 +0200 Subject: [PATCH 006/188] gohufont: add console version --- pkgs/data/fonts/gohufont/default.nix | 43 ++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 450971524e6..a4e228d7de1 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,26 +1,59 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }: stdenv.mkDerivation rec { name = "gohufont-2.0"; - src = fetchurl { + pcf = fetchurl { url = "http://font.gohu.org/gohufont-2.0.tar.gz"; sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s"; }; - buildInputs = [ mkfontdir mkfontscale ]; + bdf = fetchurl { + url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz"; + sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; + }; + + buildInputs = [ mkfontdir mkfontscale bdf2psf ]; + + unpackPhase = '' + mkdir pcf bdf + tar -xzf $pcf --strip-components=1 -C pcf + tar -xzf $bdf --strip-components=1 -C bdf + ''; installPhase = '' + # convert bdf to psf fonts + sourceRoot="$(pwd)" + mkdir psf + + cd "${bdf2psf}/usr/share/bdf2psf" + for i in $sourceRoot/bdf/*.bdf; do + bdf2psf --fb $i standard.equivalents \ + ascii.set+useful.set+linux.set 512 \ + "$sourceRoot/psf/$(basename $i .bdf).psf" + done + cd "$sourceRoot" + + # install the psf fonts (for the virtual console) + fontDir="$out/share/consolefonts" + mkdir -p "$fontDir" + mv psf/*.psf "$fontDir" + + + # install the pcf fonts (for xorg applications) fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" + mv pcf/*.pcf.gz "$fontDir" + cd "$fontDir" mkfontdir mkfontscale ''; meta = with stdenv.lib; { - description = "A monospace bitmap font well suited for programming and terminal use"; + description = '' + A monospace bitmap font well suited for programming and terminal use + ''; homepage = http://font.gohu.org/; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid ]; From a57e6da65a95b099a05d174c3acd6f4b3f8e2b00 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:39:10 +0200 Subject: [PATCH 007/188] python-plumbum: update 1.4.2 -> 1.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec3d1ae7df5..777b4838176 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9771,13 +9771,13 @@ let }; plumbum = buildPythonPackage rec { - name = "plumbum-1.4.2"; + name = "plumbum-1.5.0"; buildInputs = with self; [ self.six ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz"; - md5 = "38b526af9012a5282ae91dfe372cefd3"; + sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756"; }; }; From ba3e4f6c10d2796fc6570f7ac5aa218f68be7523 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:41:10 +0200 Subject: [PATCH 008/188] python-pymongo: update 2.8 -> 3.0.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 777b4838176..661ef88bb00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11487,11 +11487,11 @@ let }; pymongo = buildPythonPackage rec { - name = "pymongo-2.8"; + name = "pymongo-3.0.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz"; - sha256 = "0d9rlxghqg9dqmcmrlf1lw9ap2g6npv6q4slp5agnm7vci9zchq5"; + sha256 = "3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf"; }; doCheck = false; From 579424f94ae030978c9db2705c60b3d84bd9c34a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:42:39 +0200 Subject: [PATCH 009/188] python-PyYAML: update 3.10 -> 3.11 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 661ef88bb00..0b41b585ea1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11748,11 +11748,11 @@ let pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.10"; + name = "PyYAML-3.11"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; + sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; }; buildInputs = with self; [ pkgs.pyrex ]; From 73c61b6286f4c69e131a0a86283f279f8fd5e310 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:43:27 +0200 Subject: [PATCH 010/188] python-sh: update 1.08 -> 1.11 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b41b585ea1..9e31283c16f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13068,11 +13068,11 @@ let sh = buildPythonPackage rec { - name = "sh-1.08"; + name = "sh-1.11"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; - md5 = "4028bcba85daa0aef579ed24261e88a3"; + md5 = "7af8df6c92d29ff927b6db0146bddec3"; }; doCheck = false; From 96a153925623144e69d436b9c95177bc39e9ef8a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 20:45:45 +0200 Subject: [PATCH 011/188] python-cgroup-utils: init at 0.6 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccce0d2e60d..b43b8385f55 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -143,6 +143,7 @@ kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; lassulus = "Lassulus "; + layus = "Guillaume Maudoux "; lebastr = "Alexander Lebedev "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e31283c16f..7f4d4655967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1104,6 +1104,29 @@ let propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; + cgroup-utils = buildPythonPackage rec { + version = "0.6"; + name = "cgroup-utils-${version}"; + + propagatedBuildInputs = with self; [ argparse ]; + buildInputs = with self; [ pep8 nose ]; + # Pep8 tests fail... + doCheck = false; + + src = pkgs.fetchFromGitHub { + owner = "peo3"; + repo = "cgroup-utils"; + rev = "v${version}"; + sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + }; + + meta = { + description = "Utility tools for control groups of Linux"; + maintainers = with maintainers; [ layus ]; + license = licenses.gpl2; + }; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; From 0db8e6c792948afc247d10e1f97f1c32a7d128c3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 11 Aug 2015 23:59:44 +0200 Subject: [PATCH 012/188] python-PyLTI: init at 0.4.0 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f4d4655967..9aa31d5a99c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4010,6 +4010,29 @@ let }; }; + lti = buildPythonPackage rec { + version = "0.4.0"; + name = "PyLTI-${version}"; + + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; + buildInputs = with self; [ + flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + pytestflakes pytestpep8 sphinx mock + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyLTI/${name}.tar.gz"; + sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh"; + }; + + meta = { + description = "Implementation of IMS LTI interface that works with edX"; + homepage = "https://github.com/mitodl/pylti"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; From 00abee22bee06fdb57ee67cc514ab387deb186c9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:00:59 +0200 Subject: [PATCH 013/188] python-multiprocessing: init at 2.6.2.1 --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9aa31d5a99c..76dfd30a42a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8112,6 +8112,15 @@ let }; }; + multiprocessing = buildPythonPackage rec { + name = "multiprocessing-2.6.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/multiprocessing/${name}.tar.gz"; + md5 = "5cc484396c040102116ccc2355379c72"; + }; + }; + munkres = buildPythonPackage rec { name = "munkres-1.0.6"; From 637097a14295f063fe41ae930b7f005ae88c6eb6 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:01:35 +0200 Subject: [PATCH 014/188] python-simpleldap: init at 0.8 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76dfd30a42a..cbe2fa76400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12785,6 +12785,30 @@ let }; }); + simpleldap = buildPythonPackage rec { + version = "0.8"; + name = "simpleldap-${version}"; + + propagatedBuildInputs = with self; [ ldap ]; + buildInputs = with self; [ pep8 pytest tox ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz"; + md5 = "f8a95b24895596338032ca4b4450f1de"; + }; + + meta = { + description = "A module that makes simple LDAP usage simple"; + longDescription = '' + A small wrapper around the python-ldap library that provides a more + Pythonic interface for LDAP server connections, LDAP objects, and the + common get and search operations. + ''; + license = licenses.mit; + maintainers = with maintainers; [ layus ]; + }; + }; + simpleparse = buildPythonPackage rec { version = "2.1.1"; name = "simpleparse-${version}"; From c070bd7e0a917017d6627dcd03368d1054f2497b Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:03:03 +0200 Subject: [PATCH 015/188] python-tidylib: init at 0.2.4 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cbe2fa76400..228232dd383 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12959,6 +12959,27 @@ let }; }; + tidylib = buildPythonPackage rec { + version = "0.2.4"; + name = "pytidylib-${version}"; + + propagatedBuildInputs = [ pkgs.html-tidy ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz"; + md5 = "2a28267370c9409b592cdb786649cb25"; + }; + + patchPhase = '' + sed -i 's#load_library(name)#load_library("${pkgs.html-tidy}/lib/libtidy.so")#' tidylib/__init__.py + ''; + + meta = { + homepage = " http://countergram.com/open-source/pytidylib/"; + maintainers = with maintainers; [ layus ]; + }; + }; + timelib = buildPythonPackage rec { name = "timelib-0.2.4"; From dee6dc162f3afdedc2626baeeabc0d8ac829f2f6 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:03:54 +0200 Subject: [PATCH 016/188] python-semantic_version: init at 2.4.2 --- pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228232dd383..0d58f9753f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13151,6 +13151,20 @@ let }; }; + semantic-version = buildPythonPackage rec { + name = "semantic_version-2.4.2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz"; + md5 = "fd7d5ade76e78d8540b9a4044496a57c"; + }; + + meta = { + description = "A library implementing the 'SemVer' scheme"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; src = pkgs.fetchurl { From 2dedf83d376117a624f9ced471c4e5092969e201 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:06:48 +0200 Subject: [PATCH 017/188] python-web.py: init at 0.37 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d58f9753f7..3587ed26606 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14746,6 +14746,27 @@ let }; }; + web = buildPythonPackage rec { + version = "0.37"; + name = "web.py-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz"; + md5 = "93375e3f03e74d6bf5c5096a4962a8db"; + }; + + meta = { + description = "Makes web apps"; + longDescription = '' + Think about the ideal way to write a web app. + Write the code to make it happen. + ''; + homepage = "http://webpy.org/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ layus ]; + }; + }; + webob = buildPythonPackage rec { version = "1.4"; name = "webob-${version}"; From 72890773c4b26d3e92aab2093e81a537134cc77b Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:27:53 +0200 Subject: [PATCH 018/188] python-EasyProcess: init at 0.1.9 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3587ed26606..91ccc3db2f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3278,6 +3278,21 @@ let }; }; + easy-process = buildPythonPackage rec { + name = "EasyProcess-0.1.9"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz"; + md5 = "3da72e2fe16781fe5c7b3b0c6c40ee7b"; + }; + + meta = { + description = "Easy to use python subprocess interface"; + homepage = "https://github.com/ponty/EasyProcess"; + licenses = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; elasticsearch = buildPythonPackage (rec { name = "elasticsearch-1.6.0"; From 7d4b026a81b58f25cc6d0e8a0337152bf2828bd9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:28:29 +0200 Subject: [PATCH 019/188] python-PyVirtualDisplay: init at 0.1.5 --- 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 91ccc3db2f2..39dbfd0f967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14544,6 +14544,24 @@ let }; }; + virtual-display = buildPythonPackage rec { + name = "PyVirtualDisplay-0.1.5"; + + propagatedBuildInputs = with self; [ easy-process ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz"; + md5 = "90b65fe15b81788c2e208d124e3a3c14"; + }; + + meta = { + description = "python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + virtualenv = buildPythonPackage rec { name = "virtualenv-1.11.6"; src = pkgs.fetchurl { From c601814cd3b13a9bc9de71cdf29bc4c5564c9bb3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:48:21 +0200 Subject: [PATCH 020/188] python-inginious: init at 0.3.dev1 --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39dbfd0f967..0e1a5258541 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6989,6 +6989,43 @@ let }; }; + inginious = buildPythonPackage rec { + version = "0.3.dev1"; + name = "inginious-${version}"; + + disabled = isPy3k; + + # patched version of docker bindings. + docker-custom = self.docker.override { + name = "docker-1.3.0-dirty"; + src = pkgs.fetchFromGitHub { + owner = "GuillaumeDerval"; + repo = "docker-py"; + rev = "1.3.0-dev"; + sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf"; + }; + }; + + propagatedBuildInputs = with self; [ + requests2 # Needs to be first; + cgroup-utils docker-custom docutils lti multiprocessing pygments pymongo + pyyaml rpyc selenium sh simpleldap tidylib virtual-display web + websocket_client + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz"; + md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; + }; + + meta = { + description = "An intelligent grader that allows secured and automated testing of code made by students."; + homepage = "https://github.com/UCL-INGI/INGInious"; + license = licenses.agpl3; + maintainers = with maintainers; [ layus ]; + }; + }; + iptools = buildPythonPackage rec { version = "0.6.1"; name = "iptools-${version}"; From 6b42cd852a5ac50117f9d59564fa6a6e23cd9dc3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 31 Aug 2015 19:20:03 +0200 Subject: [PATCH 021/188] qalculate-gtk: init at 0.9.7 --- .../science/math/qalculate-gtk/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/science/math/qalculate-gtk/default.nix diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix new file mode 100644 index 00000000000..6bc5d874bc0 --- /dev/null +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: +stdenv.mkDerivation rec { + name = "qalculate-gtk-${version}"; + version = "0.9.7"; + + src = fetchurl { + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; + sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; + }; + + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; + + meta = with stdenv.lib; { + description = "The ultimate desktop calculator"; + homepage = http://qalculate.sourceforge.net; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ddc4714693..02fb5d58d75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2785,6 +2785,8 @@ let ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; From be91ec0fd73cda879e0f4fa709e4ea004798668c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 19:28:43 +0200 Subject: [PATCH 022/188] fmit: qt53Full -> modular qt5 (currently 5.4) See https://github.com/NixOS/nixpkgs/pull/9560. "Native" Qt audio capture is now broken (patches/time welcome). ALSA should work just as well and is now enabled by default until Qt is fixed. --- pkgs/applications/audio/fmit/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 84ec955de3f..50c5449e422 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,7 +1,5 @@ -# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks -# the default Qt audio capture source! -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full -, alsaSupport ? false, alsaLib ? null +{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +, alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null }: assert alsaSupport -> alsaLib != null; @@ -18,7 +16,7 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5Full ] + buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] ++ stdenv.lib.optional jackSupport [ libjack2 ]; From 10d5d9acf4fa24252906163ba2c8f05abc92e04e Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 31 Aug 2015 19:19:14 +0100 Subject: [PATCH 023/188] connman: 1.28 -> 1.30 Built fine, couldn't test though as I don't have a laptop around me at the moment. From the changelog: ``` Fix issue with pending DNS request during server change. Fix issue with empty strings in nameservers configuration. Fix issue with time servers during IP configuration change. Fix issue with 4-way handshake during roaming. Fix issue with open WiFi networks security. Fix issue with support for WiFi AnonymousIdentity. Fix issue with memory leak and DHCPv6 DUID handling. Fix issue with DHCP client and P2P interaction. Fix issue with handling provision file updates. Fix issue with VPN state updates. Disable 6to4 support by default. ``` --- pkgs/tools/networking/connman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 25e4a2cb3ad..75e4155c61d 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.28"; + version = "1.30"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; rev = "refs/tags/${version}"; - sha256 = "13c374bfj7dzlx7zvnnigmk0ck5cy601aqi18n77mcrq9yyxw5y9"; + sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit From 8f86ec0976d1c21598fb037e0ff07a6d8e07d972 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 19:34:57 +0200 Subject: [PATCH 024/188] fmit: add portaudioSupport (off by default) --- pkgs/applications/audio/fmit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 50c5449e422..fe1f4c85c30 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchFromGitHub, fftw, freeglut, qt5 , alsaSupport ? true, alsaLib ? null -, jackSupport ? false, libjack2 ? null }: +, jackSupport ? false, libjack2 ? null +, portaudioSupport ? false, portaudio ? null }: assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; +assert portaudioSupport -> portaudio != null; let version = "1.0.8"; in stdenv.mkDerivation { @@ -18,7 +20,8 @@ stdenv.mkDerivation { buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] - ++ stdenv.lib.optional jackSupport [ libjack2 ]; + ++ stdenv.lib.optional jackSupport [ libjack2 ] + ++ stdenv.lib.optional portaudioSupport [ portaudio ]; configurePhase = '' mkdir build @@ -26,6 +29,7 @@ stdenv.mkDerivation { qmake \ CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \ CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIX="$out" PREFIXSHORTCUT="$out" \ ../fmit.pro ''; From 21a5df097c511f7e668e3833bf71a6fc5af9e072 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 20:07:16 +0200 Subject: [PATCH 025/188] reiser4progs: 1.0.9 -> 1.1.0 --- pkgs/tools/filesystems/reiser4progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 7dfbbf66c0a..662ceba03b8 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.0.9"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "0d6djyd7wjvzbqj738b2z4jr5c2s30g8q8xygipyi0007g42gc7z"; + sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; }; buildInputs = [libaal]; From 11d1eeed7c365f741101977d424807a29040d094 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 20:20:58 +0200 Subject: [PATCH 026/188] xca: 1.3.0 -> 1.3.1 --- pkgs/applications/misc/xca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fdd136cc838..76de3627630 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg"; + sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2"; }; postInstall = '' From d35d9910281e6a3f7fb58043a3e47a250cf70f7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 20:53:41 +0200 Subject: [PATCH 027/188] phc-intel: 0.4.0-rev{17 -> 18} for Linux 4.2 Fix build failure: http://hydra.nixos.org/build/25314451/nixlog/1 --- pkgs/os-specific/linux/phc-intel/default.nix | 50 +++++++++++--------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4c47047ff74..dd5a2741267 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,41 @@ assert stdenv.isLinux; # Don't bother with older versions, though some would probably work: -assert stdenv.lib.versionAtLeast kernel.version "4.0"; +assert stdenv.lib.versionAtLeast kernel.version "4.2"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; -let version = "0.4.0-rev17"; in -stdenv.mkDerivation { +let + release = "0.4.0"; + revbump = "rev18"; # don't forget to change forum download id... + version = "${release}-${revbump}"; +in stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { - sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p"; - url = "http://www.linux-phc.org/forum/download/file.php?id=166"; - name = "phc-intel-pack-rev17.tar.bz2"; + sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27"; + url = "http://www.linux-phc.org/forum/download/file.php?id=167"; + name = "phc-intel-pack-${revbump}.tar.bz2"; }; + buildInputs = [ which ]; + + makeFlags = with kernel; [ + "DESTDIR=$(out)" + "KERNELSRC=${dev}/lib/modules/${modDirVersion}/build" + ]; + + configurePhase = '' + make $makeFlags brave + ''; + + enableParallelBuilding = false; + + installPhase = '' + install -m 755 -d $out/lib/modules/${kernel.version}/extra/ + install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ + ''; + meta = with stdenv.lib; { inherit version; description = "Undervolting kernel driver for Intel processors"; @@ -28,22 +49,7 @@ stdenv.mkDerivation { homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ which ]; - - makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)"; - - configurePhase = '' - echo make $makeFlags brave - ''; - - enableParallelBuilding = false; - - installPhase = '' - install -m 755 -d $out/lib/modules/${kernel.version}/extra/ - install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ - ''; } From 674d0a79924e21e0d04a98eb45c0b4e45f64b0a3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 31 Aug 2015 14:42:05 -0600 Subject: [PATCH 028/188] curaLulzbot: init at 15.02.1-1.03-5064 --- pkgs/applications/misc/cura/lulzbot.nix | 58 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/misc/cura/lulzbot.nix diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix new file mode 100644 index 00000000000..4d13e62bdfe --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, dpkg, bash, python27Packages }: + +let + py = python27Packages; +in +stdenv.mkDerivation rec { + name = "cura-lulzbot"; + version = "15.02.1-1.03-5064"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb"; + sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1"; + } + else throw "${name} is not supported on ${stdenv.system}"; + + python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + pythonPath = python_deps; + propagatedBuildInputs = python_deps; + buildInputs = [ dpkg bash py.wrapPython ]; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = "dpkg-deb -x ${src} ./"; + + installPhase = '' + mkdir -p $out/bin + cp -r usr/share $out/share + find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \; + + cat < $out/bin/cura + #!${bash}/bin/bash + PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@" + EOT + + chmod 555 $out/bin/cura + ''; + + meta = with stdenv.lib; { + description = "3D printing host software for the Lulzbot"; + + longDescription = '' + Cura LulzBot Edition is a fork of the 3D printing/slicing + software from Ultimaker, with changes to support 3D printers + from Aleph Objects. + ''; + + homepage = https://www.lulzbot.com/cura/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ddc4714693..66134bc1d5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12812,6 +12812,8 @@ let cura = callPackage ../applications/misc/cura { }; + curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + peru = callPackage ../applications/version-management/peru {}; printrun = callPackage ../applications/misc/printrun { }; From c0ed5753ac6e03bd6c8e1831dba46cd5c6574902 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 31 Aug 2015 23:56:28 +0300 Subject: [PATCH 029/188] yandex-disk: update 0.1.5.870 -> 0.1.5.905 --- pkgs/tools/filesystems/yandex-disk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index a64b7f55003..97d70d1a45b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc}/lib64"; - sha256 = "061kl186vllqhl1443d9cwvp4qdhqc42yf3x72a1w0bjvn0i3z1i"; + sha256 = "08mmjz061b0hrqp8zg31w089n5bk3sq4r3w84zr33d8pnvkgq2wk"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc}/lib"; - sha256 = "1l9mxlin41w83dn70cvdk1n1vn1dll3d8r120jkqn5jfhicrgvv3"; + sha256 = "1zb6cnldd43nr4k2qg9hnrkgj0iik2gpxqrjypbhwv75hnvjma93"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.870"; + version = "0.1.5.905"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://help.yandex.com/disk/cli-clients.xml; description = "A free cloud file storage service"; - maintainers = with stdenv.lib.maintainers; [smironov]; + maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; longDescription = '' From 1d4135eab9d470d8e697dd03914570947834a608 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 31 Aug 2015 15:09:58 -0600 Subject: [PATCH 030/188] geda: init at 1.8.2-20130925 --- .../science/electronics/geda/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/science/electronics/geda/default.nix diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix new file mode 100644 index 00000000000..03ddf835343 --- /dev/null +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk }: + +stdenv.mkDerivation rec { + name = "geda-${version}"; + version = "1.8.2-20130925"; + + src = fetchurl { + url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; + sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + }; + + configureFlags = "--disable-update-xdg-database"; + buildInputs = [ pkgconfig guile gtk flex gawk ]; + + meta = with stdenv.lib; { + description = "Full GPL'd suite of Electronic Design Automation tools"; + homepage = http://www.geda-project.org/; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ddc4714693..9e05f8447dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14612,6 +14612,8 @@ let caneda = callPackage ../applications/science/electronics/caneda { }; + geda = callPackage ../applications/science/electronics/geda { }; + gtkwave = callPackage ../applications/science/electronics/gtkwave { }; kicad = callPackage ../applications/science/electronics/kicad { From 328f68cb7ebbfadd511b3fd515cfeba4c80523f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 23:57:52 +0200 Subject: [PATCH 031/188] libpsl: list 2015-08-07 -> 2015-08-27 Use fetchFromGitHub for both list and library, removing fetchurl. --- pkgs/development/libraries/libpsl/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 883ba807eda..1c651f72ede 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc -, icu, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +, libxslt, pkgconfig }: let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-08-07"; - listArchive = let - rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab"; - in fetchurl { - sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi"; - url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}"; + listVersion = "2015-08-27"; + listSources = fetchFromGitHub { + sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9"; + rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3"; + repo = "list"; + owner = "publicsuffix"; }; libVersion = "0.8.0"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation { preConfigure = '' # The libpsl check phase requires the list's test scripts (tests/) as well - tar --directory=list --strip-components=1 -xf "${listArchive}" + cp -Rv "${listSources}"/* list ''; configureFlags = "--disable-static --enable-gtk-doc --enable-man"; From adbb5d7ca684ed2794b0fe68d8ee5e64c6d29194 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 31 Aug 2015 23:57:10 +0100 Subject: [PATCH 032/188] youtube-dl: update to 2015.08.28 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index de9d918deeb..e9f7eadc914 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { name = "youtube-dl-${version}"; - version = "2015.08.16.1"; + version = "2015.08.28"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy"; + sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp"; }; buildInputs = [ makeWrapper zip pandoc ]; From f4193da3888c5d6ed5efb45c4fd9706e9f3a548d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 03:27:48 +0200 Subject: [PATCH 033/188] flexc++: 2.02.00 -> 2.03.00 Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice. --- .../tools/parsing/flexc++/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0b9c4fcbc64..3cfd86f477e 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,29 +1,32 @@ -{ stdenv, fetchurl, bobcat, icmake, yodl }: +{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }: -let version = "2.02.00"; in +let version = "2.03.00"; in stdenv.mkDerivation { name = "flexc++-${version}"; - src = fetchurl { - sha256 = "0mz5d0axr4c8rrmn4iw7b5llmf6f3g9cnjzzz3kw02mfzwll79rz"; - url = "mirror://sourceforge/flexcpp/${version}/flexc++_${version}.orig.tar.gz"; + src = fetchFromGitHub { + sha256 = "1knb5h6l71n5zi9xzml5f6v7wspbk7vrcaiy2div8bnj7na3z717"; + rev = version; + repo = "flexcpp"; + owner = "fbb-git"; }; meta = with stdenv.lib; { inherit version; - description = ""; + description = "C++ tool for generating lexical scanners"; longDescription = '' Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design and requires simpler specification files than offered by flex's C++ option. ''; - homepage = http://flexcpp.sourceforge.net/; - downloadPage = http://sourceforge.net/projects/flexcpp/files/; + homepage = https://fbb-git.github.io/flexcpp/; license = licenses.gpl3; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; + sourceRoot = "flexcpp-${version}-src/flexc++"; + buildInputs = [ bobcat ]; nativeBuildInputs = [ icmake yodl ]; From 1c158ecdb4968052a33bd5fda14fd78910d4b051 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 1 Sep 2015 05:10:53 +0300 Subject: [PATCH 034/188] vimPlugins: 2015-09-01 update --- pkgs/misc/vim-plugins/default.nix | 141 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 4 +- 2 files changed, 73 insertions(+), 72 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8799ff867c1..4210ba69485 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -46,6 +46,7 @@ rec { colors-solarized = Solarized; colorsamplerpack = Colour_Sampler_Pack; command_T = command-t; # backwards compat, added 2014-10-18 + css_color_5056 = vim-css-color; easy-align = vim-easy-align; easymotion = vim-easymotion; eighties = vim-eighties; @@ -84,7 +85,6 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -152,22 +152,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-08-23"; + name = "Supertab-2015-08-28"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "43b98dd2c74977a02473d923c159d4110c94273e"; - sha256 = "35255894ad3f6701417b0796d24880d8727e2d4ee05c5bb29c207eb127b435a0"; + rev = "9f7da6d4988daf863ebc414f221bb12c2614f59e"; + sha256 = "18c74fde13eced99e492c7747a7924d1b2c33bfb99a87a6d7c44f1c8ca9e9225"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-08-14"; + name = "Syntastic-2015-08-27"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "47c70b3e1e388d8f9cc7c6d9687efc047df843ac"; - sha256 = "7c6a1dc4eef9ec29c09f3a6f60792a9df78b4d86b7f41fc278ae95670c24b40a"; + rev = "3c2e7e4ce37bc68b54f23c62efd0be291e6dc450"; + sha256 = "a293ae35c1960f9f4149bae5c2c676b5db4b9b1ae0f6ef70a91bca8a55e01986"; }; dependencies = []; @@ -277,11 +277,11 @@ rec { }; - "css_color_5056" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "css_color_5056-2015-06-22"; - src = fetchgit { - url = "git://github.com/ap/vim-css-color"; - rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-css-color-2015-06-22"; + src = fetchgit { + url = "git://github.com/ap/vim-css-color"; + rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd"; }; dependencies = []; @@ -355,11 +355,11 @@ rec { }; vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-vim2nix-2015-06-16"; + name = "vim-addon-vim2nix-2015-09-01"; src = fetchgit { url = "git://github.com/JagaJaga/vim-addon-vim2nix"; - rev = "046702653f7af5829a3f3fda3b7cf89c2a8d03b5"; - sha256 = "b92068c32ce14e75159070acbd86c52e09aaa65a523fd566e44762ed33403161"; + rev = "ce9ddf99983c00adbd41e0d53ad8cead9712069c"; + sha256 = "c4b3b4832684bebbf890741b30b1364ca7240b5348cd0c0ee93d6ba477e8f77d"; }; dependencies = ["vim-addon-manager"]; @@ -399,11 +399,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-08-22"; + name = "neco-ghc-2015-08-28"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "8ef2df39c83826f7beeb3ea290e05223e43d8571"; - sha256 = "7f688cadf2fdb483d9541dd77a893fdca97dc59bed609a9a38a48293939b1e5b"; + rev = "21ba0eba8f9a9787b69c21c45dd286f927220d71"; + sha256 = "62c17fafd98dd1e6357c5c459a38cec2cb622eaad69ab2e8eb5caf2ea593f37b"; }; dependencies = []; @@ -425,7 +425,7 @@ rec { src = fetchgit { url = "git://github.com/fatih/vim-go"; rev = "5048bdbebcffb296aa60b4c21c44ae8276244539"; - sha256 = "1k9r6zdlb553d8zhhswbjph4fa6n17qdvc8zz0cix6h2lw9dr9mj"; + sha256 = "b2a6dc12a7029a1e19f81fb1ddf009d62847e0958b6b083f6aa39445db3739cd"; }; dependencies = []; @@ -623,11 +623,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-08-25"; + name = "racer-2015-08-30"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "7074f2ceb84f121d6b933bacf8f619f313e0fdaf"; - sha256 = "0dc7815d6eb2bd7f934a86a7d7c4acfc85097d7f131a23ccaa39216544aaaf7b"; + rev = "dcebb106b65a083d70d7d87bd7bdf42a72179d96"; + sha256 = "8efec086c394f574cddf09f7b2dfab5062de897f67110e1097a567e2fecf06b1"; }; dependencies = []; buildPhase = '' @@ -659,22 +659,33 @@ rec { }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2015-08-25"; + name = "neosnippet-vim-2015-09-01"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "19dc3db526f4441b7a419dd7899d84d5ab3f599f"; - sha256 = "422448182499941494b1280f93a2b6bc7995531bd2f8af2820d52bdc0c000f66"; + rev = "1617094a8c9df36d9a505f533b3a2efa44039412"; + sha256 = "a061f5943b077219990288e369c6013a730117f2168f08f50d09b0d5032319a9"; + }; + dependencies = []; + + }; + + unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "unite-vim-2015-08-30"; + src = fetchgit { + url = "git://github.com/shougo/unite.vim"; + rev = "f1aa053aae95e0185c5c9667ecd938c4fc37c2c7"; + sha256 = "f1cc089cf82d77df73950f8beefe7caa84f77b9ae995be0aa83a3ebd38a5044e"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-08-22"; + name = "vimproc-vim-2015-08-29"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "150d5fd04fed462831b99539dfe9920a00a7cea6"; - sha256 = "baa6557377d7f64c7cd36bf8f7a5439d31c3d869ec8eb9e1e1e8c0d1c0852ccd"; + rev = "a6bd6893749e3cbfb07230f4284c36b2dc2d8179"; + sha256 = "11473597d678ac45628a8625025cba75945ebce9e5d7eecf20b17901ffb3bf46"; }; dependencies = []; buildInputs = [ which ]; @@ -689,11 +700,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2015-08-25"; + name = "vimshell-vim-2015-08-28"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "05c9001a7fa15aedb444566e2753b901924460a3"; - sha256 = "aa68b059d5c9d00189ab50014924c920391b76bc448bdda4d82ab6de4ec8b435"; + rev = "a1f9a2010bea4b109341f1e2411a32839a8547b3"; + sha256 = "bd2419b50b981e62e25afaa9c5206b818098cd7663cac8566f1d654fbea56ca6"; }; dependencies = [ "vimproc-vim" ]; }; @@ -720,6 +731,17 @@ rec { }; + molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "molokai-2014-04-11"; + src = fetchgit { + url = "git://github.com/tomasr/molokai"; + rev = "db8ce13b3737d3ddea8368498183d7c204a762eb"; + sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { @@ -743,11 +765,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-08-25"; + name = "youcompleteme-2015-08-31"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "b7e9871801392b12187191673f492965d142f8ef"; - sha256 = "a9db1b251d21048bd5d74914b611cc326dfa0a06737be8782f2077e145f53ca3"; + rev = "f94b342989deb1a20b5f87ef2a7d30b16a9ff733"; + sha256 = "0a4d7e30a3ecdb22cb8ffa9bafae8b3bdb160c92ab5e2ce57413f2177e28eedc"; }; dependencies = []; buildInputs = [ @@ -866,11 +888,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2015-08-25"; + name = "vim-wakatime-2015-08-28"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "9bf0d3ec459def5c67a2d9bf5aae8e588a0f3980"; - sha256 = "d2ce4a890c0044f0088e335660c001764a4df075eeafc6ab32871b82f7bb728a"; + rev = "02277aca9907c955e51156ad9685aae75a5da70d"; + sha256 = "7f6b5b99e47d0cd09d6a9649b7150db70008766ceafea59dc80ba74770ee4507"; }; dependencies = []; buildInputs = [ python ]; @@ -926,16 +948,6 @@ rec { ''; }; - molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "molokai-2014-04-11"; - src = fetchgit { - url = "git://github.com/tomasr/molokai"; - rev = "db8ce13b3737d3ddea8368498183d7c204a762eb"; - sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a"; - }; - dependencies = []; - }; - pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "pathogen-2014-11-06"; src = fetchgit { @@ -1089,17 +1101,6 @@ rec { }; - unite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-2015-08-29"; - src = fetchgit { - url = "git://github.com/shougo/unite.vim"; - rev = "7e1152d8fec124a07c7ea953b792dec3816a97f8"; - sha256 = "8284ad86ac3fa130a96618292da2a49421d726174a329b32a8d9fd020b8cfc8b"; - }; - dependencies = []; - - }; - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-actions-2014-09-22"; src = fetchgit { @@ -1354,11 +1355,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-08-17"; + name = "vim-gitgutter-2015-08-26"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "0e66fc915c5c7d8f18eb62f69230393465812fc3"; - sha256 = "cf66babbacd29eda332b0dada2f3f2fe3f3d84b5ae0bb34291303c6f0d6ecb62"; + rev = "1067294cdc379be1deb56074a093b49a8303308f"; + sha256 = "cb9f44e41fbf565eb07968270289bb4988a84f30f03d11f2919c0423c5ee278c"; }; dependencies = []; @@ -1387,11 +1388,11 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2015-08-07"; + name = "vim-multiple-cursors-2015-08-27"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "e37b9358980d312c1f4fbbcb4a36d1a9d4bdb415"; - sha256 = "126694d6b12e710495d390b5df2fa8ae06ca6e2eadec2a04c4a3899287595ce9"; + rev = "146fe47ee6b2faf90d6dc1232ef1858883d798bb"; + sha256 = "916659142dc0abb3a390b56b6ec3c69e489cbbab582e09af8b9aae5b9a792727"; }; dependencies = []; @@ -1420,22 +1421,22 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-08-23"; + name = "vim-snippets-2015-08-31"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "21c7f2052057304f9002b42b53391e2c89197a10"; - sha256 = "11a5cf8bf8f7fbf9100a69c2457d901143aaaeea5bd29884eb93d8b4439b306d"; + rev = "ec99c8c24f541727a648f072a84b9d1ea28f2341"; + sha256 = "5b1cdefc54959db41458898ebeefeb7d4396fbb9e7e2a5d256c4fd47931e5f07"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2015-08-14"; + name = "vim-webdevicons-2015-08-28"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "771769d21615d08b22f23c32e97e67e95db7d122"; - sha256 = "8291c8be6a45d6492ad9ff2972f481d7093fff95c764b3499d0877f5365b3f27"; + rev = "2bc50727340bd43fca65d1baa09c36dda71fff6c"; + sha256 = "3dea4be46ff7e2408d62c0f9a3f5c9fab0fe893e0f343bc4ebb25e1f30801f26"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 50688011aa4..8498053f58c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,4 @@ "vim-webdevicons" -"css_color%5056" "CSApprox" "CheckAttach" "Gist" @@ -24,6 +23,7 @@ "fugitive" "ghcmod" "github:JagaJaga/vim-addon-vim2nix" +"github:ap/vim-css-color" "github:bitc/lushtags" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" @@ -51,7 +51,7 @@ "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" -"github:shuogo/unite.vim" +"github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:takac/vim-hardtime" From 7e4675cb00f81f8533a405ab6ff7b8440b8a851f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 03:46:39 +0200 Subject: [PATCH 035/188] bobcat: 3.25.02 -> 4.00.00 --- pkgs/development/libraries/bobcat/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 2a9ee1c9c5b..87eb1e324ce 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline +{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline , utillinux, yodl }: -let version = "3.25.02"; in +let version = "4.00.00"; in stdenv.mkDerivation { name = "bobcat-${version}"; - src = fetchurl { - sha256 = "0b1370li4q82fqj982vng9cwkf23k2c1df5jsdcgkrk01r53dxry"; - url = "mirror://debian/pool/main/b/bobcat/bobcat_${version}.orig.tar.gz"; + src = fetchFromGitHub { + sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs"; + rev = version; + repo = "bobcat"; + owner = "fbb-git"; }; meta = with stdenv.lib; { inherit version; description = "Brokken's Own Base Classes And Templates"; - downloadPage = http://sourceforge.net/projects/bobcat/files/; + homepage = https://fbb-git.github.io/bobcat/; license = licenses.gpl3; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; buildInputs = [ libmilter libX11 openssl readline utillinux ]; nativeBuildInputs = [ icmake yodl ]; + sourceRoot = "bobcat-${version}-src/bobcat"; + postPatch = '' substituteInPlace INSTALL.im --replace /usr $out patchShebangs ./build From 687d60ec7342564a088f8a8a2d71cd81d5218f1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 03:55:29 +0200 Subject: [PATCH 036/188] icmake: Sourceforge -> (fetchFrom)GitHub Also add myself as a maintainer. CC@ pSub --- .../tools/build-managers/icmake/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index d83ae51aaaa..181a00ce7e1 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +let version = "7.22.01"; in +stdenv.mkDerivation { name = "icmake-${version}"; - version = "7.22.01"; - src = fetchurl { - url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; - sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm"; + src = fetchFromGitHub { + sha256 = "1pgl8bami4v86ja40in4fsdx940f6q85l1s4b9k53zl29pm85v5k"; + rev = version; + repo = "icmake"; + owner = "fbb-git"; }; + sourceRoot = "icmake-${version}-src/icmake"; + preConfigure = '' patchShebangs ./ - sed -i "s;usr/;;g" INSTALL.im + substituteInPlace INSTALL.im --replace "usr/" "" ''; - buildPhase = "./icm_bootstrap $out"; + buildPhase = '' + ./icm_bootstrap $out + ''; - installPhase = "./icm_install all /"; + installPhase = '' + ./icm_install all / + ''; meta = with stdenv.lib; { + inherit version; description = "A program maintenance (make) utility using a C-like grammar"; - homepage = http://icmake.sourceforge.net/; + homepage = https://fbb-git.github.io/icmake/; license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ nckx pSub ]; platforms = platforms.linux; }; } From c2de55e6f85071052e965c309cb5dd694bbed59d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 05:30:16 +0200 Subject: [PATCH 037/188] python-packages: fusepy/gdrivefs platforms -> unix FUSE is available on other Unix-alikes as well. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e1a5258541..af3e24aff9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6216,7 +6216,7 @@ let ''; homepage = http://github.com/terencehonles/fusepy; license = licenses.isc; - platforms = with platforms; linux; + platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; }; }; @@ -6317,7 +6317,7 @@ let ''; homepage = https://github.com/dsoprea/GDriveFS; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; }; }; From cfe12c7edded9a2b7ac5565469291512aeb19e65 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 05:42:12 +0200 Subject: [PATCH 038/188] yodl: Sourceforge -> (fetchFrom)GitHub Cosmetic tweaks; maintain. CC@ pSub --- pkgs/development/tools/misc/yodl/default.nix | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index e5862785717..529e18417c7 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, perl, icmake, utillinux }: +{ stdenv, fetchFromGitHub, perl, icmake, utillinux }: -stdenv.mkDerivation rec { +let version = "3.05.01"; in +stdenv.mkDerivation { name = "yodl-${version}"; - version = "3.05.01"; buildInputs = [ perl icmake ]; - src = fetchurl { - url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; - sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas"; + src = fetchFromGitHub { + sha256 = "02vbayvnz5p0055456i8kc8qxywkhn7agfrx1kwxaalbsnrd4g9h"; + rev = version; + repo = "yodl"; + owner = "fbb-git"; }; + sourceRoot = "yodl-${version}-src/yodl"; + preConfigure = '' - patchShebangs scripts/. - substituteInPlace INSTALL.im --replace /usr $out patchShebangs ./build + patchShebangs scripts/ + substituteInPlace INSTALL.im --replace /usr $out substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt ''; @@ -33,9 +37,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A package that implements a pre-document language and tools to process it"; - homepage = http://yodl.sourceforge.net/; + homepage = https://fbb-git.github.io/yodl/; license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ nckx pSub ]; platforms = platforms.linux; }; } From e94ddc290dba99499a36eb7e9314e2eb292cdef5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Sep 2015 06:43:37 +0200 Subject: [PATCH 039/188] ocaml-bitstring: fix typo in Makefile --- pkgs/development/ocaml-modules/bitstring/2.0.4.nix | 2 +- pkgs/development/ocaml-modules/bitstring/default.nix | 2 +- pkgs/development/ocaml-modules/bitstring/srcdir.patch | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/ocaml-modules/bitstring/srcdir.patch diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix index da4bcdcb527..beaf2fc7fd1 100644 --- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix +++ b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix @@ -8,7 +8,7 @@ buildOcaml rec { sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5"; }; - patches = [ ./camlp4.patch ./meta.patch ]; + patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ]; buildInputs = [time]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index ae01cf9d7b5..2dc1b515c03 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -9,7 +9,7 @@ buildOcaml rec { sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4"; }; - patches = [ ./camlp4-git.patch ./meta.patch ]; + patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; buildInputs = [time autoconf automake]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/srcdir.patch b/pkgs/development/ocaml-modules/bitstring/srcdir.patch new file mode 100644 index 00000000000..d53760f1d6f --- /dev/null +++ b/pkgs/development/ocaml-modules/bitstring/srcdir.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2015-09-01 06:32:15.111441188 +0200 ++++ b/Makefile.in 2015-09-01 06:32:56.001084480 +0200 +@@ -125,7 +125,7 @@ + + byteswap.h: byteswap.in.h + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/byteswap.in.h; \ ++ cat $(top_srcdir)/byteswap.in.h; \ + } > $@-t + mv -f $@-t $@ + From a839a48b0ac1aef11faa812eb6648e6449cd0bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 08:21:46 +0200 Subject: [PATCH 040/188] root: fix build by -lX11 The pkgconfig change didn't help, but I'd leave it in. --- pkgs/applications/science/misc/root/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 57d9fc40ab5..e61cb557e12 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran , libX11,libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i"; }; - buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ]; + buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ]; + + NIX_CFLAGS_LINK = "-lX11"; # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in # /cmake/modules/RootBuildOptions.cmake. From 04fe1dfe3a02f3e2a924155fe620c0950ce539a6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 00:25:47 -0700 Subject: [PATCH 041/188] accelio: 2015-07-28 -> 2015-08-30 --- pkgs/development/libraries/accelio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index 68a4386bba5..6edeacac11e 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "2015-07-28"; + version = "2015-08-30"; src = fetchFromGitHub { owner = "accelio"; repo = "accelio"; - rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61"; - sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j"; + rev = "3d1f2b2d311aa70de9856832fd02647266624e82"; + sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7"; }; postPatch = '' From bada26d5ab77a0a19f92943f2b80a507cec17839 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 00:26:14 -0700 Subject: [PATCH 042/188] ceph-dev: 9.0.2 -> 9.0.3 --- pkgs/tools/filesystems/ceph/dev.nix | 4 ++-- pkgs/tools/filesystems/ceph/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index 5cc183d1053..2d0a1a63306 100644 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "9.0.2"; + version = "9.0.3"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0"; + sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 77d24766f13..d63937f7fbf 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -76,7 +76,7 @@ let hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "10.0.0" && + versionAtLeast version "9.0.3" && optAccelio != null && optLibibverbs != null && optLibrdmacm != null; hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; From b92c4a51e634783ddbe68ac768bcc2dc1163562d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 09:42:08 +0200 Subject: [PATCH 043/188] desktop and xmonad wrappers: preferLocalBuild Also no substitution. --- nixos/modules/services/x11/display-managers/default.nix | 6 +++++- pkgs/applications/window-managers/xmonad/wrapper.nix | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 7e05cd84be6..991043d73c6 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -161,7 +161,11 @@ let exit 0 ''; - mkDesktops = names: pkgs.runCommand "desktops" {} + mkDesktops = names: pkgs.runCommand "desktops" + { # trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; + } '' mkdir -p $out ${concatMapStrings (n: '' diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index cb02a214d5b..e8dc0b1fdac 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -13,4 +13,8 @@ in stdenv.mkDerivation { --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; + + # trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; } From 857038428878aeb6115ab122bf462c62ddc17c97 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 01:18:27 -0700 Subject: [PATCH 044/188] goPackages: Disable failing packages --- 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 0c373d1b215..df7d2709b52 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -609,6 +609,7 @@ let goPackagePath = "google.golang.org/cloud"; buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; excludedPackages = "oauth2"; + meta.hydraPlatforms = [ ]; }; gcloud-golang-compute-metadata = buildGoPackage rec { @@ -1510,6 +1511,7 @@ let owner = "ipfs"; repo = "go-ipfs"; sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; + disabled = !isGo14; }; ldap = buildGoPackage rec { From cf92e411eeb98b495ec5fc9c589f945aa3ac9ba1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 01:35:06 -0700 Subject: [PATCH 045/188] Revert "mongo-tools: fix build" This reverts commit 3e391b839ae6e9d7440bc8626d8f9c1c925aa81b. This is a slower way to build the tools. Lets get this going in parallel again. Instead of replacing the whole install process, keep the parts which work and do just the binary copying ourselves. --- pkgs/top-level/go-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index df7d2709b52..908682d46b4 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1701,11 +1701,14 @@ let # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer - buildPhase = '' + preInstall = '' + mkdir -p $bin/bin while read b; do + rm -f go/bin/main go install $goPackagePath/$b/main - mv go/bin/main go/bin/$b + cp go/bin/main $bin/bin/$b done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a) + rm -r go/bin ''; }; From 3ea329c6aa7ef6ba34b5bd7114b3c8128ff6e487 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 10:45:18 +0200 Subject: [PATCH 046/188] Revert "all-packages: warn when using deprecated attributes" This reverts commit c53018c9a17f878f37b390c0bb21845df81be868. This causes problems for "nix-env -qa", so we'll have to come up with a clean solution first. Issue #9456. --- pkgs/top-level/all-packages.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62653937ef8..57621552a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15282,13 +15282,8 @@ let mg = callPackage ../applications/editors/mg { }; -} - ### Aliases to attributes converted to the dashed-style. - // lib.mapAttrs (name: builtins.trace - ( "Warning: using a deprecated attribute '${name}'." - + " CamelCase and under_scores are replaced by dashed-names" - + " to match the nix-env names better.")) -{ # warnings since 2015-09 + + # Attributes for backward compatibility. adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 @@ -15297,6 +15292,8 @@ let lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 + youtubeDL = youtube-dl; # added 2014-10-26 + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 rdiff_backup = rdiff-backup; # added 2014-11-23 htmlTidy = html-tidy; # added 2014-12-06 libtidy = html-tidy; # added 2014-12-21 @@ -15304,17 +15301,8 @@ let sqliteInteractive = sqlite-interactive; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 - rssglx = rss-glx; #added 2015-03-25 - -} - ### Other attribute aliases for backward compatibility. - // lib.mapAttrs - (name: builtins.trace "Warning: using a deprecated attribute '${name}'.") -{ # warnings since 2015-09 - youtubeDL = youtube-dl; # added 2014-10-26 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 cool-old-term = cool-retro-term; # added 2015-01-31 - + rssglx = rss-glx; #added 2015-03-25 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 inherit (haskell.compiler) jhc uhc; # 2015-05-15 From 217fbea5f98038a3ffc23ea3779d93ccbc9451ce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 10:50:18 +0200 Subject: [PATCH 047/188] Move some misplaced attributes --- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57621552a8a..d87624c37db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -884,6 +884,8 @@ let ent = callPackage ../tools/misc/ent { }; + facter = callPackage ../tools/system/facter {}; + fasd = callPackage ../tools/misc/fasd { }; fop = callPackage ../tools/typesetting/fop { }; @@ -2540,6 +2542,8 @@ let opentracker = callPackage ../applications/networking/p2p/opentracker { }; + opentsdb = callPackage ../tools/misc/opentsdb {}; + openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -9000,6 +9004,8 @@ let groovebasin = callPackage ../applications/audio/groovebasin { }; + hbase = callPackage ../servers/hbase {}; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -12694,6 +12700,8 @@ let unicode3Support = true; }; + udevil = callPackage ../applications/misc/udevil {}; + # urxvt plugins urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { }; urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; @@ -15308,12 +15316,4 @@ let inherit (haskell.compiler) jhc uhc; # 2015-05-15 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 - opentsdb = callPackage ../tools/misc/opentsdb {}; - - hbase = callPackage ../servers/hbase {}; - - udevil = callPackage ../applications/misc/udevil {}; - - facter = callPackage ../tools/system/facter {}; - }; in self; in pkgs From 9013dc5826dfd9d2d376fd0f45f4031a8cfa0c55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 10:52:47 +0200 Subject: [PATCH 048/188] inotifyTools -> inotify-tools Fixes #9456. --- .../networking/p2p/transmission/default.nix | 4 +-- pkgs/servers/mail/dovecot/2.2.x.nix | 4 +-- pkgs/servers/mail/dovecot/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 31 ++++++++++--------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index bf659816c4f..b836e75132c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools, systemd +, openssl, curl, libevent, inotify-tools, systemd , enableGTK3 ? false, gtk3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] + buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] ++ optional stdenv.isLinux systemd; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index a774777709f..be671b7f0e7 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap -, inotifyTools, clucene_core_2, sqlite }: +, inotify-tools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { name = "dovecot-2.2.16"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] - ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; + ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index bd179490c18..3997370154e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotify-tools, openldap}: stdenv.mkDerivation rec { name = "dovecot-2.1.17"; - buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotifyTools]; + buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotify-tools]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d87624c37db..abb1462f6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5639,7 +5639,7 @@ let ino = callPackage ../development/arduino/ino { }; - inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; + inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; @@ -15296,24 +15296,25 @@ let arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bridge_utils = bridge-utils; # added 2015-02-20 - clangAnalyzer = clang-analyzer; # added 2015-02-20 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - jquery_ui = jquery-ui; # added 2014-09-07 - youtubeDL = youtube-dl; # added 2014-10-26 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 - rdiff_backup = rdiff-backup; # added 2014-11-23 - htmlTidy = html-tidy; # added 2014-12-06 - libtidy = html-tidy; # added 2014-12-21 - speedtest_cli = speedtest-cli; # added 2015-02-17 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 - nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 - rssglx = rss-glx; #added 2015-03-25 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 + htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 - cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + inotifyTools = inotify-tools; + jquery_ui = jquery-ui; # added 2014-09-07 + libtidy = html-tidy; # added 2014-12-21 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 + nfsUtils = nfs-utils; # added 2014-12-06 + rdiff_backup = rdiff-backup; # added 2014-11-23 + rssglx = rss-glx; #added 2015-03-25 + speedtest_cli = speedtest-cli; # added 2015-02-17 + sqliteInteractive = sqlite-interactive; # added 2014-12-06 + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 + youtubeDL = youtube-dl; # added 2014-10-26 }; in self; in pkgs From 6e1bee84d36e4f32f920dda6321719c5576f6588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Tue, 1 Sep 2015 10:08:44 +0100 Subject: [PATCH 049/188] rkt: Don't download stage1 image during build. The rkt build process requires a stage1 image. By default it will try and download one with wget from coreos.com during the build. This change explicitly downloads the image using `fetchurl`, verifying checksum, then passes that to the build using appropriate configure flag. --- pkgs/applications/virtualization/rkt/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 71aa7a710f9..e873608733a 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,7 +1,10 @@ { stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio -, fetchFromGitHub }: +, fetchurl, fetchFromGitHub }: -stdenv.mkDerivation rec { +let + coreosImageRelease = "738.1.0"; + +in stdenv.mkDerivation rec { version = "0.8.0"; name = "rkt-${version}"; @@ -12,12 +15,19 @@ stdenv.mkDerivation rec { sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0"; }; + stage1image = fetchurl { + url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; + sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0"; + }; + buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; preConfigure = '' ./autogen.sh ''; + configureFlags = "--with-stage1-image-path=${stage1image}"; + installPhase = '' mkdir -p $out/bin cp -Rv build-rkt-${version}/bin/* $out/bin From dbc6c2be3f8281d794de87651e2e2c27c48b6b42 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 1 Sep 2015 11:09:35 +0200 Subject: [PATCH 050/188] pythonPackages: fix pyutil on pypy platform --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af3e24aff9d..603adab4f0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11756,6 +11756,10 @@ let # package, apparently some kind of plugin. doCheck = false; + prePatch = optionalString isPyPy '' + grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" + ''; + meta = { description = "Pyutil, a collection of mature utilities for Python programmers"; From 24ae56e7fe097200143e29083969b009ed223071 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 1 Sep 2015 11:59:01 +0200 Subject: [PATCH 051/188] ngrok: fix build --- pkgs/tools/misc/ngrok/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index c3019d722af..5b55175217a 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { ''; buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics - yaml-v1 go-bindata go-update binarydist osext ]; + yaml-v1 go-bindata.bin go-update binarydist osext ]; buildFlags = "-tags release"; From 0f78de00b8654a9d0dc9e92a93d0a9ff7aaaad5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 11:09:18 +0200 Subject: [PATCH 052/188] vboot_reference: Fix Git URL --- pkgs/tools/system/vboot_reference/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 087a3212fc2..07349e6ec33 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "vboot_reference-${version}"; src = fetchgit { - url = "http://git.chromium.org/git/chromiumos/platform/vboot_reference.git"; + url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; rev = "refs/changes/${checkout}"; sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; }; From 7f0c5a2c8fbfccdeb1f62bcf75ae0c4456db7ef4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 11:12:36 +0200 Subject: [PATCH 053/188] praat: Update to 5417 Mostly because the old URL didn't work. --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 354a3e43616..03ba33b4834 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: -let version = "5401"; in +let version = "5417"; in stdenv.mkDerivation { name = "praat-${version}"; src = fetchurl { url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; - sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3"; + sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl"; }; configurePhase = '' From 8fc039188e2dfab71930a1c2196d4fb52a76365a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 11:13:00 +0200 Subject: [PATCH 054/188] Mark some packages with undownloadable source as broken --- pkgs/applications/networking/cluster/openshift/default.nix | 1 + pkgs/applications/office/mmex/default.nix | 3 ++- pkgs/applications/science/math/gap/default.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 527ddd99af1..e5f813fcd7d 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.openshift.org; maintainers = with maintainers; [offline]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 2940569ef65..0a28ff9db70 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "money-manager-ex-${version}"; - src = fetchsvn { + src = fetchurl { url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}"; sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq"; }; @@ -31,5 +31,6 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 0700251c3a8..e810879eba6 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -63,5 +63,6 @@ rec { license = with a.lib.licenses; gpl2; homepage = "http://gap-system.org/"; + broken = true; }; }) x From 6cadec8906d8201ddb087a4051b0c272fd4ae51f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 11:33:30 +0200 Subject: [PATCH 055/188] ant: Update to 1.9.6 --- pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 476d2cb8ac5..b15c9065e0e 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.9.4"; in +let version = "1.9.6"; in stdenv.mkDerivation { name = "ant-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90"; + sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; }; contrib = fetchurl { From ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 11:59:01 +0200 Subject: [PATCH 056/188] Fix NFSv4 test http://hydra.nixos.org/build/25349071 --- nixos/modules/services/network-filesystems/nfsd.nix | 5 +---- nixos/tests/nfs.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 33b7ec3d9f1..f1838224098 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -88,10 +88,7 @@ in environment.systemPackages = [ pkgs.nfs-utils ]; - environment.etc = singleton - { source = exports; - target = "exports"; - }; + environment.etc.exports.source = exports; boot.kernelModules = [ "nfsd" ]; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 963776dd2ac..24f6e0f2ed9 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -6,7 +6,7 @@ let { config, pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; - device = "server:${if version == 4 then "/" else "/data"}"; + device = "server:/data"; fsType = "nfs"; options = "vers=${toString version}"; } From 44c12dc0ff131653f35fc63e97257bf089082c21 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 1 Sep 2015 12:14:44 +0200 Subject: [PATCH 057/188] `desktopManagerHandlesLidAndPower default `false` Changes the option and explicitely sets it for each desktopManager. Reasoning: Currently, services.xserver.displayManager.desktopManagerHandlesLidAndPower is set to true by default. This creates a problem for users without desktop environments activated, since lid management simply doesn't work (and they have to be lucky to find this option). See issue #9671 --- nixos/modules/services/x11/desktop-managers/README | 1 + nixos/modules/services/x11/desktop-managers/e19.nix | 1 + nixos/modules/services/x11/desktop-managers/kde4.nix | 1 + nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + nixos/modules/services/x11/desktop-managers/kodi.nix | 3 ++- nixos/modules/services/x11/desktop-managers/xfce.nix | 1 + nixos/modules/services/x11/display-managers/default.nix | 2 +- 7 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/services/x11/desktop-managers/README diff --git a/nixos/modules/services/x11/desktop-managers/README b/nixos/modules/services/x11/desktop-managers/README new file mode 100644 index 00000000000..78c75ff7098 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/README @@ -0,0 +1 @@ +Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`. \ No newline at end of file diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix index 2d5c7b192bc..74065c862ef 100644 --- a/nixos/modules/services/x11/desktop-managers/e19.nix +++ b/nixos/modules/services/x11/desktop-managers/e19.nix @@ -62,6 +62,7 @@ in waitPID=$! ''; }]; + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidPrograms = [ "e19_freqset" ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 21b6243ba18..7830e984219 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -111,6 +111,7 @@ in exec ${kde_workspace}/bin/startkde ''; }; + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidOwners = singleton { program = "kcheckpass"; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 5061d59b7c7..01a8704fea7 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -78,6 +78,7 @@ in bgSupport = true; start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; }; + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; security.setuidOwners = singleton { program = "kcheckpass"; diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index 1e30308a513..e6d6efaf3a6 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -25,7 +25,8 @@ in waitPID=$! ''; }]; + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; environment.systemPackages = [ pkgs.kodi ]; }; -} \ No newline at end of file +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 88eefa13de3..746f810a11f 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -37,6 +37,7 @@ in exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} ''; }; + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; environment.systemPackages = [ pkgs.gtk # To get GTK+'s themes. diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 991043d73c6..98e36954712 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -229,7 +229,7 @@ in desktopManagerHandlesLidAndPower = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether the display manager should prevent systemd from handling lid and power events. This is normally handled by the desktop From bea3ba66bb5eb4921a48e606bfb8d8841773ef4a Mon Sep 17 00:00:00 2001 From: Andreas Wagner Date: Mon, 31 Aug 2015 09:52:01 -0400 Subject: [PATCH 058/188] multimarkdown: init at 4.7.1 --- .../typesetting/multimarkdown/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/typesetting/multimarkdown/default.nix diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix new file mode 100644 index 00000000000..1b6104106ba --- /dev/null +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation rec { + name = "multimarkdown-${version}"; + version = "4.7.1"; + + src = fetchgit { + url = "https://github.com/fletcher/MultiMarkdown-4.git"; + fetchSubmodules = true; + rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b"; + sha256 = "0s7rcxgmv1almlic7bky426x52h7g1pjdhi3y8wf84fpx8c7b6g2"; + }; + + preBuild = '' + substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + buildInputs = [ stdenv ]; + checkPhase = "make test-all"; + installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out"; + + meta = with stdenv.lib; { + description = "A derivative of Markdown that adds new syntax features"; + longDescription = '' + MultiMarkdown is a lightweight markup language created by + Fletcher T. Penney and based on Markdown, which supports + more export-formats (html, latex, beamer, memoir, odf, opml, + lyx, mmd) and implements some added features currently not + available with plain Markdown syntax. + + It adds the following features to Markdown: + + footnotes + tables + citations and bibliography (works best in LaTeX using BibTeX) + math support + automatic cross-referencing ability + smart typography, with support for multiple languages + image attributes + table and image captions + definition lists + glossary entries (LaTeX only) + document metadata (e.g. title, author, date, etc.) + ''; + homepage = "http://fletcherpenney.net/multimarkdown/"; + # licensed under GPLv2+ or MIT: + # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE + license = with stdenv.lib.licenses; [ gpl2Plus ]; + hydraPlatforms = platforms.all; + maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abb1462f6a8..4377ccafa09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12228,6 +12228,8 @@ let inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; + multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; + multimon-ng = callPackage ../applications/misc/multimon-ng { }; multisync = callPackage ../applications/misc/multisync { From 79a8a9327d836d51ed6d9f2752e7bb232e9890d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 12:53:26 +0200 Subject: [PATCH 059/188] Doh --- pkgs/applications/office/mmex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 0a28ff9db70..c45eb7d53d0 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "money-manager-ex-${version}"; - src = fetchurl { + src = fetchsvn { url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}"; sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq"; }; From 3c7f1431c02f53b6aec561e383a3b4b0d33b5621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 1 Sep 2015 13:17:35 +0200 Subject: [PATCH 060/188] helmholtz: unset the curl user-agent to fix the download I've checked this with the developer to ensure it isn't blocked deliberately and she said it was just a problem with the hosting provider, so it is fine to work around it. --- pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 9046ec0a87f..8f04bf116a6 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; name = "helmholtz.zip"; + curlOpts = "--user-agent ''"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; }; From 5d5c053f6886ddbf1b1b45d1de87e5336b94280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 10:57:51 +0200 Subject: [PATCH 061/188] libvdpau: security update 1.1 -> 1.1.1 CVE-2015-{5198,5199,5200} --- pkgs/development/libraries/libvdpau/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index a6da96dc863..6c5d5a91ad8 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-1.1"; + name = "libvdpau-1.1.1"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f"; + url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; + sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; From 1464a4de57a07bd10827283c3d41b03bea9cc63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 11:33:11 +0200 Subject: [PATCH 062/188] nvidia-x11: don't install libvdpau* that we have already Besides being redundant to inject libvdpau via LD_LIBRARY_PATH, currently the drivers come with a vulnerable version. https://devtalk.nvidia.com/default/topic/873035 --- pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 3 +++ pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index 07cc1a85de0..d0eec0f7403 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh @@ -107,6 +107,9 @@ installPhase() { #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* + + # we distribute these separately in `libvdpau` + rm "$out"/lib/libvdpau{.*,_trace.*} } diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 1198208c9da..ba65089a4f7 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -122,6 +122,9 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* + + # we distribute these separately in `libvdpau` + rm "$out"/lib/libvdpau{.*,_trace.*} } From 61cad61ebf40416dd9749f5a50b95f4ca12ce59f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 30 Aug 2015 10:41:43 -0500 Subject: [PATCH 063/188] makeWrapper: accept `--argv0` flag (/cc #9562) By default `makeWrapper` will not set argv[0] (this is a reversion to the old default behavior). Based on the breakage we have seen from changing the default, this is what most people want. The `wrapProgram` function will send `--argv0 '"$0"'` to `makeWrapper`, i.e. it will continue to pass-through the argv[0] that the wrapper is called with. --- pkgs/build-support/setup-hooks/make-wrapper.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index f474ff5e88e..5150b4f0218 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -2,7 +2,7 @@ makeWrapper() { local original=$1 local wrapper=$2 local params varName value command separator n fileNames - local flagsBefore flags + local argv0 flagsBefore flags mkdir -p "$(dirname $wrapper)" @@ -68,11 +68,17 @@ makeWrapper() { n=$((n + 1)) flagsBefore="$flagsBefore $flags" fi + + if test "$p" = "--argv0"; then + argv0=${params[$((n + 1))]} + n=$((n + 1)) + fi done # Note: extraFlagsArray is an array containing additional flags # that may be set by --run actions. - echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper + echo exec ${argv0:+-a $argv0} "$original" \ + $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper chmod +x $wrapper } @@ -98,5 +104,5 @@ wrapProgram() { local prog="$1" local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped mv $prog $hidden - makeWrapper $hidden $prog "$@" + makeWrapper $hidden $prog --argv0 '"$0"' "$@" } From ffb8143cb143d9a1c2bf0814e07f3c09c68467af Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 1 Sep 2015 10:45:58 +0200 Subject: [PATCH 064/188] lttng-modules: 2.6.0-5 -> 2.6.2-1, fixes build on kernel 3.18 --- pkgs/os-specific/linux/lttng-modules/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 5fe065d3cc6..128838c9c5c 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchFromGitHub, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.6.0-5-g1b2a542"; + version = "2.6.2-1-g7a88f8b"; - src = fetchgit { - url = "https://github.com/lttng/lttng-modules.git"; - rev = "1b2a5429de815c95643df2eadf91253909708728"; - sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; + rev = "7a88f8b50696dd71e80c08661159caf8e119bf51"; + sha256 = "1i185dvk4wn7fmmx1zfv6g15x8wi38jmav2dmq0mmy8cvriajq8h"; }; preConfigure = '' From 65c1afd238fbde28afe1c9450b1c0e9567f75875 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 1 Sep 2015 14:37:25 +0200 Subject: [PATCH 065/188] rosegarden: disable parallel builds --- pkgs/applications/audio/rosegarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index b22018f1612..5ee15a92582 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { libsndfile libsamplerate perl makedepend libjack2 ] ++ stdenv.lib.optional withLirc [ lirc ]; - enableParallelBuilding = true; + #enableParallelBuilding = true; issues on hydra meta = with stdenv.lib; { homepage = http://www.rosegardenmusic.com/; From b4ad13f667143a444a82fd9da5b46d65ff32a26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 1 Sep 2015 14:53:32 +0200 Subject: [PATCH 066/188] opencv: add version 3.0 Adding as a separate expression, as it is not api compatible with 2.x. --- pkgs/development/libraries/opencv/3.x.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/opencv/3.x.nix diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix new file mode 100644 index 00000000000..eae31df4796 --- /dev/null +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip +, enableBloat ? false }: + +let v = "3.0.0"; in + +stdenv.mkDerivation rec { + name = "opencv-${v}"; + + src = fetchurl { + url = "https://github.com/Itseez/opencv/archive/${v}.zip"; + sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287"; + }; + + buildInputs = + [ unzip libjpeg libpng libtiff ] + ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = { + description = "Open Computer Vision Library with more than 500 algorithms"; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4377ccafa09..c313641bbbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7790,6 +7790,8 @@ let libpng = libpng12; }; + opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl; From 7234e899131682416d357d531e9397fa3673e108 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Tue, 9 Jun 2015 13:37:36 +0100 Subject: [PATCH 067/188] txt2tags: init at 2.6 txt2tags is a KISS markup language --- pkgs/tools/text/txt2tags/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/text/txt2tags/default.nix diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix new file mode 100644 index 00000000000..365815142d1 --- /dev/null +++ b/pkgs/tools/text/txt2tags/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + version = "2.6"; + name = "txt2tags-${version}"; + + dontBuild = true; + + # Python script, needs the interpreter + propagatedBuildInputs = [ python ]; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/doc" + mkdir -p "$out/share/man/man1/" + sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags" + chmod +x "$out/bin/txt2tags" + gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" + cp doc/userguide.pdf "$out/share/doc" + cp -r extras/ samples/ test/ "$out/share" + ''; + + src = fetchurl { + url = "http://txt2tags.googlecode.com/files/${name}.tgz"; + sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530"; + }; + + meta = { + homepage = http://txt2tags.org/; + description = "A KISS markup language"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c313641bbbd..9ef3449271c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3254,6 +3254,8 @@ let txt2man = callPackage ../tools/misc/txt2man { }; + txt2tags = callPackage ../tools/text/txt2tags { }; + u9fs = callPackage ../servers/u9fs { }; ucl = callPackage ../development/libraries/ucl { }; From 97b27e69c053c2810201f6a72a186234c012b64f Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 1 Sep 2015 16:30:27 +0200 Subject: [PATCH 068/188] Update HOL Light to svn r244. --- pkgs/applications/science/logic/hol_light/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 86d7bfd8427..b50501a6d34 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "232"; + version = "244"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8"; + sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq"; }; buildInputs = [ ocaml findlib camlp5 ]; From 04d6095700454c4ecfd1a22755f57cf5d5987637 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 16:36:18 +0200 Subject: [PATCH 069/188] netsniff-ng: 0.5.9-{86-gd84a6b7 -> 88-ge5570a8} --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 7d94a287968..3df3d114e45 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-86-gd84a6b7"; in +let version = "0.5.9-88-ge5570a8"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "d84a6b7139f3c6d0eb70615543cf368350000e5b"; - sha256 = "1vn84scds93chidcq1dvbwlwzyb935f3116hlgq1q4rwm0225g64"; + rev = "e5570a84d16022dda6de7d5a55f7b7bd53d4a8de"; + sha256 = "0w1l5a49xcwrp78djcs8d4737ndji9jp7x0v5q5yl5jfg0cdgmzc"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From f33f8e1b348151704115b8187dfa6346827d8164 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 15:17:44 +0200 Subject: [PATCH 070/188] emacs-haskell-mode: update to version 13.14-169-g0d3569d --- pkgs/applications/editors/emacs-modes/haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 022827952b6..67d1d71c5ee 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: let - version = "13.14-153-g318ccab"; # git describe --tags + version = "13.14-169-g0d3569d"; # git describe --tags in stdenv.mkDerivation { name = "haskell-mode-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "haskell"; repo = "haskell-mode"; rev = "v${version}"; - sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4"; + sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k"; }; buildInputs = [ emacs texinfo ]; From ebd99dea2fc8b67a8d89254bb8539c3a827b090e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 15:47:51 +0200 Subject: [PATCH 071/188] emacs-dash: update to version 2.11.0 --- pkgs/applications/editors/emacs-modes/dash/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix index aacc33c9b51..c71860992da 100644 --- a/pkgs/applications/editors/emacs-modes/dash/default.nix +++ b/pkgs/applications/editors/emacs-modes/dash/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchurl, emacs}: -let version = "1.5.0"; - -in stdenv.mkDerivation { +let + version = "2.11.0"; +in +stdenv.mkDerivation { name = "emacs-dash-${version}"; src = fetchurl { url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz"; - sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp"; + sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q"; }; buildInputs = [ emacs ]; From bcd3e06f4cad4809177eec2d0ba6c73228f498fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 15:48:25 +0200 Subject: [PATCH 072/188] emacs-git-modes: update to version 1.2.0 --- pkgs/applications/editors/emacs-modes/git-modes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/git-modes/default.nix b/pkgs/applications/editors/emacs-modes/git-modes/default.nix index 8a2ca6eb909..59733fe5bb4 100644 --- a/pkgs/applications/editors/emacs-modes/git-modes/default.nix +++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs }: let - version = "0.15.0-8-g4e10851"; + version = "1.2.0"; in stdenv.mkDerivation { name = "git-modes-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "4e10851843145e0c05fc665683d3b487a57ad114"; - sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag"; + rev = version; + sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd"; }; buildInputs = [ emacs ]; From 881fb00fdf5d39b92548a3af2070a03146615f51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 15:48:51 +0200 Subject: [PATCH 073/188] emacs-magit: update to version 2.2.1 --- .../editors/emacs-modes/magit/default.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 676a86985f8..8d71ca58202 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,33 +1,41 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }: +{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }: -stdenv.mkDerivation rec { - name = "magit-90141025"; +let + version = "2.2.1"; +in +stdenv.mkDerivation { + name = "magit-${version}"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; - sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; + rev = version; + sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz"; }; buildInputs = [ emacs texinfo git ]; - propagatedUserEnvPkgs = [ gitModes ]; + propagatedUserEnvPkgs = [ gitModes dash ]; configurePhase = '' makeFlagsArray=( PREFIX="$out" - EFLAGS="-L ${gitModes}/share/emacs/site-lisp" lispdir="$out/share/emacs/site-lisp" + DASH_DIR="${dash}/share/emacs/site-lisp" + VERSION="${version}" ) + make ''${makeFlagsArray[@]} -C lisp magit-version.el + cp lisp/magit-version.el Documentation/ + cp lisp/magit-version.el . ''; - doCheck = true; + doCheck = false; # one out of 5 tests fails, not sure why checkTarget = "test"; + preCheck = "export EMAIL='Joe Doe '"; - postInstall = '' - mkdir -p $out/bin - mv "bin/"* $out/bin/ - ''; + # postInstall = '' + # mkdir -p $out/bin + # mv "bin/"* $out/bin/ + # ''; meta = { homepage = "https://github.com/magit/magit"; From c30410e2dcf9d58facd7ccc09078cf0ec34cd3b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Aug 2015 17:15:18 +0200 Subject: [PATCH 074/188] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/e6301b9ed82b6daf085089f6f9c1b913871ab2c1 with hackage2nix v20150824-58-g80c45f8 --- .../haskell-modules/hackage-packages.nix | 571 ++++++++++++++---- 1 file changed, 469 insertions(+), 102 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 831556432b9..5280eeef7e0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17,6 +17,7 @@ self: { homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples"; description = "Examples of 3D graphics programming with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "3dmodels" = callPackage @@ -1231,6 +1232,7 @@ self: { homepage = "https://github.com/choener/BenchmarkHistory"; description = "Benchmark functions with history"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "BerkeleyDB" = callPackage @@ -1287,6 +1289,7 @@ self: { homepage = "https://github.com/mchakravarty/BigPixel"; description = "Image editor for pixel art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Binpack" = callPackage @@ -1664,6 +1667,7 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "BluePrintCSS" = callPackage @@ -2447,6 +2451,7 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Chart-gtk" = callPackage @@ -5196,6 +5201,7 @@ self: { homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Fungi" = callPackage @@ -5270,6 +5276,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage @@ -5318,6 +5325,7 @@ self: { jailbreak = true; description = "GLFW-b demo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLFW-task" = callPackage @@ -5333,6 +5341,7 @@ self: { homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLHUI" = callPackage @@ -5345,6 +5354,7 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage @@ -5371,6 +5381,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT" = callPackage @@ -5388,6 +5399,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUtil" = callPackage @@ -5407,6 +5419,7 @@ self: { jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GPX" = callPackage @@ -5429,21 +5442,22 @@ self: { }) {}; "GPipe" = callPackage - ({ mkDerivation, base, Boolean, containers, GLUT, list-tries - , OpenGL, transformers, Vec, Vec-Boolean + ({ mkDerivation, base, Boolean, containers, exception-transformers + , gl, hashtables, linear, transformers }: mkDerivation { pname = "GPipe"; - version = "1.4.1"; - sha256 = "a32faf7b33694017a607b8a8d2263ea3ab664c77c3575de37d37fd7a8f7d3d70"; + version = "2.0"; + sha256 = "65e4c75b3635fa262fd89555ba40508c6bf0d07ef4dcb93fa856d505b795e614"; + revision = "1"; + editedCabalFile = "3828cf5628f91a2aed23c409f068d632e618b050c9e7932ea1cc2217092a1170"; libraryHaskellDepends = [ - base Boolean containers GLUT list-tries OpenGL transformers Vec - Vec-Boolean + base Boolean containers exception-transformers gl hashtables linear + transformers ]; - jailbreak = true; - homepage = "http://www.haskell.org/haskellwiki/GPipe"; - description = "A functional graphics API for programmable GPUs"; - license = stdenv.lib.licenses.bsd3; + homepage = "http://tobbebex.blogspot.se/"; + description = "Typesafe functional GPU graphics programming"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -8216,6 +8230,7 @@ self: { libraryHaskellDepends = [ base hmatrix ]; description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HaskellNN" = callPackage @@ -9573,6 +9588,7 @@ self: { homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "A slightly extended Kalman filter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "KdTree" = callPackage @@ -9867,6 +9883,7 @@ self: { jailbreak = true; description = "A configurable and extensible neural network library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "LambdaPrettyQuote" = callPackage @@ -10709,6 +10726,7 @@ self: { executableHaskellDepends = [ base GLUT random ]; description = "A FRP library based on signal functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "MoeDict" = callPackage @@ -11908,6 +11926,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "OpenGLCheck" = callPackage @@ -12585,6 +12604,7 @@ self: { executableHaskellDepends = [ array base clock GLUT random ]; description = "An imaginary world"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "PortFusion" = callPackage @@ -13277,6 +13297,7 @@ self: { homepage = "http://github.com/Soares/Randometer.hs"; description = "Randomness intuition trainer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "Range" = callPackage @@ -13338,6 +13359,7 @@ self: { homepage = "http://hub.darcs.net/martingw/Rasenschach"; description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Rasterific" = callPackage @@ -13658,6 +13680,7 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -13899,6 +13922,7 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SVGPath" = callPackage @@ -14270,6 +14294,7 @@ self: { homepage = "http://www.geocities.jp/takascience/index_en.html"; description = "A vector shooter game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SimpleAES" = callPackage @@ -14733,6 +14758,7 @@ self: { homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/"; description = "Collection of useful statistical methods"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "Stomp" = callPackage @@ -14962,6 +14988,7 @@ self: { jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "TCache" = callPackage @@ -14984,8 +15011,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "THEff"; - version = "0.1.0.1"; - sha256 = "0fbe048bd845a2917e88bacc47e9d63da757ab15f233e63e876a6115f460663f"; + version = "0.1.1.0"; + sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462"; libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; @@ -15588,6 +15615,7 @@ self: { homepage = "http://haskell.cs.yale.edu/"; description = "Library for Arrowized Graphical User Interfaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "UMM" = callPackage @@ -15682,6 +15710,7 @@ self: { homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Updater" = callPackage @@ -15846,6 +15875,7 @@ self: { homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "ViennaRNA v2 bindings"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ViennaRNAParser" = callPackage @@ -15928,6 +15958,7 @@ self: { jailbreak = true; description = "WebMoney authentication module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "WURFL" = callPackage @@ -16363,6 +16394,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "X11" = callPackage @@ -16932,6 +16964,7 @@ self: { homepage = "https://github.com/pa-ba/abc-puzzle"; description = "Generate instances of the ABC Logic Puzzle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "abcBridge" = callPackage @@ -18908,6 +18941,7 @@ self: { homepage = "http://github.com/dsorokin/aivika-experiment-diagrams"; description = "Diagrams backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "aivika-transformers" = callPackage @@ -20016,6 +20050,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ecs" = callPackage @@ -20304,6 +20339,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-redshift" = callPackage @@ -20376,6 +20412,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-sdb" = callPackage @@ -20448,6 +20485,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ssm" = callPackage @@ -20538,6 +20576,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-test" = callPackage @@ -22131,6 +22170,7 @@ self: { ]; description = "Natural number arithmetic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "arithmoi" = callPackage @@ -23047,6 +23087,7 @@ self: { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "An atomic counter implemented using the FFI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "atomic-primops-vector" = callPackage @@ -24337,27 +24378,27 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring - , conduit, conduit-extra, ConfigFile, directory, filepath, free - , hspec, hspec-expectations, mtl, optparse-applicative, parsec - , pretty, pretty-show, process, QuickCheck, random, semigroups, syb - , template, text, time, transformers, unordered-containers, vector - , yaml + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hspec, hspec-expectations, mtl + , optparse-applicative, parsec, pretty, pretty-show, process + , QuickCheck, random, semigroups, syb, template, text, time + , transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.8"; - sha256 = "71c30f016937045d4400b835f97e94913e929fa5d130a1fe2cc5ece4eb930f65"; + version = "0.5.10"; + sha256 = "df1b11037ace168568c378259b59f6d9a6ccc81ac339389237e825349ee6edb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bifunctors binary bytestring conduit conduit-extra - ConfigFile directory filepath free mtl parsec pretty pretty-show - process QuickCheck random semigroups syb template text time - transformers unordered-containers vector yaml + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free mtl parsec pretty + pretty-show process QuickCheck random semigroups syb template text + time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring optparse-applicative + base bytestring directory optparse-applicative ]; testHaskellDepends = [ aeson base bytestring hspec hspec-expectations QuickCheck @@ -24381,6 +24422,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "backdropper" = callPackage @@ -24641,6 +24683,7 @@ self: { homepage = "http://blog.malde.org/posts/bamstats.html"; description = "A program to extract various information from BAM alignmnet files"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bank-holidays-england" = callPackage @@ -24912,6 +24955,7 @@ self: { homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "base32string" = callPackage @@ -26254,6 +26298,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings" = callPackage @@ -26625,6 +26670,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) blas; lapack = null;}; "bindings-libcddb" = callPackage @@ -26815,6 +26861,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-portaudio" = callPackage @@ -27021,6 +27068,7 @@ self: { homepage = "http://code.mathr.co.uk/binembed"; description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bio" = callPackage @@ -27238,6 +27286,7 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bitarray" = callPackage @@ -27439,6 +27488,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for Data.Bitmap."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bitmaps" = callPackage @@ -27512,6 +27562,7 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gcc_s = null;}; "bitset" = callPackage @@ -27776,6 +27827,7 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "blakesum" = callPackage @@ -28284,6 +28336,7 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber" = callPackage @@ -28302,6 +28355,7 @@ self: { homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber-server" = callPackage @@ -29095,6 +29149,7 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "buffer-builder-aeson" = callPackage @@ -29119,6 +29174,7 @@ self: { jailbreak = true; description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bugzilla" = callPackage @@ -29371,6 +29427,7 @@ self: { homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bv" = callPackage @@ -29934,6 +29991,7 @@ self: { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "c2hsc" = callPackage @@ -32193,6 +32251,7 @@ self: { jailbreak = true; description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cereal" = callPackage @@ -32433,6 +32492,7 @@ self: { ]; description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "cgen" = callPackage @@ -32685,6 +32745,7 @@ self: { homepage = "http://github.com/Aelve/charsetdetect-ae"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "chart-histogram" = callPackage @@ -33433,6 +33494,7 @@ self: { homepage = "http://github.com/thoughtpolice/hs-cityhash"; description = "Bindings to CityHash"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cjk" = callPackage @@ -34085,6 +34147,7 @@ self: { homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "clean-home" = callPackage @@ -36450,6 +36513,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsndfile audio file library"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "conduit-combinators" = callPackage @@ -37009,6 +37073,7 @@ self: { homepage = "https://github.com/scrive/consumers"; description = "Concurrent PostgreSQL data consumers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "container-classes" = callPackage @@ -37071,6 +37136,7 @@ self: { homepage = "http://git.auryn.cz/haskell/containers-benchmark/"; description = "Extensive benchmark suite for containers package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "containers-deepseq" = callPackage @@ -38686,6 +38752,7 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "criterion-plus" = callPackage @@ -38787,6 +38854,7 @@ self: { homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -39669,6 +39737,7 @@ self: { libraryHaskellDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cublas" = callPackage @@ -39701,6 +39770,7 @@ self: { executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cuda" = callPackage @@ -40052,6 +40122,7 @@ self: { homepage = "https://github.com/scvalex/daemons"; description = "Daemons in Haskell made fun and easy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dag" = callPackage @@ -41710,6 +41781,7 @@ self: { homepage = "https://github.com/iand675/datadog"; description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dataenc" = callPackage @@ -43126,8 +43198,8 @@ self: { ({ mkDerivation, base, QuickCheck, safe }: mkDerivation { pname = "dequeue"; - version = "0.1.5"; - sha256 = "b4dbb63aac61981c0a14f6c00b0e8a68f3aecdc2a9051d4bc572d1303d1c8cfc"; + version = "0.1.7"; + sha256 = "ceecc24ce84cabf5df5291eda19400f452d3dc1b102f6ebef2c6c689ec7c5eea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base QuickCheck safe ]; @@ -43429,6 +43501,7 @@ self: { homepage = "https://github.com/luanzhu/devil"; description = "A small tool to make it easier to update program managed by Angel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dewdrop" = callPackage @@ -43574,6 +43647,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-cairo" = callPackage @@ -43595,6 +43669,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-canvas" = callPackage @@ -43674,6 +43749,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-haddock" = callPackage @@ -43706,6 +43782,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-hsqml" = callPackage @@ -43742,6 +43819,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-lib" = callPackage @@ -43766,6 +43844,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-pandoc" = callPackage @@ -43785,6 +43864,7 @@ self: { ]; description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-pdf" = callPackage @@ -43845,6 +43925,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-qrcode" = callPackage @@ -43882,6 +43963,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-rubiks-cube" = callPackage @@ -43896,6 +43978,7 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-solve" = callPackage @@ -43930,6 +44013,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-tikz" = callPackage @@ -43959,6 +44043,7 @@ self: { libraryHaskellDepends = [ base parsec random-fu transformers ]; description = "Simplistic D&D style dice-rolling system"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dice-entropy-conduit" = callPackage @@ -45379,6 +45464,7 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "djinn" = callPackage @@ -45851,6 +45937,7 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "domplate" = callPackage @@ -45997,6 +46084,7 @@ self: { ]; description = "Dungeons of Wor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "download" = callPackage @@ -46884,6 +46972,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dynamic-linker-template" = callPackage @@ -47943,6 +48032,7 @@ self: { homepage = "https://bitbucket.org/davecturner/ekg-rrd"; description = "Passes ekg statistics to rrdtool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ekg-statsd" = callPackage @@ -47971,6 +48061,7 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "elerea" = callPackage @@ -47998,6 +48089,7 @@ self: { executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elerea-sdl" = callPackage @@ -48348,6 +48440,7 @@ self: { homepage = "https://github.com/cocreature/emacs-keys"; description = "library to parse emacs style keybinding into the modifiers and the chars"; license = stdenv.lib.licenses.isc; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "email" = callPackage @@ -48899,6 +48992,7 @@ self: { homepage = "http://epanet.de/developer/haskell.html"; description = "Haskell binding for EPANET"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epass" = callPackage @@ -48929,6 +49023,7 @@ self: { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epoll" = callPackage @@ -48991,6 +49086,7 @@ self: { homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epub-tools" = callPackage @@ -49013,6 +49109,7 @@ self: { homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epubname" = callPackage @@ -49809,6 +49906,7 @@ self: { homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "every-bit-counts" = callPackage @@ -50931,6 +51029,7 @@ self: { homepage = "https://github.com/cscherrer/fastbayes"; description = "Bayesian modeling algorithms accelerated for particular model structures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fastcgi" = callPackage @@ -51954,6 +52053,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "A Linux-only cache system associating values to files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "filediff" = callPackage @@ -53172,6 +53272,7 @@ self: { 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; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fold-debounce-conduit" = callPackage @@ -53193,6 +53294,7 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce-conduit"; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "foldl" = callPackage @@ -54316,6 +54418,7 @@ self: { homepage = "https://github.com/atzeus/FRPNow"; description = "Program awesome stuff with Gloss and frpnow!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "frpnow-gtk" = callPackage @@ -54409,6 +54512,7 @@ self: { homepage = "https://github.com/haskell-fswatch/hfsnotify"; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fst" = callPackage @@ -54460,6 +54564,7 @@ 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 = [ "i686-linux" "x86_64-linux" ]; }) {}; "ftdi" = callPackage @@ -55890,6 +55995,7 @@ self: { jailbreak = true; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "geojson" = callPackage @@ -55924,6 +56030,7 @@ self: { testHaskellDepends = [ base ieee754 QuickCheck ]; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "getemx" = callPackage @@ -56678,6 +56785,7 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-codemirror" = callPackage @@ -56968,6 +57076,7 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {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; @@ -57655,6 +57764,7 @@ self: { libraryHaskellDepends = [ base bytestring OpenGL ]; description = "simple image capture from OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glade" = callPackage @@ -57726,6 +57836,7 @@ self: { homepage = "zyghost.com"; description = "An OpenGL micro framework"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glasso" = callPackage @@ -57902,6 +58013,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss" = callPackage @@ -57919,6 +58031,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-accelerate" = callPackage @@ -57944,6 +58057,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-banana" = callPackage @@ -57959,6 +58073,7 @@ self: { homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-devil" = callPackage @@ -57993,6 +58108,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-game" = callPackage @@ -58005,6 +58121,7 @@ self: { homepage = "https://github.com/mchakravarty/gloss-game"; description = "Gloss wrapper that simplifies writing games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-juicy" = callPackage @@ -58025,6 +58142,7 @@ self: { homepage = "http://github.com/alpmestan/gloss-juicy"; description = "Load any image supported by Juicy.Pixels in your gloss application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster" = callPackage @@ -58041,6 +58159,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster-accelerate" = callPackage @@ -58070,6 +58189,7 @@ self: { jailbreak = true; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-sodium" = callPackage @@ -58083,6 +58203,7 @@ self: { homepage = "https://github.com/Twey/gloss-sodium"; description = "A Sodium interface to the Gloss drawing package"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glpk-hs" = callPackage @@ -58225,6 +58346,7 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gmap" = callPackage @@ -58329,6 +58451,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -59899,6 +60022,7 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk-mac-integration" = callPackage @@ -60120,6 +60244,7 @@ self: { homepage = "http://www.haskell.org/hello/"; description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk2hs-rpn" = callPackage @@ -60157,6 +60282,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -60790,6 +60916,7 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haar" = callPackage @@ -62113,6 +62240,7 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-R" = callPackage @@ -62147,6 +62275,7 @@ self: { homepage = "https://github.com/bitonic/hakyll-agda"; description = "Wrapper to integrate literate Agda files with Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-blaze-templates" = callPackage @@ -62190,6 +62319,7 @@ self: { homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-contrib-links" = callPackage @@ -62267,6 +62397,7 @@ self: { homepage = "https://github.com/meoblast001/hakyll-sass"; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "halberd" = callPackage @@ -62372,6 +62503,7 @@ self: { homepage = "https://github.com/lukexi/halive"; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "halma" = callPackage @@ -62400,6 +62532,7 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haltavista" = callPackage @@ -64477,6 +64610,7 @@ self: { homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage @@ -68364,6 +68498,7 @@ self: { executableHaskellDepends = [ base ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hfov" = callPackage @@ -68649,6 +68784,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hgrib" = callPackage + ({ mkDerivation, base, c2hs, directory, grib_api, hspec }: + mkDerivation { + pname = "hgrib"; + version = "0.1.0.0"; + sha256 = "78d5af24ad0b75315d76f9cbf4cda1f684ffaf2669e23f01aab945210ce2e3da"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ grib_api ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base directory hspec ]; + jailbreak = true; + homepage = "https://github.com/mjakob/hgrib"; + description = "Unofficial bindings for GRIB API"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {grib_api = null;}; + "hharp" = callPackage ({ mkDerivation, base, harp }: mkDerivation { @@ -68889,6 +69044,7 @@ self: { homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "higherorder" = callPackage @@ -68922,6 +69078,7 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Very fast JSON serialisation and parsing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highlight-versions" = callPackage @@ -69207,6 +69364,7 @@ self: { homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hinquire" = callPackage @@ -69944,6 +70102,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "hledger-lib" = callPackage @@ -70249,6 +70408,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) blas; lapack = null;}; "hmatrix-banded" = callPackage @@ -70276,6 +70436,7 @@ self: { homepage = "https://github.com/grtlr/hmatrix-csv"; description = "CSV encoding and decoding for hmatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-glpk" = callPackage @@ -70289,6 +70450,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -70305,6 +70467,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numerical computation"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage @@ -70331,6 +70494,7 @@ self: { homepage = "http://github.com/alanfalloon/hmatrix-mmap"; description = "Memory map Vector from disk into memory efficiently"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-nipals" = callPackage @@ -70345,6 +70509,7 @@ self: { homepage = "http://github.com/alanfalloon/hmatrix-nipals"; description = "NIPALS method for Principal Components Analysis on large data-sets"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-quadprogpp" = callPackage @@ -70370,6 +70535,7 @@ self: { homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-special" = callPackage @@ -70382,6 +70548,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-static" = callPackage @@ -70415,6 +70582,7 @@ self: { homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-syntax" = callPackage @@ -70713,6 +70881,7 @@ self: { homepage = "https://github.com/ian-ross/hnetcdf"; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) netcdf;}; "hnix" = callPackage @@ -72032,8 +72201,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.5.4"; - sha256 = "aaa707242dd380e355527360e0492e913ae1883e02fd942734e37458384012be"; + version = "0.6.0"; + sha256 = "cae208d9d8617d45e999fc61fb9e8e3aba0cb38f98d0f00c96c9aa03a09f35b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72330,6 +72499,7 @@ self: { homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) postgresql;}; "hprotoc" = callPackage @@ -72339,8 +72509,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.1.5"; - sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353"; + version = "2.1.6"; + sha256 = "a2eeff72064c8edae02700e76dc5b37eec5a9bb080a562ac71ea1e4ffca099ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72449,6 +72619,7 @@ self: { homepage = "https://github.com/ccasin/hpuz"; description = "Haskell bindings for libpuz"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hpygments" = callPackage @@ -72522,6 +72693,7 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hquery" = callPackage @@ -72605,6 +72777,7 @@ self: { jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -73338,6 +73511,7 @@ self: { ]; description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "hsc2hs" = callPackage @@ -73387,6 +73561,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsc3-cairo" = callPackage @@ -73665,6 +73840,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsc3-unsafe" = callPackage @@ -73906,6 +74082,7 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsdif" = callPackage @@ -74497,6 +74674,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -74522,6 +74700,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.Vector interface)"; license = stdenv.lib.licenses.lgpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsnock" = callPackage @@ -75459,6 +75638,7 @@ self: { homepage = "http://www.volker-wysk.de/hsshellscript/"; description = "Haskell for Unix shell scripting tasks"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hssourceinfo" = callPackage @@ -76705,6 +76885,7 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "http-server" = callPackage @@ -76954,6 +77135,7 @@ self: { homepage = "http://tomahawkins.org"; description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hub" = callPackage @@ -77976,6 +78158,7 @@ self: { homepage = "https://github.com/rrnewton/hydra-print"; description = "NCurses interface to view multiple ByteString streams in parallel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hydrogen" = callPackage @@ -78756,16 +78939,16 @@ self: { ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint , base, base64-bytestring, binary, blaze-html, blaze-markup , bytestring, cheapskate, containers, deepseq, directory, filepath - , fingertree, haskeline, lens, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, safe, split, text - , time, transformers, transformers-compat, trifecta, uniplate, unix + , fingertree, haskeline, libffi, mtl, network, optparse-applicative + , parsers, pretty, process, safe, split, text, time, transformers + , transformers-compat, trifecta, uniplate, unix , unordered-containers, utf8-string, vector - , vector-binary-instances, xml, zip-archive, zlib + , vector-binary-instances, zip-archive, zlib }: mkDerivation { pname = "idris"; - version = "0.9.18.1"; - sha256 = "48569f1135af66e2bce22379acf347ab67bb12cff98065043d82f4262d9ea475"; + version = "0.9.19"; + sha256 = "1525b7e9c716d1d09520b8e6cb599dad24ced6161e01a4c864fd7fc636405ff3"; configureFlags = [ "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -78773,10 +78956,10 @@ self: { annotated-wl-pprint ansi-terminal ansi-wl-pprint base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree - haskeline lens libffi mtl network optparse-applicative parsers - pretty process safe split text time transformers - transformers-compat trifecta uniplate unix unordered-containers - utf8-string vector vector-binary-instances xml zip-archive zlib + haskeline libffi mtl network optparse-applicative parsers pretty + process safe split text time transformers transformers-compat + trifecta uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive zlib ]; executableHaskellDepends = [ base directory filepath haskeline transformers @@ -78881,8 +79064,8 @@ self: { }: mkDerivation { pname = "ig"; - version = "0.4"; - sha256 = "ed03d66cd64476c6f0065251ad777cdbfb62a740802007218dd24f732fcf723e"; + version = "0.5"; + sha256 = "07d955a37fb619f14941801e2afda7795910137b14856b3b4fb07a9fba661958"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -79166,6 +79349,7 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ihaskell-rlangqq" = callPackage @@ -79302,6 +79486,7 @@ self: { jailbreak = true; description = "bindings to imagemagick library"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -80961,6 +81146,8 @@ self: { pname = "iproute"; version = "1.6.0"; sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0"; + revision = "1"; + editedCabalFile = "ffba769f859a5853a5faaf07c86ff93759aff36e80bf8ba1c2cbc86c3811d01a"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -81346,6 +81533,7 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "islink" = callPackage @@ -81958,6 +82146,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -82510,6 +82699,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jpeg" = callPackage @@ -82963,23 +83153,24 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, scientific, text - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, directory, hspec + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.3.1.0"; - sha256 = "0de2f4abe549c2bee7bdb13e9bdd70137a06140e3b390ad3697a16a7d34ce7c6"; + version = "0.3.2.1"; + sha256 = "8d0b6305079580e833b97a0fbeffaf96d7c30ca6e965e24fed4815f0f2b92772"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring hspec scientific text unordered-containers - vector + aeson base bytestring directory hspec scientific text + unordered-containers vector ]; homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -83251,6 +83442,7 @@ self: { executableToolDepends = [ alex ]; description = "A first-order reasoning toolbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jumpthefive" = callPackage @@ -83351,6 +83543,7 @@ self: { homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "kan-extensions" = callPackage @@ -83829,6 +84022,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -83949,6 +84143,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "kevin" = callPackage @@ -84265,6 +84460,7 @@ self: { homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "knob" = callPackage @@ -84433,6 +84629,7 @@ self: { libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ktx" = callPackage @@ -84446,6 +84643,7 @@ self: { homepage = "https://github.com/corngood/ktx"; description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {egl = null; inherit (pkgs) glew;}; "kure" = callPackage @@ -84629,6 +84827,7 @@ self: { homepage = "http://github.com/jfischoff/lagrangian"; description = "Solve Lagrange multiplier problems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "laika" = callPackage @@ -84690,6 +84889,7 @@ self: { jailbreak = true; description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lambda-devs" = callPackage @@ -85722,8 +85922,8 @@ self: { }: mkDerivation { pname = "language-lua2"; - version = "0.1.0.0"; - sha256 = "0b53673bcaa3445e823e7808b95b109074d29ad3083d02e57bc39ef12619a061"; + version = "0.1.0.2"; + sha256 = "047710b7b055110d773a878db1cf9ee74a05cff2df41ef849af8dd953ec3339d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85741,6 +85941,7 @@ self: { homepage = "http://github.com/mitchellwrosen/language-lua2"; description = "Lua parser and pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "language-mixal" = callPackage @@ -85934,6 +86135,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-qux" = callPackage + ({ mkDerivation, base, containers, either, indents, mtl, parsec + , pretty, transformers + }: + mkDerivation { + pname = "language-qux"; + version = "0.1.1.0"; + sha256 = "c5259a61229368bc90a64b755bb91d21fd6be3392d907db536ae8e752fce1018"; + libraryHaskellDepends = [ + base containers either indents mtl parsec pretty transformers + ]; + homepage = "https://github.com/qux-lang/language-qux"; + description = "Utilities for working with the Qux language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -86369,6 +86586,7 @@ self: { homepage = "https://bitbucket.org/gchrupala/colada"; description = "Online Latent Dirichlet Allocation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ldap-client" = callPackage @@ -86542,6 +86760,7 @@ self: { homepage = "https://github.com/mnacamura/learning-hmm"; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leetify" = callPackage @@ -86635,6 +86854,7 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lendingclub" = callPackage @@ -86970,6 +87190,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -87011,6 +87232,7 @@ self: { homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "levmar-chart" = callPackage @@ -87626,6 +87848,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; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage @@ -87814,6 +88037,7 @@ self: { homepage = "http://github.com/sproingie/haskell-cells/"; description = "Conway's Life cellular automaton"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lifted-async" = callPackage @@ -88019,6 +88243,7 @@ self: { libraryHaskellDepends = [ base hmatrix HUnit ]; description = "LINear Discriminant Analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lindenmayer" = callPackage @@ -88140,6 +88365,7 @@ self: { homepage = "http://hub.darcs.net/thielema/linear-circuit"; description = "Compute resistance of linear electrical circuits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linear-grammar" = callPackage @@ -88184,6 +88410,7 @@ self: { homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linear-vect" = callPackage @@ -88215,8 +88442,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.10.0"; - sha256 = "27a0461fc9fae738a621febf02e54049d21798a9347aaee7777c4d28f27e90b8"; + version = "0.10.1"; + sha256 = "af46c21de8959e8820fea590b7a8526b089f66b0302732cb88c25eacaa038d40"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -88233,8 +88460,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.10.0"; - sha256 = "4fd28d6d557c9a1f2fef6f9d8c6a49f78cedd469ddcd02629a9df515af4424ae"; + version = "0.10.1"; + sha256 = "be9dc6443f46f4e9daa423a649232706bcf4384a80a8d503c61a20de5115d7da"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -88398,6 +88625,7 @@ self: { homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-inotify" = callPackage @@ -88435,6 +88663,7 @@ self: { homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-namespaces" = callPackage @@ -88447,6 +88676,7 @@ self: { homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-perf" = callPackage @@ -88565,6 +88795,7 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lio-simple" = callPackage @@ -89222,6 +89453,8 @@ self: { pname = "llvm-general-pure"; version = "3.4.5.4"; sha256 = "c54ab339f99284222bca1f8e56db701d2981eaf02728529476b818190671844d"; + revision = "1"; + editedCabalFile = "e8c807d23766b51761a9e039e6e6ae4d0a155f1c4054fbe81eddd9f66fb5dd4c"; libraryHaskellDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -89388,6 +89621,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lmdb;}; "load-env" = callPackage @@ -89563,6 +89797,7 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "log-domain" = callPackage @@ -89872,10 +90107,11 @@ self: { }: mkDerivation { pname = "lookup-tables"; - version = "0.1.1.0"; - sha256 = "a3b3380485752abb262c964f633c6f184a65d249658da2ae41de0276151a64b3"; + version = "0.1.1.1"; + sha256 = "bb9ee2cea827e146d510804c6b26c6f1a62032215eba4da7eb5bb67f977c478e"; libraryHaskellDepends = [ base primitive template-haskell ]; testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues"; description = "Statically generate lookup tables using Template Haskell"; license = stdenv.lib.licenses.isc; }) {}; @@ -90209,6 +90445,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ltl" = callPackage @@ -90563,6 +90800,7 @@ self: { homepage = "https://github.com/hvr/lzma"; description = "LZMA/XZ compression and decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage @@ -90640,6 +90878,7 @@ self: { homepage = "https://github.com/hvr/lzma-streams"; description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "maam" = callPackage @@ -90886,6 +91125,7 @@ self: { homepage = "http://hub.darcs.net/thielema/magico"; description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "magma" = callPackage @@ -91603,6 +91843,7 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Working with manifolds in a direct, embedding-free way"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "map-syntax" = callPackage @@ -91995,6 +92236,7 @@ self: { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "mathblog" = callPackage @@ -92300,6 +92542,7 @@ self: { jailbreak = true; homepage = "http://www.cas.mcmaster.ca/~anand/"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mcmc-samplers" = callPackage @@ -93058,8 +93301,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.3.3.0"; - sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab"; + version = "0.3.4.0"; + sha256 = "e355ad50259f24331790f68ba8efcaaf033d225c87f6546ae5c345ad2d87c8d7"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny part of the lens library which you can depend upon"; @@ -93083,13 +93326,13 @@ self: { ({ mkDerivation, array, base, bytestring, containers, microlens }: mkDerivation { pname = "microlens-ghc"; - version = "0.2.1.0"; - sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3"; + version = "0.3.0.0"; + sha256 = "d9bd1660bbfe8b988779c409e8fb770ebd57d0149a5b49002225033971dee67a"; libraryHaskellDepends = [ array base bytestring containers microlens ]; homepage = "http://github.com/aelve/microlens"; - description = "Orphan instances of microlens classes for packages coming with GHC (array, bytestring, containers)"; + description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93115,8 +93358,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.1.3.0"; - sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80"; + version = "0.1.4.0"; + sha256 = "14ff87d02c650ce3ca3a5ebe93f4e918883c4d42efc142d56ee4d96de18e07f6"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -93239,6 +93482,7 @@ self: { homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-util" = callPackage @@ -93695,6 +93939,7 @@ self: { libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ministg" = callPackage @@ -93791,6 +94036,7 @@ self: { homepage = "https://github.com/mokus0/misfortune"; description = "fortune-mod clone"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "missing-foreign" = callPackage @@ -94194,8 +94440,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "0.1.1.31"; - sha256 = "a1b105ee4d257874fc844170dd73decf7035361a27667f10fe8fdcf6da88ec8b"; + version = "0.1.2.0"; + sha256 = "70a4c0f996d4e6787f3dd736f2885c6e2bd5bb0109f333a696b75093971cc31d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95280,6 +95526,7 @@ self: { executableHaskellDepends = [ base filepath hinotify process ]; description = "Do things when files change"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mono-foldable" = callPackage @@ -97634,8 +97881,8 @@ self: { }: mkDerivation { pname = "nationstates"; - version = "0.2.0.1"; - sha256 = "091ddee83ea21b6b8505ef5053c8b6ce58b08a578f8cd51bfe1c32745af0426c"; + version = "0.3.0.0"; + sha256 = "2c4ec0d85f289f5bfef7a386995330d85164e9cf1d834a8ed39ae7a82df0ddd5"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types multiset transformers xml @@ -97832,6 +98079,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ncurses;}; "ndjson-conduit" = callPackage @@ -97933,6 +98181,7 @@ self: { ]; description = "Port of the NeHe OpenGL tutorials to Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "neil" = callPackage @@ -98225,6 +98474,7 @@ self: { homepage = "http://netlink-hs.googlecode.com/"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "netlist" = callPackage @@ -98536,6 +98786,7 @@ self: { homepage = "http://www.leonmergen.com/opensource.html"; description = "Haskell API for Tor anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-api-support" = callPackage @@ -98577,6 +98828,7 @@ self: { homepage = "http://github.com/solatis/haskell-network-attoparsec"; description = "Utility functions for running a parser against a socket"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bitcoin" = callPackage @@ -98777,6 +99029,7 @@ self: { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "network-house" = callPackage @@ -98944,6 +99197,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "network-rpca" = callPackage @@ -99233,6 +99487,7 @@ self: { homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "network-uri" = callPackage @@ -99934,6 +100189,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "not-gloss-examples" = callPackage @@ -100493,6 +100749,7 @@ self: { executableHaskellDepends = [ base bytestring mtl ncurses text ]; description = "Bored? Nyan cat!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "nylas" = callPackage @@ -101209,6 +101466,7 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "open-union" = callPackage @@ -102099,6 +102357,7 @@ self: { homepage = "http://github.com/ekmett/order-statistics/"; description = "L-Estimators for robust statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ordered" = callPackage @@ -103788,6 +104047,7 @@ self: { homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "paypal-api" = callPackage @@ -105928,6 +106188,7 @@ self: { homepage = "https://github.com/jwiegley/pipes-files"; description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "pipes-group" = callPackage @@ -106486,6 +106747,7 @@ self: { homepage = "http://github.com/amcphail/plot"; description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk" = callPackage @@ -106498,6 +106760,7 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk-ui" = callPackage @@ -106515,6 +106778,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk3" = callPackage @@ -106529,6 +106793,7 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-lab" = callPackage @@ -106546,6 +106811,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-lab"; description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plotserver-api" = callPackage @@ -107325,6 +107591,7 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -107485,6 +107752,7 @@ self: { homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "posix-waitpid" = callPackage @@ -107971,6 +108239,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "powermate" = callPackage @@ -108744,6 +109013,7 @@ self: { homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "proc" = callPackage @@ -109549,8 +109819,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.1.5"; - sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd"; + version = "2.1.6"; + sha256 = "81f732202f7bf3e2fc697e5c5be13c46e5ef3af1d3b82d7b4394cf6fea942ebe"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -109564,8 +109834,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.1.5"; - sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0"; + version = "2.1.6"; + sha256 = "7558c7193cb74e90f1f02956d4ecddd5405fc956d64b422e7f105aa512e4332f"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -109914,6 +110184,7 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "pugs-DrIFT" = callPackage @@ -109993,6 +110264,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -110660,6 +110932,7 @@ self: { homepage = "https://github.com/boundedvariation/quantfin"; description = "Quant finance library in pure Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "quantities" = callPackage @@ -111095,10 +111368,9 @@ self: { ({ mkDerivation, base, bytestring, http-types, scotty, text }: mkDerivation { pname = "quickwebapp"; - version = "2.1.0.0"; - sha256 = "3252164d5016faaf251de0794be012d314eaf3b74044313d42a505653977987f"; + version = "2.1.1.0"; + sha256 = "d34f216d527a9462b2f08c52566048d1e807e9e4b869827c8b77be0b8b36cac3"; libraryHaskellDepends = [ base bytestring http-types scotty text ]; - jailbreak = true; description = "A quick webapp generator for any file processing tool"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -111211,6 +111483,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qux" = callPackage + ({ mkDerivation, base, language-qux, mtl, optparse-applicative }: + mkDerivation { + pname = "qux"; + version = "0.1.0.0"; + sha256 = "fb2de869de3645b69c0f4bada356e3d1fd2902cf7d09315f7797eee93dd6f1da"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base language-qux mtl optparse-applicative + ]; + homepage = "https://github.com/qux-lang/qux"; + description = "Command line binary for working with the Qux language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rabocsv2qif" = callPackage ({ mkDerivation, base, old-locale, split, time }: mkDerivation { @@ -111585,6 +111873,7 @@ self: { homepage = "http://github.com/aristidb/random-extras"; description = "Additional functions for random values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "random-fu" = callPackage @@ -111603,6 +111892,7 @@ self: { homepage = "https://github.com/mokus0/random-fu"; description = "Random number generation"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "random-hypergeometric" = callPackage @@ -112084,6 +112374,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-re2/"; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "react-flux" = callPackage @@ -112261,6 +112552,7 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "reactive-fieldtrip" = callPackage @@ -113871,6 +114163,7 @@ self: { homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "relacion" = callPackage @@ -114126,6 +114419,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "renderable" = callPackage + ({ mkDerivation, base, containers, hashable }: + mkDerivation { + pname = "renderable"; + version = "0.0.0.1"; + sha256 = "468bc3379eda6e6782fceb8555b4adb26a391e6ac81f3cb9a5bd24e4f646cc25"; + libraryHaskellDepends = [ base containers hashable ]; + homepage = "http://zyghost.com"; + description = "Provides a nice API for rendering data types that change over time"; + license = stdenv.lib.licenses.mit; + }) {}; + "reord" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114342,6 +114647,7 @@ self: { homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; description = "HMatrix operations for Repa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "repa-plugin" = callPackage @@ -114411,6 +114717,7 @@ self: { ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "repa-stream" = callPackage @@ -114684,6 +114991,7 @@ self: { homepage = "http://hub.darcs.net/thielema/resistor-cube"; description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "resolve-trivial-conflicts" = callPackage @@ -115255,12 +115563,13 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.2.2.1"; - sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c"; + version = "0.2.2.2"; + sha256 = "3e1b2f6f44272a1173483b8d2aa9c4bfa4eb1bc15e99468e7fa3aae156e75f59"; + revision = "1"; + editedCabalFile = "9d91cf76a4c2958487e3ec7ad6e38963cbae63cf8586ca041c71addb84dd009c"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; - jailbreak = true; homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; @@ -117153,6 +117462,7 @@ self: { homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) zlib;}; "samtools-conduit" = callPackage @@ -117175,6 +117485,7 @@ self: { homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Conduit interface to SAM/BAM format files through samtools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "samtools-enumerator" = callPackage @@ -117190,6 +117501,7 @@ self: { ]; description = "Enumerator interface to SamTools library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "samtools-iteratee" = callPackage @@ -117273,6 +117585,7 @@ self: { homepage = "https://github.com/tokiwoousaka/Sarasvati"; description = "audio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sasl" = callPackage @@ -117343,6 +117656,7 @@ self: { homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "satchmo-backends" = callPackage @@ -117424,6 +117738,7 @@ self: { homepage = "https://github.com/msakai/satchmo-toysat"; description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sbv" = callPackage @@ -118367,6 +118682,7 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sdf2p1-parser" = callPackage @@ -118709,6 +119025,7 @@ self: { homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "selectors" = callPackage @@ -119087,6 +119404,7 @@ self: { libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "seqid_0_1_0" = callPackage @@ -119401,6 +119719,7 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "servant-docs" = callPackage @@ -119477,6 +119796,7 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "servant-jquery" = callPackage @@ -120578,6 +120898,7 @@ self: { homepage = "https://github.com/nh2/shared-memory"; description = "POSIX shared memory"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sharedio" = callPackage @@ -122468,8 +122789,8 @@ self: { }: mkDerivation { pname = "smallcheck-series"; - version = "0.4"; - sha256 = "c054bfafa736d2f0f99c0aad8f26bb775d0588e9d076be9e60d8d5842dee3116"; + version = "0.5.1"; + sha256 = "8bee99c89c9437bbaf7f5c203957ed73b0d2e419956f7e509ed5bc8a19728cdd"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -122548,8 +122869,8 @@ self: { }: mkDerivation { pname = "smartcheck"; - version = "0.2.1"; - sha256 = "398104789966eb2cb4e2fa764405d47214923f2a33ee46b0cbc9b618a1237ce6"; + version = "0.2.2"; + sha256 = "3a0aacd5fa0ae6a1748fc3ca19e53a675d46b14b4ddc482c572b63934f1185f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122631,6 +122952,7 @@ self: { homepage = "https://github.com/GetShopTV/smsaero"; description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "smt-lib" = callPackage @@ -122735,20 +123057,18 @@ self: { "smtps-gmail" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , conduit, conduit-extra, cprng-aes, data-default, filepath - , mime-mail, network, resourcet, stringsearch, text, tls - , transformers + , conduit, conduit-extra, data-default, filepath, mime-mail + , network, resourcet, stringsearch, text, tls, transformers }: mkDerivation { pname = "smtps-gmail"; - version = "1.3.0"; - sha256 = "69ef59a99a7552cc4b37826e1e58f6fc1ec8fbdc6f43f67887ed019e719f7e6d"; + version = "1.3.1"; + sha256 = "d70bbd06bd3dec44a96dbaff9a8ddb1af6e67703775df7c297e771e4cdadd39b"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring conduit conduit-extra - cprng-aes data-default filepath mime-mail network resourcet - stringsearch text tls transformers + data-default filepath mime-mail network resourcet stringsearch text + tls transformers ]; - jailbreak = true; homepage = "https://github.com/enzoh/smtps-gmail"; description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; @@ -123882,6 +124202,7 @@ self: { homepage = "http://github.com/bos/snappy"; description = "Bindings to the Google Snappy library for fast compression/decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage @@ -123895,6 +124216,7 @@ self: { homepage = "http://github.com/tatac1/snappy-conduit/"; description = "Conduit bindings for Snappy (see snappy package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-framing" = callPackage @@ -123907,6 +124229,7 @@ self: { homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-iteratee" = callPackage @@ -123959,6 +124282,7 @@ self: { homepage = "https://github.com/pmiddend/sneakyterm"; description = "Tiny, declarative wrapper around ncurses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sneathlane-haste" = callPackage @@ -124090,6 +124414,7 @@ self: { homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "soap" = callPackage @@ -125087,6 +125412,7 @@ self: { homepage = "http://michael.orlitzky.com/code/spline3.php"; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "splines" = callPackage @@ -125324,6 +125650,7 @@ self: { homepage = "https://github.com/yanatan16/haskell-spsa"; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "spy" = callPackage @@ -125875,6 +126202,7 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "stack-prism" = callPackage @@ -126476,6 +126804,7 @@ self: { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statistics-dirichlet" = callPackage @@ -126522,6 +126851,7 @@ self: { homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statistics-linreg" = callPackage @@ -126538,6 +126868,7 @@ self: { homepage = "http://github.com/alpmestan/statistics-linreg"; description = "Linear regression between two samples, based on the 'statistics' package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "stats" = callPackage @@ -126553,6 +126884,7 @@ self: { homepage = "http://github.com/cheecheeo/stats/"; description = "command line statistics"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statsd" = callPackage @@ -126690,6 +127022,7 @@ self: { homepage = "https://github.com/schell/steeloverseer"; description = "A file watcher"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "stemmer" = callPackage @@ -127366,6 +127699,7 @@ self: { base containers tasty tasty-hunit tasty-quickcheck ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "streamproc" = callPackage @@ -128704,8 +129038,8 @@ self: { }: mkDerivation { pname = "sync-mht"; - version = "0.3.6.0"; - sha256 = "a6bd7b06e599844e7e93c5fff857b3b0af4975228f1b75fe25407c051f8ea5b9"; + version = "0.3.7.0"; + sha256 = "ffabd97017d74f64adce7fc4b0ca55e8833ea957327c7eb09ae3daa7a12c3838"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128819,6 +129153,7 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "syntactical" = callPackage @@ -132261,6 +132596,7 @@ self: { homepage = "http://github.com/sheyll/tftp"; description = "A library for building tftp servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tga" = callPackage @@ -133091,6 +133427,7 @@ self: { homepage = "https://github.com/nicta/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "tictactoe3d" = callPackage @@ -133334,6 +133671,7 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Efficient Timestamps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-http" = callPackage @@ -133425,6 +133763,7 @@ self: { homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-recurrence" = callPackage @@ -133554,12 +133893,11 @@ self: { }: mkDerivation { pname = "timeout-control"; - version = "0.1"; - sha256 = "57477679b67deb7845ba0ef78d27096f3b1ee2c2088fc207d95dff944c1a5ef0"; + version = "0.2"; + sha256 = "741854f07709ee30c9e31db04745fefc8a42d00023a494e65d17ae40b41679e6"; libraryHaskellDepends = [ base ghc-prim lifted-base monad-control mtl transformers-base ]; - jailbreak = true; homepage = "http://github.com/alphaHeavy/timeout-control"; description = "Updatable timeouts as a Monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -134597,6 +134935,7 @@ self: { ]; description = "Generic representation of tree transformations"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "transformers_0_4_3_0" = callPackage @@ -135525,6 +135864,7 @@ self: { libraryHaskellDepends = [ base gloss parsec time ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "twentefp-eventloop-graphics" = callPackage @@ -139347,6 +139687,7 @@ self: { ]; description = "Process mpileup output to identify significant differences"; license = "GPL"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "variable-precision" = callPackage @@ -139450,6 +139791,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache"; description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcache-trie" = callPackage @@ -139466,6 +139808,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcard" = callPackage @@ -139537,6 +139880,7 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcswrapper" = callPackage @@ -139612,6 +139956,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for the `vect' low-dimensional linear algebra library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vector_0_10_9_2" = callPackage @@ -140146,6 +140491,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -141152,6 +141498,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wai-middleware-etag" = callPackage @@ -141714,19 +142061,21 @@ self: { "waitra" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-types, regex-applicative, tasty, tasty-hunit - , template-haskell, text, wai, wai-extra + , template-haskell, text, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "waitra"; - version = "0.0.3.0"; - sha256 = "7643fda19b754bc79195fefaaf05ec9c3707bc24e4b12514d53a7ffe20ac3a7a"; + version = "0.0.4.0"; + sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring directory filepath http-types regex-applicative template-haskell text wai ]; + executableHaskellDepends = [ aeson base wai wai-app-static warp ]; testHaskellDepends = [ - aeson base http-types regex-applicative tasty tasty-hunit wai - wai-extra + aeson base http-types tasty tasty-hunit wai wai-extra ]; homepage = "https://github.com/futurice/waitra"; description = "A very simple Wai router"; @@ -143330,6 +143679,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "wordexp(3) wrappers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wordpass" = callPackage @@ -143353,6 +143703,7 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "words" = callPackage @@ -143711,6 +144062,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wxAsteroids" = callPackage @@ -143760,6 +144112,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -143779,6 +144132,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -144037,6 +144391,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -144051,6 +144406,7 @@ self: { homepage = "https://github.com/polachok/xbattbar"; description = "Simple battery indicator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xcb-types" = callPackage @@ -144403,6 +144759,7 @@ self: { testHaskellDepends = [ base unix ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -145511,6 +145868,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xtest" = callPackage @@ -145960,6 +146318,7 @@ self: { homepage = "https://github.com/ksaveljev/yampa-2048"; description = "2048 game clone using Yampa/Gloss"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yaop" = callPackage @@ -146549,6 +146908,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yesod-bootstrap" = callPackage @@ -147795,6 +148155,7 @@ self: { homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-contrib" = callPackage @@ -147897,6 +148258,7 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-rope" = callPackage @@ -147917,6 +148279,7 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-snippet" = callPackage @@ -147929,6 +148292,7 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-solarized" = callPackage @@ -147941,6 +148305,7 @@ self: { homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-spolsky" = callPackage @@ -147954,6 +148319,7 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-vty" = callPackage @@ -148255,6 +148621,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "z3" = callPackage @@ -148278,8 +148645,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "zalgo"; - version = "0.1.0.3"; - sha256 = "74f376016d855eee365ad3d9d7ef1fb42106fbf0d302c918dce26f676b243b2f"; + version = "0.1.1.0"; + sha256 = "9d102c28680942c8c2e1b1636723b31b8af7459e9946e39c771691b66e1dc1ad"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/mniip/zalgo"; description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; From 561fecb239022d58cb88c32241b2ee97f020b865 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 1 Sep 2015 17:38:54 +0200 Subject: [PATCH 075/188] cromfs: use gcc 4.8 to fix build on i686 (ZHF) --- pkgs/tools/archivers/cromfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 342c975fa1f..cd151698f25 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, perl }: +{ stdenv, fetchurl, pkgconfig, fuse, perl, gcc48 }: stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [ pkgconfig fuse perl ]; + buildInputs = [ pkgconfig fuse perl gcc48 ]; meta = { description = "FUSE Compressed ROM filesystem with lzma"; From b3bd3eef38753de8d44236d3ec4cbed30a397a29 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 1 Sep 2015 08:39:45 -0700 Subject: [PATCH 076/188] emacsMacport: 24.5-mac-5.9 -> 24.5-mac-5.10 --- pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index 6ea9fbfdbb6..2b6dca9039f 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.9"; + name = "${emacsName}-mac-5.10"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr"; + sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf"; }; buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; From 64629ec611a438bf7c405d8d8437f80aa7b6e907 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 17:54:48 +0200 Subject: [PATCH 077/188] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/53c766e346c007763844eea101823ce803615955 with hackage2nix v20150824-62-gb54260a --- .../haskell-modules/hackage-packages.nix | 109 ++++++++++++++++-- 1 file changed, 101 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5280eeef7e0..2feabf4a787 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -464,6 +464,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -4688,6 +4689,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -4704,6 +4706,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage @@ -6541,6 +6544,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGL" = callPackage @@ -7210,6 +7214,7 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage @@ -11865,6 +11870,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; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -12632,6 +12638,7 @@ self: { homepage = "http://haskell.org/haskellwiki/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -13253,6 +13260,7 @@ 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 = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -13668,6 +13676,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-mpeg" = callPackage @@ -19001,6 +19010,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "alarmclock" = callPackage @@ -19355,6 +19365,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -19374,6 +19385,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "alsa-midi" = callPackage @@ -19410,6 +19422,7 @@ self: { homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -19430,6 +19443,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -19465,6 +19479,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -26510,6 +26525,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -26645,6 +26661,7 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -26807,6 +26824,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -26943,6 +26961,7 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -37966,6 +37985,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "couch-simple" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , couchdb, data-default, directory, exceptions, filepath + , hjsonschema, hlint, http-client, http-types, integer-gmp, mtl + , random, tasty, tasty-hunit, text, transformers + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "couch-simple"; + version = "0.0.1.0"; + sha256 = "bf62acc13979f31c729e2aba4bb00ad451f026dbdb725ecedd122a806051ab9d"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring data-default exceptions + http-client http-types integer-gmp mtl text transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring data-default directory exceptions filepath + hjsonschema hlint http-client http-types random tasty tasty-hunit + text transformers unordered-containers uuid + ]; + testToolDepends = [ couchdb ]; + homepage = "https://github.com/mdorman/couch-simple"; + description = "A modern, lightweight, complete client for CouchDB"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) couchdb;}; + "couchdb-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, conduit, containers, data-default @@ -40008,6 +40054,7 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cyclotomic" = callPackage @@ -43800,6 +43847,7 @@ self: { homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-html5" = callPackage @@ -46022,6 +46070,7 @@ self: { homepage = "http://github.com/toothbrush/dotfs"; description = "Filesystem to manage and parse dotfiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dotgen" = callPackage @@ -54236,6 +54285,7 @@ self: { homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null;}; "freesect" = callPackage @@ -56812,6 +56862,7 @@ self: { ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-dom-hello" = callPackage @@ -56826,6 +56877,7 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-websockets" = callPackage @@ -57076,7 +57128,7 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {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; @@ -59313,6 +59365,7 @@ self: { homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graphics-formats-collada" = callPackage @@ -59570,6 +59623,7 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "grm" = callPackage @@ -60393,6 +60447,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -64143,6 +64198,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -64162,6 +64218,7 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haskarrow" = callPackage @@ -66719,6 +66776,7 @@ self: { homepage = "https://github.com/k0ral/hbro"; description = "Minimal extensible web-browser"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hbro-contrib" = callPackage @@ -66906,6 +66964,7 @@ self: { homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage @@ -67854,6 +67913,7 @@ self: { homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hen" = callPackage @@ -68910,6 +68970,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "hieraclus" = callPackage @@ -70203,6 +70264,7 @@ self: { homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -75496,6 +75558,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -75564,6 +75627,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsqml-demo-samples" = callPackage @@ -82770,6 +82834,7 @@ self: { ]; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jsaddle-hello" = callPackage @@ -82785,6 +82850,7 @@ self: { homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jsc" = callPackage @@ -83158,8 +83224,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.3.2.1"; - sha256 = "8d0b6305079580e833b97a0fbeffaf96d7c30ca6e965e24fed4815f0f2b92772"; + version = "0.3.2.2"; + sha256 = "4415147dec300d1121121308008a522de79949549c35b23c673d70717ad28029"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -86817,6 +86883,7 @@ self: { homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leksah-server" = callPackage @@ -87493,6 +87560,7 @@ self: { homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {config = null;}; "libcspm" = callPackage @@ -87923,6 +87991,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -89935,6 +90004,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "logic-TPTP" = callPackage @@ -90750,6 +90820,7 @@ self: { homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lye" = callPackage @@ -93462,6 +93533,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -93519,6 +93591,7 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midisurface" = callPackage @@ -97805,6 +97878,7 @@ self: { jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -102912,6 +102986,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pam;}; "panda" = callPackage @@ -108921,6 +108996,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/printxosd"; description = "Simple tool to display some text on an on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "priority-queue" = callPackage @@ -109763,6 +109839,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A wrapper for the proteaaudio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "protobuf" = callPackage @@ -114995,17 +115072,18 @@ self: { }) {}; "resolve-trivial-conflicts" = callPackage - ({ mkDerivation, ansi-terminal, base, Diff, directory, filepath - , mtl, process, unix + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, process, unix }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.0.2"; - sha256 = "98dd5e44b9ff14b6a3809cc7b127785389cdc97abd080ec4a91f436ec583c4b4"; + version = "0.3.1.1"; + sha256 = "4f50a77d04eb304da3c7f93368c4dc5f9e65e705895fa58c018fa0b8f9d79452"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base Diff directory filepath mtl process unix + ansi-terminal base base-compat Diff directory filepath mtl process + unix ]; homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; @@ -116086,6 +116164,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -116746,6 +116825,7 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -116802,6 +116882,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -120420,6 +120501,7 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -133391,6 +133473,7 @@ self: { homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tic-tac-toe" = callPackage @@ -133477,6 +133560,7 @@ self: { homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tidal-vis" = callPackage @@ -134565,6 +134649,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -134578,6 +134663,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "toml" = callPackage @@ -135790,6 +135876,7 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turkish-deasciifier" = callPackage @@ -140803,6 +140890,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage @@ -142849,6 +142937,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage @@ -142880,6 +142969,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -142895,6 +142985,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webpage" = callPackage @@ -145423,6 +145514,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {Xrender = null; inherit (pkgs.xlibs) libXpm; inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; @@ -145678,6 +145770,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/xosd"; description = "A binding to the X on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage From 8c1c38ee27a85d46480005978c59b19936add148 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 17:17:55 +0200 Subject: [PATCH 078/188] haskell-bloomfilter: re-enable 32-bit builds to verify whether the issue has in fact 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 3cef7eeebff..ce9f3c09089 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -575,9 +575,6 @@ self: super: { # This packages compiles 4+ hours on a fast machine. That's just unreasonable. CHXHtml = dontDistribute super.CHXHtml; - # https://github.com/bos/bloomfilter/issues/7 - bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); From 66563862ec3e0ac22a0cc6369eec587fa6dd0fec Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 08:56:47 -0700 Subject: [PATCH 079/188] zfs: Fix build for kernel 4.2 --- pkgs/os-specific/linux/zfs/compat-4.2-1.patch | 29 +++ pkgs/os-specific/linux/zfs/compat-4.2-2.patch | 38 ++++ pkgs/os-specific/linux/zfs/compat-4.2-3.patch | 214 ++++++++++++++++++ pkgs/os-specific/linux/zfs/default.nix | 7 +- 4 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-1.patch create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-2.patch create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-3.patch diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-1.patch b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch new file mode 100644 index 00000000000..a789f82799a --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch @@ -0,0 +1,29 @@ +From e80da86447174b583e4b6cebedae2956fac926ee Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Tue, 14 Jul 2015 14:15:13 -0700 +Subject: [PATCH] Linux 4.2 compat: bdi_setup_and_register() + +The vfs_compat.h header should include the linux/backing-dev.h header +because it depends on the bdi_* functions defined there. In previous +kernels this header was being indirectly included which prevented a +build failure. + +Signed-off-by: Brian Behlendorf +Signed-off-by: Richard Yao +Closes #3596 +--- + include/linux/vfs_compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h +index e8f8448..40832d9 100644 +--- a/include/linux/vfs_compat.h ++++ b/include/linux/vfs_compat.h +@@ -28,6 +28,7 @@ + #define _ZFS_VFS_H + + #include ++#include + + /* + * 2.6.28 API change, diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-2.patch b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch new file mode 100644 index 00000000000..659349c95ac --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch @@ -0,0 +1,38 @@ +From 7eb333fbdde32dbebdcc88c35610159e207237c9 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Tue, 14 Jul 2015 14:57:55 -0700 +Subject: [PATCH] Linux 4.2 compat: remove bio->bi_cnt access + +Linux 4.2 commit torvalds/linux@dac5621 renamed bio->bi_cnt to +bio->__bi_cnt. Because this value is only used once in a block of +debug code it simplest just to remove the PANIC. To my knowledge +this debugging has never been hit or proved useful so this is no +great loss. + +Signed-off-by: Brian Behlendorf +Signed-off-by: Richard Yao +Closes #3596 +--- + module/zfs/vdev_disk.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c +index 9cfc080..eb77c26 100644 +--- a/module/zfs/vdev_disk.c ++++ b/module/zfs/vdev_disk.c +@@ -426,15 +426,6 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, size, error) + dio_request_t *dr = bio->bi_private; + int rc; + +- /* Fatal error but print some useful debugging before asserting */ +- if (dr == NULL) +- PANIC("dr == NULL, bio->bi_private == NULL\n" +- "bi_next: %p, bi_flags: %lx, bi_rw: %lu, bi_vcnt: %d\n" +- "bi_idx: %d, bi_size: %d, bi_end_io: %p, bi_cnt: %d\n", +- bio->bi_next, bio->bi_flags, bio->bi_rw, bio->bi_vcnt, +- BIO_BI_IDX(bio), BIO_BI_SIZE(bio), bio->bi_end_io, +- atomic_read(&bio->bi_cnt)); +- + #ifndef HAVE_2ARGS_BIO_END_IO_T + if (BIO_BI_SIZE(bio)) + return (1); diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-3.patch b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch new file mode 100644 index 00000000000..10ec3ef9cf4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch @@ -0,0 +1,214 @@ +From bd29109f1ac5be68f7f7c8bcb49e1b706fe899f0 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Wed, 15 Jul 2015 10:54:26 -0700 +Subject: [PATCH] Linux 4.2 compat: follow_link() / put_link() + +As of Linux 4.2 the kernel has completely retired the nameidata +structure. One of the few remaining consumers of this interface +were the follow_link() and put_link() callbacks. + +This patch adds the required checks to configure to detect the +interface change and updates the functions accordingly. Migrating +to the simple_follow_link() interface was considered but was decided +against ironically due to the increased complexity. + +It also should be noted that the kernel follow_link() and put_link() +interfaces changes several times after 4.1 and but before 4.2. This +means there is a narrow range of kernel commits which never appear +in an official tag of the Linux kernel which ZoL will not build. + +Signed-off-by: Brian Behlendorf +Signed-off-by: Richard Yao +Issue #3596 +--- + config/kernel-create-nameidata.m4 | 4 ++-- + config/kernel-follow-link-nameidata.m4 | 24 ++++++++++++++++++++++++ + config/kernel-lookup-nameidata.m4 | 4 ++-- + config/kernel-put-link-nameidata.m4 | 23 +++++++++++++++++++++++ + config/kernel.m4 | 2 ++ + module/zfs/zpl_inode.c | 31 +++++++++++++++++++++++++++---- + 6 files changed, 80 insertions(+), 8 deletions(-) + create mode 100644 config/kernel-follow-link-nameidata.m4 + create mode 100644 config/kernel-put-link-nameidata.m4 + +diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4 +index 9aad46f..a71490a 100644 +--- a/config/kernel-create-nameidata.m4 ++++ b/config/kernel-create-nameidata.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # 3.6 API change + dnl # + AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ +- AC_MSG_CHECKING([whether iops->create() takes struct nameidata]) ++ AC_MSG_CHECKING([whether iops->create() passes nameidata]) + ZFS_LINUX_TRY_COMPILE([ + #include + +@@ -22,7 +22,7 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1, +- [iops->create() operation takes nameidata]) ++ [iops->create() passes nameidata]) + ],[ + AC_MSG_RESULT(no) + ]) +diff --git a/config/kernel-follow-link-nameidata.m4 b/config/kernel-follow-link-nameidata.m4 +new file mode 100644 +index 0000000..88c85ac +--- /dev/null ++++ b/config/kernel-follow-link-nameidata.m4 +@@ -0,0 +1,24 @@ ++dnl # ++dnl # 4.2 API change ++dnl # This kernel retired the nameidata structure which forced the ++dnl # restructuring of the follow_link() prototype and how it is called. ++dnl # We check for the new interface rather than detecting the old one. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [ ++ AC_MSG_CHECKING([whether iops->follow_link() passes nameidata]) ++ ZFS_LINUX_TRY_COMPILE([ ++ #include ++ const char *follow_link(struct dentry *de, void **cookie) ++ { return "symlink"; } ++ static struct inode_operations iops __attribute__ ((unused)) = { ++ .follow_link = follow_link, ++ }; ++ ],[ ++ ],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1, ++ [iops->follow_link() nameidata]) ++ ]) ++]) +diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4 +index 6455603..43f5fb4 100644 +--- a/config/kernel-lookup-nameidata.m4 ++++ b/config/kernel-lookup-nameidata.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # 3.6 API change + dnl # + AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ +- AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata]) ++ AC_MSG_CHECKING([whether iops->lookup() passes nameidata]) + ZFS_LINUX_TRY_COMPILE([ + #include + +@@ -18,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1, +- [iops->lookup() operation takes nameidata]) ++ [iops->lookup() passes nameidata]) + ],[ + AC_MSG_RESULT(no) + ]) +diff --git a/config/kernel-put-link-nameidata.m4 b/config/kernel-put-link-nameidata.m4 +new file mode 100644 +index 0000000..0181ae5 +--- /dev/null ++++ b/config/kernel-put-link-nameidata.m4 +@@ -0,0 +1,23 @@ ++dnl # ++dnl # 4.2 API change ++dnl # This kernel retired the nameidata structure which forced the ++dnl # restructuring of the put_link() prototype and how it is called. ++dnl # We check for the new interface rather than detecting the old one. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [ ++ AC_MSG_CHECKING([whether iops->put_link() passes nameidata]) ++ ZFS_LINUX_TRY_COMPILE([ ++ #include ++ void put_link(struct inode *ip, void *cookie) { return; } ++ static struct inode_operations iops __attribute__ ((unused)) = { ++ .put_link = put_link, ++ }; ++ ],[ ++ ],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_PUT_LINK_NAMEIDATA, 1, ++ [iops->put_link() nameidata]) ++ ]) ++]) +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 806c574..5c97659 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -70,6 +70,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ + ZFS_AC_KERNEL_MKDIR_UMODE_T + ZFS_AC_KERNEL_LOOKUP_NAMEIDATA + ZFS_AC_KERNEL_CREATE_NAMEIDATA ++ ZFS_AC_KERNEL_FOLLOW_LINK ++ ZFS_AC_KERNEL_PUT_LINK + ZFS_AC_KERNEL_TRUNCATE_RANGE + ZFS_AC_KERNEL_AUTOMOUNT + ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE +diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c +index 31251e7..70b5e12 100644 +--- a/module/zfs/zpl_inode.c ++++ b/module/zfs/zpl_inode.c +@@ -348,8 +348,13 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name) + return (error); + } + ++#ifdef HAVE_FOLLOW_LINK_NAMEIDATA + static void * + zpl_follow_link(struct dentry *dentry, struct nameidata *nd) ++#else ++const char * ++zpl_follow_link(struct dentry *dentry, void **symlink_cookie) ++#endif + { + cred_t *cr = CRED(); + struct inode *ip = dentry->d_inode; +@@ -372,17 +377,28 @@ zpl_follow_link(struct dentry *dentry, struct nameidata *nd) + cookie = spl_fstrans_mark(); + error = -zfs_readlink(ip, &uio, cr); + spl_fstrans_unmark(cookie); +- if (error) { ++ ++ if (error) + kmem_free(link, MAXPATHLEN); ++ ++ crfree(cr); ++ ++#ifdef HAVE_FOLLOW_LINK_NAMEIDATA ++ if (error) + nd_set_link(nd, ERR_PTR(error)); +- } else { ++ else + nd_set_link(nd, link); +- } + +- crfree(cr); + return (NULL); ++#else ++ if (error) ++ return (ERR_PTR(error)); ++ else ++ return (*symlink_cookie = link); ++#endif + } + ++#ifdef HAVE_PUT_LINK_NAMEIDATA + static void + zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr) + { +@@ -391,6 +407,13 @@ zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr) + if (!IS_ERR(link)) + kmem_free(link, MAXPATHLEN); + } ++#else ++static void ++zpl_put_link(struct inode *unused, void *symlink_cookie) ++{ ++ kmem_free(symlink_cookie, MAXPATHLEN); ++} ++#endif + + static int + zpl_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 399169b364e..a4aa7b036b3 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -10,5 +10,10 @@ callPackage ./generic.nix (args // rec { sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37"; }; - patches = [ ./nix-build.patch ]; + patches = [ + ./nix-build.patch + ./compat-4.2-1.patch + ./compat-4.2-2.patch + ./compat-4.2-3.patch + ]; }) From 2b71e4643e33c427c26efc16b69765170b292cca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 18:01:34 +0200 Subject: [PATCH 080/188] haskell-bloomfilter: patch to fix build on 32 bit platforms --- .../haskell-modules/configuration-common.nix | 3 ++ .../patches/bloomfilter-fix-on-32bit.patch | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce9f3c09089..b0b93e2d530 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1013,4 +1013,7 @@ self: super: { # https://github.com/GaloisInc/DSA/issues/1 DSA = dontCheck super.DSA; + # https://github.com/bos/bloomfilter/issues/7 + bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch; + } diff --git a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch new file mode 100644 index 00000000000..7b32dcb4ab6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch @@ -0,0 +1,28 @@ +From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001 +From: Peter Simons +Date: Tue, 1 Sep 2015 17:58:36 +0200 +Subject: [PATCH] Revert "Fix maximum sizing calculation." + +This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks +this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7 +for further details. +--- + Data/BloomFilter/Easy.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs +index 5143c6e..a349168 100644 +--- a/Data/BloomFilter/Easy.hs ++++ b/Data/BloomFilter/Easy.hs +@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate + minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k) + | k <- [1..100]] + roundedBits = nextPowerOfTwo (ceiling bits) +- in if roundedBits <= 0 || roundedBits > 0xffffffff ++ in if roundedBits <= 0 + then Left "capacity too large to represent" + else Right (roundedBits, truncate hashes) + +-- +2.5.1 + From 21370df4d65c84031ecac94f4547b9d9a4a0a873 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 1 Sep 2015 18:04:14 +0200 Subject: [PATCH 081/188] ibus-anthy: 1.5.6 -> 1.5.7 Also fix zipcode lookup. --- pkgs/tools/inputmethods/ibus-anthy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix index 1b0201c4b17..22515a15d27 100644 --- a/pkgs/tools/inputmethods/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.6"; + version = "1.5.7"; meta = with stdenv.lib; { description = "IBus interface to the anthy input method"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ]; }; + configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; + buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ]; postFixup = '' @@ -24,6 +26,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03"; + sha256 = "00sjrfhghrgkqm72mf39f8sz6wr4fwvvs9mn2alaldhgr5v0c861"; }; } From d0d882870613991dec56362f1b55490356117884 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 30 Aug 2015 10:38:49 +0000 Subject: [PATCH 082/188] lxd: fix to include lxd-images --- pkgs/top-level/go-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 908682d46b4..81cfbb250d0 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1614,7 +1614,11 @@ let buildInputs = [ gettext-go websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2 lxd-go-systemd go-uuid tablewriter golang-petname mux go-sqlite3 goproxy + pkgs.python3 ]; + postInstall = '' + cp go/src/$goPackagePath/scripts/lxd-images $bin/bin + ''; }; mapstructure = buildFromGitHub { From f65b692a07bbfc83a43244bca73fd658e618be73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 14:30:35 +0200 Subject: [PATCH 083/188] firefox: fix argv0 with enableGTK3 (/cc #9562) Also add a simple test detecting such problems. --- pkgs/applications/networking/browsers/firefox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ff206c50f34..a8ca59d0ed4 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -97,10 +97,16 @@ stdenv.mkDerivation rec { # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* '' + lib.optionalString enableGTK3 + # argv[0] must point to firefox itself '' wrapProgram "$out/bin/firefox" \ + --argv0 "$out/bin/.firefox-wrapped" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + '' + + # some basic testing + '' + "$out/bin/firefox" --version ''; meta = { From f2d25c5a4d08c5c31a49404d155b5ad809f92732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 15:17:05 +0200 Subject: [PATCH 084/188] firefox-gtk3: fix crashes by a Fedora-backported patch These might be the same crashes as with gtk2 and system cairo #9368. --- .../networking/browsers/firefox/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a8ca59d0ed4..e510b329714 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -4,7 +4,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio -, enableGTK3 ? false +, enableGTK3 ? false, fetchpatch , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -26,6 +26,17 @@ stdenv.mkDerivation rec { sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; }; + patches = if !enableGTK3 then null else [(fetchpatch { + name = "crash_OTMC+GTK3.patch"; + # backported from 40.1 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1127752 + # https://bugzilla.redhat.com/show_bug.cgi?id=1256875 + url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/" + + "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1"; + sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5"; + })]; + patchFlags = "-p2"; + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi From 0327ee3f8ed388a6bd90059970150668c269fec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 20:44:09 +0200 Subject: [PATCH 085/188] libevent: remove unused vulnerable 1.4.x version --- pkgs/development/libraries/libevent/1.4.nix | 29 --------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/libevent/1.4.nix diff --git a/pkgs/development/libraries/libevent/1.4.nix b/pkgs/development/libraries/libevent/1.4.nix deleted file mode 100644 index ed190bf6061..00000000000 --- a/pkgs/development/libraries/libevent/1.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl}: - -let version = "1.4.14b"; in -stdenv.mkDerivation { - name = "libevent-${version}"; - - src = fetchurl { - url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz"; - sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg"; - }; - - meta = { - description = "libevent, an event notification library"; - - longDescription = - '' The libevent API provides a mechanism to execute a callback function - when a specific event occurs on a file descriptor or after a timeout - has been reached. Furthermore, libevent also support callbacks due - to signals or regular timeouts. - - libevent is meant to replace the event loop found in event driven - network servers. An application just needs to call event_dispatch() - and then add or remove events dynamically without having to change - the event loop. - ''; - - license = "mBSD"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 994136e6645..d0bc2e97490 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7000,7 +7000,6 @@ let libev = callPackage ../development/libraries/libev { }; - libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; libevent = callPackage ../development/libraries/libevent { }; libewf = callPackage ../development/libraries/libewf { }; From 08ef227a615c43be8fa2cc22c923283ce7189f90 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 1 Sep 2015 21:44:11 +0200 Subject: [PATCH 086/188] pythonPackages.scikitlearn: apply patch for doctests on i686 and skip one test fixes #9472 related scikit-learn/scikit-learn/#5198, scikit-learn/scikit-learn/#5197 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88973f55500..1be6baf93cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12654,21 +12654,26 @@ let scikitlearn = buildPythonPackage rec { - name = "scikit-learn-0.16.1"; + name = "scikit-learn-${version}"; + version = "0.16.1"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz"; - sha256 = "1r761qmsq2mnl8sapplbx0ipj6i7ppr2cmz009q5rjana0liwwn0"; + url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"; + sha256 = "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; - # doctests fail on i686 - # https://github.com/NixOS/nixpkgs/issues/9472 - # https://github.com/scikit-learn/scikit-learn/issues/5177 - patchPhase = '' - substituteInPlace setup.cfg --replace 'with-doctest = 1' 'with-doctest = 0' + patches = [ + (pkgs.fetchurl { + url = "https://patch-diff.githubusercontent.com/raw/scikit-learn/scikit-learn/pull/5197.patch"; + sha256 = "1b261wcvim6s0sqmd20jylwz09g5bh3xzhagjlslmv4q50qxpvkg"; + }) + ]; + + postPatch = optionalString (stdenv.isi686 && isPy3k) '' + sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py ''; buildPhase = '' From f5615752ae0217a0e85f46630da56f5e2a82612d Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 1 Sep 2015 10:31:43 +0000 Subject: [PATCH 087/188] imagemagick: 6.9.1-0 -> 6.9.2-0, fixes #9591 --- pkgs/applications/graphics/ImageMagick/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 683e2721d87..3575eee2939 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -4,22 +4,19 @@ }: let - - version = "6.9.1-0"; - arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; - in stdenv.mkDerivation rec { name = "imagemagick-${version}"; + version = "6.9.2-0"; src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; + sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; }; outputs = [ "out" "doc" ]; From fe85ba58061356aff60ac6d6d1f8adf4a20361b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 1 Sep 2015 22:20:38 +0200 Subject: [PATCH 088/188] opencv3: unbreak build (set "-DWITH_IPP=OFF") OpenCV tries to download IPP itself at build time. That doesn't work well with nix. --- pkgs/development/libraries/opencv/3.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index eae31df4796..eed77b9113a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; + # TODO: Pre-download IPP so that OpenCV doesn't try to download it itself + # (which fails). + cmakeFlags = [ "-DWITH_IPP=OFF" ]; + enableParallelBuilding = true; meta = { From 8ddc086c355ea6c15cc768c3eb39971037fcd939 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 1 Sep 2015 14:32:47 -0700 Subject: [PATCH 089/188] Add hydra links for upcoming 15.09 release --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dc00a0ebd69..991d90dd97d 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,10 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) * [Continuous package builds for 14.12 release](https://hydra.nixos.org/jobset/nixos/release-14.12) +* [Continuous package builds for 15.09 release](https://hydra.nixos.org/jobset/nixos/release-15.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) * [Tests for 14.12 release](https://hydra.nixos.org/job/nixos/release-14.12/tested#tabs-constituents) +* [Tests for 15.09 release](https://hydra.nixos.org/job/nixos/release-15.09/tested#tabs-constituents) Communication: From 4fecf15b4b09c627f7dfb2792fe202f49b73f90f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 17:19:11 -0700 Subject: [PATCH 090/188] syncthing: Fix top-level expression --- 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 d0bc2e97490..da574c93fed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12926,7 +12926,7 @@ let symlinks = callPackage ../tools/system/symlinks { }; - syncthing = callPackage ../applications/networking/syncthing { }; + syncthing = (callPackage ../applications/networking/syncthing { }).bin // { outputs = [ "bin" ]; }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; From 54c4aab6621662e7d8f386c1da53107d56813e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Sep 2015 04:54:31 +0200 Subject: [PATCH 091/188] nixos: kill services.virtualboxGuest to fix #9600 --- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- pkgs/build-support/grsecurity/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 8232f6e50df..c1538feb9df 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -128,6 +128,6 @@ in { boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; - services.virtualboxGuest.enable = true; + virtualisation.virtualbox.guest.enable = true; }; } diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 713f4cdc83e..f26291e7daa 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -85,7 +85,7 @@ let let boolToKernOpt = b: if b then "y" else "n"; # Disable RANDSTRUCT under virtualbox, as it has some kind of # breakage with the vbox guest drivers - #randstruct = optionalString config.services.virtualboxGuest.enable + #randstruct = optionalString config.virtualisation.virtualbox.guest.enable # "GRKERNSEC_RANDSTRUCT n"; # Disable restricting links under the testing kernel, as something From 2dccca399c9a6d96c4d5344c1f0af29d8d8a2c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Sep 2015 20:33:27 +0200 Subject: [PATCH 092/188] libunwind: security fix for CVE-2015-3239 Thanks to the monitor. Low security and high rebuild impact, but still... --- .../libraries/libunwind/cve-2015-3239.patch | 15 +++++++++++++++ pkgs/development/libraries/libunwind/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libunwind/cve-2015-3239.patch diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch new file mode 100644 index 00000000000..247b2dab44f --- /dev/null +++ b/pkgs/development/libraries/libunwind/cve-2015-3239.patch @@ -0,0 +1,15 @@ +http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1 + +diff --git a/include/dwarf_i.h b/include/dwarf_i.h +index 0e72845..86dcdb8 100644 +--- a/include/dwarf_i.h ++++ b/include/dwarf_i.h +@@ -20,7 +20,7 @@ + extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH]; + /* REG is evaluated multiple times; it better be side-effects free! */ + # define dwarf_to_unw_regnum(reg) \ +- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) ++ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) + #endif + + #ifdef UNW_LOCAL_ONLY diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 91895114ea0..ecaa643b143 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libunwind-1.1"; - + src = fetchurl { url = "mirror://savannah/libunwind/${name}.tar.gz"; sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; - patches = [ ./libunwind-1.1-lzma.patch ]; + patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ]; postPatch = '' sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file done ''; - + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da574c93fed..fba483b6ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7450,7 +7450,7 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then callPackage ../development/libraries/libunwind/native.nix {} + then libunwindNative else callPackage ../development/libraries/libunwind { }; libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; From b55a4df70fb004902206bc76cb86b91e218eae93 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 1 Sep 2015 19:20:45 -0700 Subject: [PATCH 093/188] chromium: Updates This bumps the stable and dev track forward a version --- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 17df6492efa..16aa67db30f 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "46.0.2486.0"; - sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah"; - sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9"; - sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy"; + version = "47.0.2498.0"; + sha256 = "1dvp7wwfbdzyvbqcfn538gf0dk6w6gc88nms0wl0ir4ka7rf7mz1"; + sha256bin32 = "15jsmvhyzscf6g6czkg5vxzyj7vnkndmsapx0xf8hlw8d5zw3nq7"; + sha256bin64 = "1mx605dh93ak0p68rrpb6xf46jygggk0jwj7k6ks21l4wnxha8d5"; }; beta = { - version = "45.0.2454.46"; - sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37"; - sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w"; - sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc"; + version = "45.0.2454.78"; + sha256 = "1n3yp0jm3jqyw0xwji1451qjjpkvpsqabn7d2r9fj75gspsiwv6z"; + sha256bin32 = "11x8f2nyhf4n1jdd8npvr3ddkp3himi6lxpml64h5gjd5j9gf32b"; + sha256bin64 = "16gk14q3pc1fzg9dbwlqsay4jwddsh5b37h4p8zkqqymv9fp5qq9"; }; stable = { - version = "44.0.2403.157"; - sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971"; - sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq"; - sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3"; + version = "45.0.2454.85"; + sha256 = "14acjc80dmypybbvm087szp0g0m1gil5hjj02x8c6k7alsjh731y"; + sha256bin32 = "1945m765a05wfdfslrb22r1jpicyghfkf4h7ijzw1z9whmxa9y1v"; + sha256bin64 = "0d63akpr3yp128v01xgz1nd364w7p89gkvjpr4qz99q67dh3z1q1"; }; } From e80b41e94fc3db8e0e7f5592b8daecf52c5d5156 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 31 Aug 2015 12:04:33 +0200 Subject: [PATCH 094/188] xen: remove 4.4.1 + fixes compilation of 4.5.x, fixes #9572 --- .../0000-qemu-seabios-enable-ATA_DMA.patch | 14 +- .../applications/virtualization/xen/4.4.1.nix | 50 ------- .../applications/virtualization/xen/4.5.0.nix | 15 +- .../virtualization/xen/generic.nix | 138 +++++++++--------- pkgs/top-level/all-packages.nix | 1 - 5 files changed, 79 insertions(+), 139 deletions(-) delete mode 100644 pkgs/applications/virtualization/xen/4.4.1.nix diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch index 1eb3d5949de..339972a2cde 100644 --- a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch +++ b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch @@ -1,8 +1,7 @@ -diff --git a/src/Kconfig b/src/Kconfig -index 45ca59c..faf8951 100644 ---- a/src/Kconfig -+++ b/src/Kconfig -@@ -144,13 +144,13 @@ menu "Hardware support" +diff -uNr a/src/Kconfig b/src/Kconfig +--- a/src/Kconfig 2015-08-31 10:15:13.231134858 +0200 ++++ b/src/Kconfig 2015-08-31 10:14:24.039180178 +0200 +@@ -144,13 +144,13 @@ config ATA_DMA depends on ATA bool "ATA DMA" @@ -16,8 +15,5 @@ index 45ca59c..faf8951 100644 - default n + default y help - Use 32bit PIO accesses on ATA (minor optimization on PCI -transfers). + Use 32bit PIO accesses on ATA (minor optimization on PCI transfers). config AHCI --- -1.7.10.4 diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix deleted file mode 100644 index ec2056cc547..00000000000 --- a/pkgs/applications/virtualization/xen/4.4.1.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -let - # Xen 4.4.1 - xenConfig = { - name = "xen-4.4.1"; - version = "4.4.1"; - - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz"; - sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; - }; - - # Sources needed to build the xen tools and tools/firmware. - toolsGits = - [ # tag qemu-xen-4.4.1 - { git = { name = "qemu-xen"; - url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; - rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; - sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18"; - }; - } - # tag xen-4.4.1 - { git = { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; - rev = "6ae4e588081620b141071eb010ec40aca7e12876"; - sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; - }; - } - ]; - - firmwareGits = - [ # tag 1.7.3.1 - { git = { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; - rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; - sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; - }; - } - { git = { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; - }; - } - ]; - - }; - -in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix index 156255be0d7..48b3ee4d75b 100644 --- a/pkgs/applications/virtualization/xen/4.5.0.nix +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -58,17 +58,18 @@ let } ]; - xenserverPatches = let - patches = { - url = https://github.com/ts468/xen-4.5.pg.git; - rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; - sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; - }; + xenserverPatches = + let + patches = { + url = https://github.com/ts468/xen-4.5.pg.git; + rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; + sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; + }; in '' cp -r ${fetchgit patches}/master patches quilt push -a substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE" - ''; + ''; xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 32e38563525..2ff66d843ca 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -76,79 +76,9 @@ stdenv.mkDerivation { pythonPath = [ pythonPackages.curses ]; patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches; - patchPhase = stdenv.lib.optional ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches; - preConfigure = '' - # Fake wget: copy prefetched downloads instead - mkdir wget - echo "#!/bin/sh" > wget/wget - echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget - echo "cp \$4 \$3" >> wget/wget - chmod +x wget/wget - export PATH=$PATH:$PWD/wget - export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio" - ''; - - # TODO: Flask needs more testing before enabling it by default. - #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - - buildFlags = "xen tools stubdom"; - - preBuild = - '' - substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ - --replace /usr $out - - substituteInPlace tools/blktap2/lvm/lvm-util.c \ - --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \ - --replace /usr/sbin/lvs ${lvm2}/sbin/lvs - - substituteInPlace tools/hotplug/Linux/network-bridge \ - --replace /usr/bin/logger ${utillinux}/bin/logger - - substituteInPlace tools/xenmon/xenmon.py \ - --replace /usr/bin/pkill ${procps}/bin/pkill - - substituteInPlace tools/xenstat/Makefile \ - --replace /usr/include/curses.h ${ncurses}/include/curses.h - - substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - - substituteInPlace tools/hotplug/Linux/xen-backend.rules \ - --replace /etc/xen/scripts $out/etc/xen/scripts - - # blktap is not provided by xen, but by xapi - sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules - - # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't - # print the GCC version number properly. - substituteInPlace xen/Makefile \ - --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' - - substituteInPlace tools/python/xen/xend/server/BlktapController.py \ - --replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2 - - substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \ - --replace /usr/sbin/qcow-create $out/sbin/qcow-create - - substituteInPlace tools/python/xen/remus/save.py \ - --replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save - - substituteInPlace tools/python/xen/remus/device.py \ - --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt - - # Allow the location of the xendomains config file to be - # overriden at runtime. - substituteInPlace tools/hotplug/Linux/init.d/xendomains \ - --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ - --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \ - --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \ - --replace /bin/ls ls - - substituteInPlace tools/hotplug/Linux/xendomains \ - --replace /bin/ls ls + postPatch = '' + ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches} # Xen's tools and firmares need various git repositories that it # usually checks out at time using git. We can't have that. @@ -171,12 +101,76 @@ stdenv.mkDerivation { ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in '' cp ${src} xen_ext_files/${src.name} '')} + ''; + + preConfigure = '' + # Fake wget: copy prefetched downloads instead + mkdir wget + echo "#!/bin/sh" > wget/wget + echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget + echo "cp \$4 \$3" >> wget/wget + chmod +x wget/wget + export PATH=$PATH:$PWD/wget + export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio" + ''; + + postConfigure = + '' + substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ + --replace /usr $out + + substituteInPlace tools/blktap2/lvm/lvm-util.c \ + --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \ + --replace /usr/sbin/lvs ${lvm2}/sbin/lvs + + substituteInPlace tools/hotplug/Linux/network-bridge \ + --replace /usr/bin/logger ${utillinux}/bin/logger + + substituteInPlace tools/xenmon/xenmon.py \ + --replace /usr/bin/pkill ${procps}/bin/pkill + + substituteInPlace tools/xenstat/Makefile \ + --replace /usr/include/curses.h ${ncurses}/include/curses.h + + substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + + substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + + substituteInPlace tools/hotplug/Linux/xen-backend.rules \ + --replace /etc/xen/scripts $out/etc/xen/scripts + + # blktap is not provided by xen, but by xapi + sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules + + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't + # print the GCC version number properly. + substituteInPlace xen/Makefile \ + --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' + + # Allow the location of the xendomains config file to be + # overriden at runtime. + substituteInPlace tools/hotplug/Linux/init.d/xendomains \ + --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ + --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \ + --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \ + --replace /bin/ls ls + + substituteInPlace tools/hotplug/Linux/xendomains \ + --replace /bin/ls ls # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h ''; + # TODO: Flask needs more testing before enabling it by default. + #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + + buildFlags = "xen tools stubdom"; + postBuild = '' make -C docs man-pages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fba483b6ed8..7c0b9208e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13461,7 +13461,6 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { }; xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { }; xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; From 0f4b9218d2900a346d6f8c2c8077bc1b8c7f84e2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 1 Sep 2015 21:55:31 +0200 Subject: [PATCH 095/188] python27Packages.klaus: 0.4.10 -> 0.6.0, fixes #9597 --- 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 1be6baf93cb..b55503643d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7295,16 +7295,16 @@ let }; klaus = buildPythonPackage rec { - version = "0.4.10"; + version = "0.6.0"; name = "klaus-${version}"; src = pkgs.fetchurl { url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz"; - sha256 = "1yq1dz3cd2qdn8vi1ivf6biab76cfmcvis07d6a8039w5wxdzc80"; + sha256 = "0ab3lxbysnvsx7irlxhiy78clbk4d0gzv2241pqkkvlmqq3968p4"; }; propagatedBuildInputs = with self; - [ humanize httpauth dulwich pygments flask ]; + [ humanize httpauth dulwich pygments flask six ]; meta = { description = "The first Git web viewer that Just Works"; From 616aa2bddaa73b168205104cf63ae0fc27613201 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 2 Sep 2015 09:14:59 +0200 Subject: [PATCH 096/188] ocaml modules: fix some CamelCase and under_scores --- .../{async_extra => async-extra}/default.nix | 12 +-- .../{async_find => async-find}/default.nix | 2 +- .../default.nix | 10 +-- .../{async_shell => async-shell}/default.nix | 6 +- .../{async_ssl => async-ssl}/default.nix | 6 +- .../{async_unix => async-unix}/default.nix | 14 ++-- .../ocaml-modules/async/default.nix | 6 +- .../{bin_prot => bin-prot}/default.nix | 6 +- .../ocaml-modules/cohttp/default.nix | 4 +- .../ocaml-modules/comparelib/default.nix | 4 +- .../ocaml-modules/conduit/default.nix | 4 +- .../default.nix | 10 +-- .../{core_kernel => core-kernel}/default.nix | 12 +-- .../ocaml-modules/core/default.nix | 12 +-- .../default.nix | 8 +- .../ocaml-modules/enumerate/default.nix | 4 +- .../{erm_xml => erm-xml}/default.nix | 2 +- .../{erm_xmpp => erm-xmpp}/default.nix | 6 +- .../ocaml-modules/fieldslib/default.nix | 4 +- .../development/ocaml-modules/odn/default.nix | 4 +- .../{pa_bench => pa-bench}/default.nix | 8 +- .../{pa_ounit => pa-ounit}/default.nix | 2 +- .../{pa_test => pa-test}/default.nix | 8 +- .../development/ocaml-modules/re2/default.nix | 8 +- .../ocaml-modules/sexplib/108.08.00.nix | 4 +- .../ocaml-modules/sexplib/111.25.00.nix | 4 +- .../ocaml-modules/sexplib/112.24.01.nix | 4 +- .../ocaml-modules/textutils/default.nix | 6 +- .../{type_conv => type-conv}/108.08.00.nix | 2 +- .../{type_conv => type-conv}/109.60.01.nix | 2 +- .../{type_conv => type-conv}/112.01.01.nix | 2 +- .../ocaml-modules/typerep/default.nix | 4 +- .../ocaml-modules/variantslib/default.nix | 4 +- .../development/tools/ocaml/oasis/default.nix | 6 +- pkgs/tools/typesetting/patoline/default.nix | 6 +- pkgs/top-level/all-packages.nix | 80 ++++++++++++------- 36 files changed, 156 insertions(+), 130 deletions(-) rename pkgs/development/ocaml-modules/{async_extra => async-extra}/default.nix (67%) rename pkgs/development/ocaml-modules/{async_find => async-find}/default.nix (96%) rename pkgs/development/ocaml-modules/{async_kernel => async-kernel}/default.nix (72%) rename pkgs/development/ocaml-modules/{async_shell => async-shell}/default.nix (77%) rename pkgs/development/ocaml-modules/{async_ssl => async-ssl}/default.nix (86%) rename pkgs/development/ocaml-modules/{async_unix => async-unix}/default.nix (64%) rename pkgs/development/ocaml-modules/{bin_prot => bin-prot}/default.nix (81%) rename pkgs/development/ocaml-modules/{core_extended => core-extended}/default.nix (69%) rename pkgs/development/ocaml-modules/{core_kernel => core-kernel}/default.nix (71%) rename pkgs/development/ocaml-modules/{custom_printf => custom-printf}/default.nix (75%) rename pkgs/development/ocaml-modules/{erm_xml => erm-xml}/default.nix (93%) rename pkgs/development/ocaml-modules/{erm_xmpp => erm-xmpp}/default.nix (84%) rename pkgs/development/ocaml-modules/{pa_bench => pa-bench}/default.nix (77%) rename pkgs/development/ocaml-modules/{pa_ounit => pa-ounit}/default.nix (96%) rename pkgs/development/ocaml-modules/{pa_test => pa-test}/default.nix (74%) rename pkgs/development/ocaml-modules/{type_conv => type-conv}/108.08.00.nix (95%) rename pkgs/development/ocaml-modules/{type_conv => type-conv}/109.60.01.nix (95%) rename pkgs/development/ocaml-modules/{type_conv => type-conv}/112.01.01.nix (96%) diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async-extra/default.nix similarity index 67% rename from pkgs/development/ocaml-modules/async_extra/default.nix rename to pkgs/development/ocaml-modules/async-extra/default.nix index 2d1e1dea69c..567562dcf28 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async-extra/default.nix @@ -1,9 +1,9 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, - bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit, - pipebang, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, async-kernel, async-unix, + bin-prot, core, custom-printf, fieldslib, herelib, pa-ounit, + pipebang, pa-test, sexplib}: buildOcaml rec { - name = "async_extra"; + name = "async-extra"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -13,8 +13,8 @@ buildOcaml rec { sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; }; - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf + buildInputs = [ pa-test pa-ounit ]; + propagatedBuildInputs = [ async-kernel async-unix core bin-prot custom-printf fieldslib herelib pipebang sexplib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async-find/default.nix similarity index 96% rename from pkgs/development/ocaml-modules/async_find/default.nix rename to pkgs/development/ocaml-modules/async-find/default.nix index ae10e931ce2..4c12c994f8d 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async-find/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, async, core, sexplib}: buildOcaml rec { - name = "async_find"; + name = "async-find"; version = "111.28.00"; minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async-kernel/default.nix similarity index 72% rename from pkgs/development/ocaml-modules/async_kernel/default.nix rename to pkgs/development/ocaml-modules/async-kernel/default.nix index 8c0d8d7c851..7e5db2e2c3e 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async-kernel/default.nix @@ -1,9 +1,9 @@ -{stdenv, buildOcaml, fetchurl, core_kernel, - bin_prot, fieldslib, pa_ounit, pa_test, +{stdenv, buildOcaml, fetchurl, core-kernel, + bin-prot, fieldslib, pa-ounit, pa-test, sexplib, herelib}: buildOcaml rec { - name = "async_kernel"; + name = "async-kernel"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -13,8 +13,8 @@ buildOcaml rec { sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0"; }; - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + buildInputs = [ pa-test pa-ounit ]; + propagatedBuildInputs = [ core-kernel bin-prot fieldslib herelib sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async-shell/default.nix similarity index 77% rename from pkgs/development/ocaml-modules/async_shell/default.nix rename to pkgs/development/ocaml-modules/async-shell/default.nix index 75755833a5f..6f863382bd2 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async-shell/default.nix @@ -1,7 +1,7 @@ -{stdenv, buildOcaml, fetchurl, async, core, core_extended}: +{stdenv, buildOcaml, fetchurl, async, core, core-extended}: buildOcaml rec { - name = "async_shell"; + name = "async-shell"; version = "109.28.03"; minimumSupportedOcamlVersion = "4.02"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; }; - propagatedBuildInputs = [ async core core_extended ]; + propagatedBuildInputs = [ async core core-extended ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_shell; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async-ssl/default.nix similarity index 86% rename from pkgs/development/ocaml-modules/async_ssl/default.nix rename to pkgs/development/ocaml-modules/async-ssl/default.nix index 527d56ceaa0..49fd3033320 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async-ssl/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + fieldslib, herelib, pa-bench, pa-ounit, pipebang, pa-test, sexplib}: buildOcaml rec { name = "async_ssl"; @@ -12,8 +12,8 @@ buildOcaml rec { sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68"; }; - buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit + buildInputs = [ pa-bench pa-test ]; + propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa-ounit herelib pipebang sexplib openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async-unix/default.nix similarity index 64% rename from pkgs/development/ocaml-modules/async_unix/default.nix rename to pkgs/development/ocaml-modules/async-unix/default.nix index 81fbd6a9918..b8fe7bee255 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async-unix/default.nix @@ -1,9 +1,9 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, - bin_prot, comparelib, core, fieldslib, herelib, pa_ounit, - pipebang, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, async-kernel, + bin-prot, comparelib, core, fieldslib, herelib, pa-ounit, + pipebang, pa-test, sexplib}: buildOcaml rec { - name = "async_unix"; + name = "async-unix"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -14,9 +14,9 @@ buildOcaml rec { }; hasSharedObjects = true; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib herelib pipebang pa_test sexplib ]; + buildInputs = [ pa-ounit ]; + propagatedBuildInputs = [ async-kernel core bin-prot comparelib + fieldslib herelib pipebang pa-test sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_unix; diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 2b84519036c..a813c3f4522 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, - async_unix, async_extra, pa_ounit}: +{stdenv, buildOcaml, fetchurl, async-kernel, + async-unix, async-extra, pa-ounit}: buildOcaml rec { name = "async"; @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; }; - propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; + propagatedBuildInputs = [ async-kernel async-unix async-extra pa-ounit ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin-prot/default.nix similarity index 81% rename from pkgs/development/ocaml-modules/bin_prot/default.nix rename to pkgs/development/ocaml-modules/bin-prot/default.nix index 4a2b9846271..4f8c3181e23 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin-prot/default.nix @@ -1,7 +1,7 @@ -{stdenv, writeText, buildOcaml, fetchurl, type_conv}: +{stdenv, writeText, buildOcaml, fetchurl, type-conv}: buildOcaml rec { - name = "bin_prot"; + name = "bin-prot"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.00"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4"; }; - propagatedBuildInputs = [ type_conv ]; + propagatedBuildInputs = [ type-conv ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index e219b59de5d..92690d96ffb 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit, stringext, base64, magic-mime, ounit, alcotest, lwt ? null, - async ? null, async_ssl ? null}: + async ? null, async-ssl ? null}: buildOcaml rec { name = "cohttp"; @@ -16,7 +16,7 @@ buildOcaml rec { buildInputs = [ alcotest ]; propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib conduit stringext base64 magic-mime ounit async - async_ssl lwt ]; + async-ssl lwt ]; buildFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 95001215814..a4e12561194 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type-conv}: buildOcaml rec { name = "comparelib"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; }; - propagatedBuildInputs = [ type_conv ]; + propagatedBuildInputs = [ type-conv ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/comparelib; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index dbb83f4c8cf..2ea316462c2 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, - async ? null, async_ssl ? null, lwt ? null}: + async ? null, async-ssl ? null, lwt ? null}: buildOcaml rec { name = "conduit"; @@ -13,7 +13,7 @@ buildOcaml rec { propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] ++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (async != null) async - ++ stdenv.lib.optional (async_ssl != null) async_ssl); + ++ stdenv.lib.optional (async-ssl != null) async-ssl); meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-conduit; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core-extended/default.nix similarity index 69% rename from pkgs/development/ocaml-modules/core_extended/default.nix rename to pkgs/development/ocaml-modules/core-extended/default.nix index f311aae3d30..aa6741e6520 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core-extended/default.nix @@ -1,8 +1,8 @@ -{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, - fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: +{stdenv, buildOcaml, fetchurl, bin-prot, comparelib, core, custom-printf, + fieldslib, pa-bench, pa-ounit, pipebang, pa-test, textutils, re2, sexplib}: buildOcaml rec { - name = "core_extended"; + name = "core-extended"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -13,8 +13,8 @@ buildOcaml rec { }; hasSharedObjects = true; - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib + buildInputs = [ pa-bench pa-test pa-ounit ]; + propagatedBuildInputs = [bin-prot comparelib core custom-printf fieldslib pipebang textutils re2 sexplib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core-kernel/default.nix similarity index 71% rename from pkgs/development/ocaml-modules/core_kernel/default.nix rename to pkgs/development/ocaml-modules/core-kernel/default.nix index 0fed12b195d..ee1a8b7a5bb 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core-kernel/default.nix @@ -1,10 +1,10 @@ -{stdenv, buildOcaml, fetchurl, type_conv, - bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, +{stdenv, buildOcaml, fetchurl, type-conv, + bin-prot, comparelib, custom-printf, enumerate, + fieldslib, herelib, pa-bench, pa-test, pa-ounit, pipebang, sexplib, typerep, variantslib}: buildOcaml rec { - name = "core_kernel"; + name = "core-kernel"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -16,8 +16,8 @@ buildOcaml rec { hasSharedObjects = true; - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf + buildInputs = [ pa-test pa-ounit ]; + propagatedBuildInputs = [ type-conv pa-bench bin-prot comparelib custom-printf enumerate fieldslib herelib pipebang sexplib typerep variantslib ]; diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 96fd80087d6..9cc03883932 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcaml, fetchurl, type_conv, - core_kernel, bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, +{stdenv, buildOcaml, fetchurl, type-conv, + core-kernel, bin-prot, comparelib, custom-printf, enumerate, + fieldslib, herelib, pa-bench, pa-test, pa-ounit, pipebang, sexplib, typerep, variantslib}: buildOcaml rec { @@ -16,9 +16,9 @@ buildOcaml rec { hasSharedObjects = true; - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib - custom_printf enumerate fieldslib herelib + buildInputs = [ pa-bench pa-test pa-ounit ]; + propagatedBuildInputs = [ type-conv core-kernel bin-prot comparelib + custom-printf enumerate fieldslib herelib pipebang sexplib typerep variantslib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom-printf/default.nix similarity index 75% rename from pkgs/development/ocaml-modules/custom_printf/default.nix rename to pkgs/development/ocaml-modules/custom-printf/default.nix index 05a8ecfe616..f435e53314a 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom-printf/default.nix @@ -1,7 +1,7 @@ -{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: +{stdenv, buildOcaml, fetchurl, type-conv, sexplib, pa-ounit}: buildOcaml rec { - name = "custom_printf"; + name = "custom-printf"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.02"; @@ -11,8 +11,8 @@ buildOcaml rec { sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9"; }; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib ]; + buildInputs = [ pa-ounit ]; + propagatedBuildInputs = [ type-conv sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/custom_printf; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index ce20cdd47bb..f0f80eb2ecd 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ type_conv camlp4 ]; + propagatedBuildInputs = [ type-conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm-xml/default.nix similarity index 93% rename from pkgs/development/ocaml-modules/erm_xml/default.nix rename to pkgs/development/ocaml-modules/erm-xml/default.nix index 0ff2a725ea2..c60ef70ef69 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm-xml/default.nix @@ -3,7 +3,7 @@ let version = "0.3"; in stdenv.mkDerivation { - name = "ocaml-erm_xml-${version}"; + name = "ocaml-erm-xml-${version}"; src = fetchzip { url = "https://github.com/ermine/xml/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm-xmpp/default.nix similarity index 84% rename from pkgs/development/ocaml-modules/erm_xmpp/default.nix rename to pkgs/development/ocaml-modules/erm-xmpp/default.nix index 7508a14738d..35b09051046 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm-xml, cryptokit, camlp4 }: let version = "0.2"; @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "ocaml-erm_xmpp-${version}"; + name = "ocaml-erm-xmpp-${version}"; src = fetchzip { url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ disable-tests ]; buildInputs = [ ocaml findlib camlp4 ]; - propagatedBuildInputs = [ erm_xml cryptokit ]; + propagatedBuildInputs = [ erm-xml cryptokit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 38548790329..cb73f56fbd8 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }: assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ type_conv camlp4 ]; + propagatedBuildInputs = [ type-conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index eaeb7e7b22f..c7d4aa52c47 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type-conv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib type_conv ounit camlp4]; + buildInputs = [ocaml findlib type-conv ounit camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa-bench/default.nix similarity index 77% rename from pkgs/development/ocaml-modules/pa_bench/default.nix rename to pkgs/development/ocaml-modules/pa-bench/default.nix index d8ce0dbc7ea..926a61fff66 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa-bench/default.nix @@ -1,7 +1,7 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}: +{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit}: buildOcaml rec { - name = "pa_bench"; + name = "pa-bench"; version = "112.06.00"; minimumSupportedOcamlVersion = "4.00"; @@ -11,8 +11,8 @@ buildOcaml rec { sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; }; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv ]; + buildInputs = [ pa-ounit ]; + propagatedBuildInputs = [ type-conv ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/pa_bench; diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa-ounit/default.nix similarity index 96% rename from pkgs/development/ocaml-modules/pa_ounit/default.nix rename to pkgs/development/ocaml-modules/pa-ounit/default.nix index 5970aba1e50..05a38c814a0 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa-ounit/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, ounit}: buildOcaml rec { - name = "pa_ounit"; + name = "pa-ounit"; version = "112.24.00"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa-test/default.nix similarity index 74% rename from pkgs/development/ocaml-modules/pa_test/default.nix rename to pkgs/development/ocaml-modules/pa-test/default.nix index faf17e20dc1..81b5854348b 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa-test/default.nix @@ -1,7 +1,7 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: +{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit, sexplib, herelib}: buildOcaml rec { - name = "pa_test"; + name = "pa-test"; version = "112.24.00"; minimumSupportedOcamlVersion = "4.00"; @@ -11,8 +11,8 @@ buildOcaml rec { sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6"; }; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib herelib ]; + buildInputs = [ pa-ounit ]; + propagatedBuildInputs = [ type-conv sexplib herelib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/pa_test; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index e89e28fe1e5..31922d2aab8 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, - bin_prot, comparelib, sexplib, rsync}: +{stdenv, buildOcaml, fetchurl, ocaml, core, pa-ounit, pa-test, + bin-prot, comparelib, sexplib, rsync}: buildOcaml rec { name = "re2"; @@ -15,8 +15,8 @@ buildOcaml rec { then [./Makefile.patch ./myocamlbuild.patch] else null; - buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + buildInputs = [ pa-ounit pa-test rsync ]; + propagatedBuildInputs = [ core bin-prot comparelib sexplib ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index dd9e89bcef7..0067d68e129 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [type_conv camlp4]; + propagatedBuildInputs = [type-conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index 61d46e205fa..0a817728393 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: +{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = [ocaml findlib]; - propagatedBuildInputs = [type_conv camlp4]; + propagatedBuildInputs = [type-conv camlp4]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix index b63b5af05e8..31ef738b3a2 100644 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, camlp4}: +{stdenv, buildOcaml, fetchurl, type-conv, camlp4}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildOcaml rec { sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073"; }; - propagatedBuildInputs = [ type_conv camlp4 ]; + propagatedBuildInputs = [ type-conv camlp4 ]; meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index 377b94eff8b..07a79519745 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, core, pa-ounit, pa-test, sexplib}: buildOcaml rec { name = "textutils"; @@ -11,8 +11,8 @@ buildOcaml rec { sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052"; }; - buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core pa_ounit sexplib ]; + buildInputs = [ pa-test ]; + propagatedBuildInputs = [ core pa-ounit sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/textutils; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type-conv/108.08.00.nix similarity index 95% rename from pkgs/development/ocaml-modules/type_conv/108.08.00.nix rename to pkgs/development/ocaml-modules/type-conv/108.08.00.nix index d3e32105f7d..281ef90d42d 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type-conv/108.08.00.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "3.12" ocaml_version; stdenv.mkDerivation { - name = "ocaml-type_conv-108.08.00"; + name = "ocaml-type-conv-108.08.00"; src = fetchurl { url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type-conv/109.60.01.nix similarity index 95% rename from pkgs/development/ocaml-modules/type_conv/109.60.01.nix rename to pkgs/development/ocaml-modules/type-conv/109.60.01.nix index fe42dd5ddcb..91f6b32cb0a 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type-conv/109.60.01.nix @@ -7,7 +7,7 @@ in assert stdenv.lib.versionOlder "4.00" ocaml_version; stdenv.mkDerivation { - name = "ocaml-type_conv-109.60.01"; + name = "ocaml-type-conv-109.60.01"; src = fetchurl { url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type-conv/112.01.01.nix similarity index 96% rename from pkgs/development/ocaml-modules/type_conv/112.01.01.nix rename to pkgs/development/ocaml-modules/type-conv/112.01.01.nix index e65306d1501..d6e0cea6eaa 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type-conv/112.01.01.nix @@ -3,7 +3,7 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; - name = "type_conv"; + name = "type-conv"; version = "112.01.01"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix index 9500579e245..168b61085ed 100644 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type-conv}: buildOcaml rec { name = "typerep"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada"; }; - propagatedBuildInputs = [ type_conv ]; + propagatedBuildInputs = [ type-conv ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/typerep; diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix index cb25b844606..f8e60205e4f 100644 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv}: +{stdenv, buildOcaml, fetchurl, type-conv}: buildOcaml rec { name = "variantslib"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055"; }; - propagatedBuildInputs = [ type_conv ]; + propagatedBuildInputs = [ type-conv ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/variantslib; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index e823466f417..da94fed0831 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, +{stdenv, fetchurl, ocaml, findlib, ocaml-data-notation, type-conv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { @@ -13,10 +13,10 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib type-conv ocamlmod ocamlify ounit camlp4 ]; - propagatedBuildInputs = [ ocaml_data_notation ]; + propagatedBuildInputs = [ ocaml-data-notation ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/tools/typesetting/patoline/default.nix b/pkgs/tools/typesetting/patoline/default.nix index a39105c8314..9da588b934d 100644 --- a/pkgs/tools/typesetting/patoline/default.nix +++ b/pkgs/tools/typesetting/patoline/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, ncurses, mesa, freeglut, libzip, ocaml, findlib, camomile, dypgen, ocaml_sqlite3, camlzip, - lablgtk, camlimages, ocaml_cairo, + lablgtk, camlimages, ocaml-cairo, lablgl, ocamlnet, cryptokit, ocaml_pcre }: @@ -21,13 +21,13 @@ stdenv.mkDerivation { createFindlibDestdir = true; buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip - lablgtk camlimages ocaml_cairo + lablgtk camlimages ocaml-cairo lablgl ocamlnet cryptokit ocaml_pcre ncurses mesa freeglut libzip ]; propagatedbuildInputs = [ camomile dypgen ocaml_sqlite3 camlzip - lablgtk camlimages ocaml_cairo + lablgtk camlimages ocaml-cairo lablgl ocamlnet cryptokit ocaml_pcre ncurses mesa freeglut libzip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c0b9208e7c..2c6d1f75a96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4310,17 +4310,17 @@ let asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; - async_extra = callPackage ../development/ocaml-modules/async_extra { }; + async-extra = callPackage ../development/ocaml-modules/async-extra { }; - async_find = callPackage ../development/ocaml-modules/async_find { }; + async-find = callPackage ../development/ocaml-modules/async-find { }; - async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; + async-kernel = callPackage ../development/ocaml-modules/async-kernel { }; - async_shell = callPackage ../development/ocaml-modules/async_shell { }; + async-shell = callPackage ../development/ocaml-modules/async-shell { }; - async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; + async-ssl = callPackage ../development/ocaml-modules/async-ssl { }; - async_unix = callPackage ../development/ocaml-modules/async_unix { }; + async-unix = callPackage ../development/ocaml-modules/async-unix { }; async = if lib.versionOlder "4.02" ocaml_version @@ -4396,11 +4396,11 @@ let biniou = callPackage ../development/ocaml-modules/biniou { }; - bin_prot = callPackage ../development/ocaml-modules/bin_prot { }; + bin-prot = callPackage ../development/ocaml-modules/bin-prot { }; - ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + ocaml-cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + ocaml-cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; cil = callPackage ../development/ocaml-modules/cil { }; @@ -4424,7 +4424,7 @@ let csv = callPackage ../development/ocaml-modules/csv { }; - custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; + custom-printf = callPackage ../development/ocaml-modules/custom-printf { }; ctypes = callPackage ../development/ocaml-modules/ctypes { }; @@ -4440,9 +4440,9 @@ let enumerate = callPackage ../development/ocaml-modules/enumerate { }; - erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + erm-xml = callPackage ../development/ocaml-modules/erm-xml { }; - erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + erm-xmpp = callPackage ../development/ocaml-modules/erm-xmpp { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; @@ -4535,15 +4535,15 @@ let comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended = callPackage ../development/ocaml-modules/core_extended { }; + core-extended = callPackage ../development/ocaml-modules/core-extended { }; - core_kernel = callPackage ../development/ocaml-modules/core_kernel { }; + core-kernel = callPackage ../development/ocaml-modules/core-kernel { }; core = callPackage ../development/ocaml-modules/core { }; - ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; + ocaml-cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; - ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; + ocaml-data-notation = callPackage ../development/ocaml-modules/odn { }; ocaml_expat = callPackage ../development/ocaml-modules/expat { }; @@ -4617,16 +4617,16 @@ let textutils = callPackage ../development/ocaml-modules/textutils { }; - type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; - type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; - type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; - type_conv = + type-conv-108_08_00 = callPackage ../development/ocaml-modules/type-conv/108.08.00.nix { }; + type-conv-109_60_01 = callPackage ../development/ocaml-modules/type-conv/109.60.01.nix { }; + type-conv-112_01_01 = callPackage ../development/ocaml-modules/type-conv/112.01.01.nix { }; + type-conv = if lib.versionOlder "4.02" ocaml_version - then type_conv_112_01_01 + then type-conv-112_01_01 else if lib.versionOlder "4.00" ocaml_version - then type_conv_109_60_01 + then type-conv-109_60_01 else if lib.versionOlder "3.12" ocaml_version - then type_conv_108_08_00 + then type-conv-108_08_00 else null; sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; @@ -4649,11 +4649,11 @@ let ocurl = callPackage ../development/ocaml-modules/ocurl { }; - pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; + pa-ounit = callPackage ../development/ocaml-modules/pa-ounit { }; - pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; + pa-bench = callPackage ../development/ocaml-modules/pa-bench { }; - pa_test = callPackage ../development/ocaml-modules/pa_test { }; + pa-test = callPackage ../development/ocaml-modules/pa-test { }; pipebang = callPackage ../development/ocaml-modules/pipebang { }; @@ -4714,6 +4714,32 @@ let oasis = ocaml_oasis; }; + + # Attributes for backward compatibility. + async_extra = async-extra; # added 2015-07-21 + async_find = async-find; # added 2015-07-21 + async_kernel = async-kernel; # added 2015-07-21 + async_shell = async-shell; # added 2015-07-21 + async_ssl = async-ssl; # added 2015-07-21 + async_unix = async-unix; # added 2015-07-21 + bin_prot = bin-prot; # added 2015-07-21 + core_extended = core-extended; # added 2015-07-21 + core_kernel = core-kernel; # added 2015-07-21 + custom_printf = custom-printf; # added 2015-07-21 + erm_xml = erm-xml; # added 2015-07-21 + erm_xmpp = erm-xmpp; # added 2015-07-21 + ocaml_cairo = ocaml-cairo; # added 2015-07-21 + ocaml_cairo2 = ocaml-cairo2; # added 2015-07-21 + ocaml_cryptgps = ocaml-cryptgps; # added 2015-07-21 + ocaml_data_notation = ocaml-data-notation; # added 2015-07-21 + pa_bench = pa-bench; # added 2015-07-21 + pa_ounit = pa-ounit; # added 2015-07-21 + pa_test = pa-test; # added 2015-07-21 + type_conv_108_08_00 = type-conv-108_08_00; # added 2015-07-21 + type_conv_109_60_01 = type-conv-109_60_01; # added 2015-07-21 + type_conv_112_01_01 = type-conv-112_01_01; # added 2015-07-21 + type_conv = type-conv; # added 2015-07-21 + }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; @@ -15255,7 +15281,7 @@ let buildInputs = [ stdenv ncurses mesa freeglut libzip gcc pack.ocaml pack.findlib pack.camomile pack.dypgen pack.ocaml_sqlite3 pack.camlzip - pack.lablgtk pack.camlimages pack.ocaml_cairo + pack.lablgtk pack.camlimages pack.ocaml-cairo pack.lablgl pack.ocamlnet pack.cryptokit pack.ocaml_pcre pack.patoline ]; From 6a974efdd2aeadab5e123650e97af27162518c45 Mon Sep 17 00:00:00 2001 From: Shaun Bruce Date: Wed, 2 Sep 2015 08:15:38 +0000 Subject: [PATCH 097/188] Updated atom to 1.0.10 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index fc2f9265ed6..c32ab32e9e9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.0.0"; + version = "1.0.10"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e"; + sha256 = "16rbp76c46n24a9a3cygg94bx6y7j038h34w4qr7j24aiy5bfzwv"; name = "${name}.deb"; }; From c54d939d6d7de6cf960ca7dea7b116cf00135aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 2 Sep 2015 10:26:29 +0200 Subject: [PATCH 098/188] freenect: cosmetic (2 space indents) --- .../libraries/freenect/default.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index c79c389128b..d0fba6ed821 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,22 +1,23 @@ { 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"; - }; + name = "freenect-${version}"; + version = "0.5.2"; - buildInputs = [ libusb freeglut mesa libXi libXmu ]; - nativeBuildInputs = [ cmake pkgconfig ]; + src = fetchzip { + url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; + sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; + }; - 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; - }; + 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; + }; } From 25a29e667141688f780d155f65fd1c65df7f82cb Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 2 Sep 2015 10:34:29 +0200 Subject: [PATCH 099/188] pythonPackages.scikitlearn: fix for python2 test_standard_scaler_numerical_stability test fails on all i686 platforms --- 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 b55503643d9..d16d98d2374 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12672,7 +12672,7 @@ let }) ]; - postPatch = optionalString (stdenv.isi686 && isPy3k) '' + postPatch = optionalString stdenv.isi686 '' sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py ''; From 83eed584bf3a544db560283e0986408fb1a0f079 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Wed, 2 Sep 2015 09:56:35 +0100 Subject: [PATCH 100/188] remind: 3.1.14 -> 3.1.15 --- pkgs/tools/misc/remind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 574178222c6..11d6991b89c 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.14"; + name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz; - sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; meta = { From 873a6ce9a86181335e222e481b6c48ce94bbd48c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 2 Sep 2015 11:46:27 +0200 Subject: [PATCH 101/188] imagemagickBig: enable ghostscript --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c6d1f75a96..8d76a8c11f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11867,11 +11867,11 @@ let libxml2 = null; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { + imagemagick = imagemagickBig.override { ghostscript = null; }; - imagemagickBig = imagemagick; + imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { From 6483cf1d91c454e9dfb93de243200f6a677ad4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 2 Sep 2015 12:14:06 +0200 Subject: [PATCH 102/188] ffmpeg-full: align pkgname with attrname MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this, users are presented with this endless loop: $ ffplay The program ‘ffplay’ is currently not installed. You can install it by typing: nix-env -i ffmpeg $ nix-env -i ffmpeg $ ffplay The program ‘ffplay’ is currently not installed. You can install it by typing: nix-env -i ffmpeg --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index dd8a3aef8d4..37e23d4a324 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -230,7 +230,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { - name = "ffmpeg-${version}"; + name = "ffmpeg-full-${version}"; version = "2.7.2"; src = fetchurl { From c456073e033fd629a5c524f150da06c2780a0f22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 12:27:36 +0200 Subject: [PATCH 103/188] Disable test suites of Haskell packages RSA and kademlia. Those test suites run for 2+ hours and thus fail with a timeout error. --- 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 b0b93e2d530..759b1658968 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -89,6 +89,12 @@ self: super: { yices-easy = dontDistribute super.yices-easy; yices-painless = dontDistribute super.yices-painless; + # https://github.com/GaloisInc/RSA/issues/9 + RSA = dontCheck super.RSA; + + # https://github.com/froozen/kademlia/issues/2 + kademlia = dontCheck super.kademlia; + # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; From 90c163bde0876837eea388368fa5d90c6f09d0a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2015 20:31:33 +0200 Subject: [PATCH 104/188] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4 with hackage2nix v20150824-65-g80afb21 --- .../haskell-modules/hackage-packages.nix | 219 ++++++++++-------- 1 file changed, 120 insertions(+), 99 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2feabf4a787..dab185b20ea 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5026,8 +5026,8 @@ self: { ({ mkDerivation, base, containers, HUnit, parsec }: mkDerivation { pname = "Folly"; - version = "0.1.4.6"; - sha256 = "fabe878ab40e0fe8187ee40e6d4b4d0a83e6b34c42e404f04d2b4afa3e1038f6"; + version = "0.1.5.2"; + sha256 = "d91356d28619c50115160d078277104bac9567f099a5b9fd13b0079b7f164e0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec ]; @@ -5498,6 +5498,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "GPipe-GLFW" = callPackage + ({ mkDerivation, base, GLFW-b, GPipe, transformers }: + mkDerivation { + pname = "GPipe-GLFW"; + version = "1.0"; + sha256 = "1d5fbf132f11a5378d19ac31361a0783d0e3dd4324809df4fa0fbabcdbb34b5c"; + libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; + homepage = "https://github.com/plredmond/GPipe-GLFW"; + description = "GLFW OpenGL context creation for GPipe"; + license = stdenv.lib.licenses.mit; + }) {}; + "GPipe-TextureLoad" = callPackage ({ mkDerivation, base, bitmap, GPipe, stb-image }: mkDerivation { @@ -33558,28 +33570,29 @@ self: { ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, doctest, executable-path , filepath, HTTP, HUnit, json-builder, lens, lens-aeson, mtl - , network, network-uri, parsec, process, QuickCheck, split - , string-conversions, tasty, tasty-hunit, tasty-th, text - , transformers + , mtl-compat, network, network-uri, parsec, process, QuickCheck + , split, string-conversions, tasty, tasty-hunit, tasty-th, text + , transformers, transformers-compat }: mkDerivation { pname = "clafer"; - version = "0.4.0"; - sha256 = "f6a58d2a75cb3ff32cad28f7704922bcc596b5ed864e69324cc79cdb38ded2f6"; + version = "0.4.1"; + sha256 = "e3015519a90073e986ed67ba753384b536d9d02652c34aa1195adb6f7e12c0d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base bytestring cmdargs containers data-stringmap directory executable-path filepath HTTP json-builder lens - lens-aeson mtl network network-uri parsec process split - string-conversions text transformers + lens-aeson mtl mtl-compat network network-uri parsec process split + string-conversions text transformers transformers-compat ]; executableHaskellDepends = [ base cmdargs containers filepath mtl process split ]; testHaskellDepends = [ base containers data-stringmap directory doctest filepath HUnit - lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th + lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit + tasty-th transformers-compat ]; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; @@ -33590,29 +33603,31 @@ self: { "claferIG" = callPackage ({ mkDerivation, array, base, clafer, cmdargs, containers , data-stringmap, directory, executable-path, filepath, haskeline - , HaXml, HUnit, json-builder, mtl, parsec, process + , HaXml, HUnit, json-builder, mtl, mtl-compat, parsec, process , string-conversions, tasty, tasty-hunit, tasty-th, transformers + , transformers-compat }: mkDerivation { pname = "claferIG"; - version = "0.4.0"; - sha256 = "dca649803fdbe55b282bb2dd033253cc543d6d59615276b120a1f1f061ad3406"; + version = "0.4.1"; + sha256 = "e804d364884837730b91c46f9dcfa8b39ea7438e9bbd3a810676ba635b6caf33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base clafer containers data-stringmap directory - executable-path filepath haskeline HaXml json-builder mtl parsec - process string-conversions transformers + executable-path filepath haskeline HaXml json-builder mtl + mtl-compat parsec process string-conversions transformers + transformers-compat ]; executableHaskellDepends = [ base clafer cmdargs containers directory executable-path filepath - haskeline mtl transformers + haskeline mtl mtl-compat transformers transformers-compat ]; testHaskellDepends = [ array base clafer cmdargs directory filepath HUnit tasty - tasty-hunit tasty-th transformers + tasty-hunit tasty-th transformers transformers-compat ]; - homepage = "https://github.com/gsdlab/claferIG"; + homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -33621,15 +33636,16 @@ self: { "claferwiki" = callPackage ({ mkDerivation, base, clafer, containers, directory, gitit , MissingH, mtl, network, network-uri, process, SHA, split, time - , transformers, utf8-string + , transformers, transformers-compat, utf8-string }: mkDerivation { pname = "claferwiki"; - version = "0.4.0"; - sha256 = "d0b71d5568ad523fdd4f911c820719f2e00ce05f919cb4d24ffbc002efa7c0c6"; + version = "0.4.1"; + sha256 = "d61f2b7effa17209ab106a90f83ab6afdcea65e1da330bb2d387441d4ec80eb3"; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network - network-uri process SHA split time transformers utf8-string + network-uri process SHA split time transformers transformers-compat + utf8-string ]; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; @@ -56643,6 +56659,7 @@ self: { libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; }) {}; "ghc-syb" = callPackage @@ -66249,8 +66266,8 @@ self: { }: mkDerivation { pname = "haste-compiler"; - version = "0.5.0.1"; - sha256 = "00ceeb7f2b6e7f98a5b8db08f27e5d05013412ec7f8a4df603ef7707e5cc7892"; + version = "0.5.1.2"; + sha256 = "106f844a4ffef0a8b0af954b369bf052c434e1713aa8bdde3d3c3ebc53046b4c"; configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; @@ -66267,7 +66284,6 @@ self: { random shellmate system-fileio tar terminfo transformers unix utf8-string ]; - jailbreak = true; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; @@ -72263,8 +72279,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.6.0"; - sha256 = "cae208d9d8617d45e999fc61fb9e8e3aba0cb38f98d0f00c96c9aa03a09f35b0"; + version = "0.7.0"; + sha256 = "0fb66876b61d665d27f37a2bcbc7c8c2601caec6221d754e9a871311591f6983"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72755,7 +72771,7 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "hquery" = callPackage @@ -79226,8 +79242,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.7.0.3"; - sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80"; + version = "0.7.1.0"; + sha256 = "d36584780949283a606086837abe4d2948d9be6aef01591242b34b4499fded90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81273,18 +81289,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, SHA, tar, text, transformers - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.7.0.0"; - sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7"; + version = "0.8.0.0"; + sha256 = "b5c762842b79536bdb405134de22219198215c4b8634d23372354b035308215d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cereal containers directory filepath mtl SHA - tar text transformers uuid zeromq4-haskell + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers uuid zeromq4-haskell ]; executableHaskellDepends = [ base filepath mtl parsec text transformers @@ -81380,8 +81396,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "1.1.1"; - sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb"; + version = "1.1.1.1"; + sha256 = "0cdfaf79a670732f579320b2e9668e55d086428b3bbb686220914508e604fdc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86826,7 +86842,7 @@ self: { homepage = "https://github.com/mnacamura/learning-hmm"; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "leetify" = callPackage @@ -88908,9 +88924,9 @@ self: { "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip - , filepath, ghc-prim, hashable, intern, mtl, parsec, pretty + , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format - , transformers, unordered-containers + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; @@ -88918,6 +88934,7 @@ self: { sha256 = "7414b580a3ec8185da5e5148b46cef5d15e347080eb2561fcd228c72e7669816"; revision = "2"; editedCabalFile = "10397e387d91256dcd35cae36cb27ae302418c3c80da6e65d417657783beaf6b"; + configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88931,14 +88948,16 @@ self: { deepseq directory filepath hashable mtl parsec pretty process syb text text-format unordered-containers ]; + executableSystemDepends = [ ocaml ]; testHaskellDepends = [ base directory filepath process tasty tasty-hunit tasty-rerun text ]; + testSystemDepends = [ z3 ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors @@ -88947,7 +88966,7 @@ self: { , ghc-paths, hashable, hpc, hscolour, intern, liquid-fixpoint, mtl , optparse-applicative, parsec, pretty, process, stm, syb, tagged , tasty, tasty-hunit, tasty-rerun, template-haskell, text, time - , transformers, unordered-containers, vector + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; @@ -88973,11 +88992,12 @@ self: { base containers directory filepath mtl optparse-applicative process stm tagged tasty tasty-hunit tasty-rerun transformers ]; + testSystemDepends = [ z3 ]; homepage = "http://goto.ucsd.edu/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) z3;}; "lispparser" = callPackage ({ mkDerivation, base, parsec }: @@ -89755,6 +89775,7 @@ self: { homepage = "http://github.com/gridaphobe/located-base"; description = "Location-aware variants of partial functions"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; }) {}; "locators" = callPackage @@ -97652,17 +97673,15 @@ self: { "nagios-check" = callPackage ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl - , nagios-perfdata, QuickCheck, text + , QuickCheck, text }: mkDerivation { pname = "nagios-check"; - version = "0.3.1"; - sha256 = "4c20ce048e51ea80ffb055e00374a91a98a9d9202ab302ec60b232e3851d9c9f"; - libraryHaskellDepends = [ - base bifunctors exceptions mtl nagios-perfdata text - ]; + version = "0.3.2"; + sha256 = "1bc9b85cb10c396943d53c44e2701c5bc2a02ecdf3e8f46da238981f8b7860b7"; + libraryHaskellDepends = [ base bifunctors exceptions mtl text ]; testHaskellDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/fractalcat/haskell-nagios-check"; + homepage = "https://github.com/olorin/haskell-nagios-check"; description = "Package for writing monitoring plugins"; license = stdenv.lib.licenses.mit; }) {}; @@ -101425,14 +101444,15 @@ self: { "opaleye" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, postgresql-simple - , pretty, product-profunctors, profunctors, QuickCheck, semigroups - , text, time, time-locale-compat, transformers, uuid, void + , case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void }: mkDerivation { pname = "opaleye"; - version = "0.4.0.0"; - sha256 = "3387a369f811a73d5a2be9b57827ade2a6275b56e4e02da365185e918befeeb7"; + version = "0.4.1.0"; + sha256 = "eca2210c89f76ddcc01c927d317fe58b212a446bffd3d61264a52056edcb91eb"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -101440,8 +101460,8 @@ self: { uuid void ]; testHaskellDepends = [ - base containers contravariant postgresql-simple product-profunctors - profunctors QuickCheck semigroups time + base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups time ]; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; @@ -105019,8 +105039,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.2"; - sha256 = "e9bb569739cb268b6a6895490ce4235bc789cd1fddc98ac3ac79cac7b7930a26"; + version = "2.3"; + sha256 = "c4d24a212698b78bd25fb9c8024291f0f4914cd76dbbac00c629abc7f64d4342"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -107475,8 +107495,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.2.2"; - sha256 = "9bfdb948d425f7628c67ca3a5c57c23e971852e92904a509377aa8df36c82bcf"; + version = "0.4.3"; + sha256 = "b8f6dd052e2b494f01cafa2613510ef8a62b8fad6a445fe0fd60723fbca388db"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -117899,8 +117919,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.2.1"; - sha256 = "e061abe1b6015818461fbdcacc91509575af8865bea5d024eb4b4f74e23d6a53"; + version = "0.2.1.1"; + sha256 = "fdcad5f9b1b98e0a8720317fe20b8a696efcdda88f7384dc8e579dd026a17ad6"; libraryHaskellDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -120742,8 +120762,8 @@ self: { }: mkDerivation { pname = "shake-language-c"; - version = "0.8.0"; - sha256 = "65d408c47b622ef0cce3f1c17faa0ab67457a1268941db0ce83ebe7c5988feac"; + version = "0.8.1"; + sha256 = "707631799b102d375610a4b5bff567c8ad5b62e36616d162bac1ca8617915073"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -125732,7 +125752,7 @@ self: { homepage = "https://github.com/yanatan16/haskell-spsa"; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "spy" = callPackage @@ -126493,8 +126513,8 @@ self: { }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.5"; - sha256 = "daaeafd7c23148eec97dc23e1a94fa76d4b6972268b7ff4e3a5b13fb3517b134"; + version = "0.1.6"; + sha256 = "ade45f67b92175869594e64e68f3076feba3b50e863b8b588cff69310def1bdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -128385,21 +128405,21 @@ self: { }) {}; "subhask" = callPackage - ({ mkDerivation, approximate, base, bloomfilter, bytes, bytestring - , cassava, containers, deepseq, erf, gamma, ghc-prim, hmatrix - , hyperloglog, lens, monad-primitive, MonadRandom, mtl, parallel - , pipes, primitive, QuickCheck, semigroups, template-haskell + ({ mkDerivation, approximate, array, base, bloomfilter, bytes + , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim + , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl + , parallel, primitive, QuickCheck, semigroups, template-haskell , test-framework, test-framework-quickcheck2, vector }: mkDerivation { pname = "subhask"; - version = "0.1.0.1"; - sha256 = "1559bd6c7322281cb43ce988715e57ec91f4795da3abddf9a92967c55835229f"; + version = "0.1.1.0"; + sha256 = "c3e5a727ed988acb4c2a1083136be2faead19bef252345b12695d5050cddc791"; libraryHaskellDepends = [ - approximate base bloomfilter bytes bytestring cassava containers - deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive - MonadRandom mtl parallel pipes primitive QuickCheck semigroups - template-haskell vector + approximate array base bloomfilter bytes bytestring cassava + containers deepseq erf gamma ghc-prim hmatrix hyperloglog lens + monad-primitive MonadRandom mtl parallel primitive QuickCheck + semigroups template-haskell vector ]; testHaskellDepends = [ base test-framework test-framework-quickcheck2 @@ -130567,11 +130587,12 @@ self: { , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck , syb, tagged, tasty, tasty-hunit, template-haskell, text , text-format, th-lift, transformers, unordered-containers, vector + , z3 }: mkDerivation { pname = "target"; - version = "0.2.0.0"; - sha256 = "249c5936784131d4a114dbfe920aa5dca38b1116b64138273af31710e68b735b"; + version = "0.2.0.1"; + sha256 = "a6366a2eddf278e368ec6b49c7aa483433fad6d473d5bc1751c0049ccd1a98cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130586,10 +130607,11 @@ self: { liquidhaskell mtl tagged tasty tasty-hunit template-haskell unordered-containers ]; + testSystemDepends = [ z3 ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) z3;}; "task" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers @@ -133592,10 +133614,9 @@ self: { ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "tiempo"; - version = "0.0.1.0"; - sha256 = "19a5844015557eff08088469395fe3593021d2c027c607eb1f7fd8c5788caabe"; + version = "0.0.1.1"; + sha256 = "a8b04eef8e1eca0a496410eb82289345c2060be8726b09f5f4b0242d9ffe4a8e"; libraryHaskellDepends = [ base deepseq time ]; - jailbreak = true; homepage = "http://github.com/HaskVan/tiempo"; description = "Specify time intervals in different units (secs, mins, hours, etc.)"; license = stdenv.lib.licenses.mit; @@ -139813,8 +139834,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "varying"; - version = "0.1.1.2"; - sha256 = "044d0321b199cadb2b8d28edcadfcab4a48708eb49ad27e1c3baf206eb736041"; + version = "0.1.3.0"; + sha256 = "c07d54d7263df225f76f4e4b3ce19b962edabf1bef6b93ea571fca4a1d004888"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base time ]; @@ -140578,7 +140599,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = [ "x86_64-linux" ]; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -141586,7 +141607,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "wai-middleware-etag" = callPackage @@ -147008,17 +147029,17 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate , lens-family-core, lens-family-th, MonadRandom, mtl, persistent - , shakespeare, text, time, transformers, yesod-core, yesod-form - , yesod-markdown + , shakespeare, text, time, transformers, yaml, yesod-core + , yesod-form, yesod-markdown }: mkDerivation { pname = "yesod-bootstrap"; - version = "0.1.0.0"; - sha256 = "eff7662f9cc62d97922f947505b1200ac1909fad7d954c668aba6a0d66601fa6"; + version = "0.2"; + sha256 = "d99b97f9ebef228039b9c48725dbf5e610389d99ce7b3f39673741339927c5bd"; libraryHaskellDepends = [ base blaze-html blaze-markup conduit conduit-extra containers either email-validate lens-family-core lens-family-th MonadRandom - mtl persistent shakespeare text time transformers yesod-core + mtl persistent shakespeare text time transformers yaml yesod-core yesod-form yesod-markdown ]; description = "Bootstrap widgets for yesod"; @@ -148738,8 +148759,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "zalgo"; - version = "0.1.1.0"; - sha256 = "9d102c28680942c8c2e1b1636723b31b8af7459e9946e39c771691b66e1dc1ad"; + version = "0.2.0.0"; + sha256 = "5f63a88038ee13dd594907b3591ea2747a563f2a591294b7285a9db83539bf5b"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/mniip/zalgo"; description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; From c310a5f608d08995afefad0170786551cc4d0d8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 12:52:41 +0200 Subject: [PATCH 105/188] all-packages.nix: instantiate 'perlPackages' with callPackage rather than import This allows us to override the attributes passed to the package set, which is needed to pass "imagemagickBig" to PerlMagic rather than the normal one (see next commit). This patch is brought to you courtesy of the venerable @vcunat. --- 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 8d76a8c11f0..958a428e196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8738,7 +8738,7 @@ let buildPerlPackage = import ../development/perl-modules/generic perl; - perlPackages = recurseIntoAttrs (import ./perl-packages.nix { + perlPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { inherit pkgs; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); From 614ed1e1adaa418337a2e5261d7f0dfe23f13a28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 12:55:24 +0200 Subject: [PATCH 106/188] ikiwiki: use PerlMagick with imagemagickBig rather than the light version Ikiwiki needs a version of PerlMagick that has ghostscript to fix https://github.com/NixOS/nixpkgs/issues/9473. This patch is brought to you courtesy of the venerable @vcunat. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 958a428e196..6b9a82edf33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11845,8 +11845,9 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir + RpcXML XMLSimple YAML YAMLLibYAML HTMLTree Filechdir AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; + inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; imagemagick_light = imagemagick.override { From bd84ebaa1e0359f41350e053ed24592b169b5714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 2 Sep 2015 13:18:09 +0200 Subject: [PATCH 107/188] nixos: document nvidia legacy driver options --- nixos/doc/manual/configuration/x-windows.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 95e66f0c70c..7f43acab2c3 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -61,6 +61,12 @@ by default because it’s not free software. You can enable it as follows: services.xserver.videoDrivers = [ "nvidia" ]; +Or if you have an older card, you may have to use one of the legacy drivers: + +services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy173" ]; + You may need to reboot after enabling this driver to prevent a clash with other kernel modules. From 6c377c864a175da6a30160c0274071b4db5ba897 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 2 Sep 2015 16:00:55 +0200 Subject: [PATCH 108/188] cassandra: 2.1.8 -> 2.1.9 The 2.1.8 sources have been removed upstream. --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index dd06d946128..9869682ae8a 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -11,8 +11,8 @@ let - version = "2.1.8"; - sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s"; + version = "2.1.9"; + sha256 = "10nwh7kx4k0kkfvl3sf22v3x58q37b81lkr6s6gvzkq67f6mjcvs"; in From e70f8c58cc145cc2dd833388a3279988ec5b44d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2015 15:38:06 +0200 Subject: [PATCH 109/188] Manual: Document system.autoUpgrade --- nixos/doc/manual/installation/upgrading.xml | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 5a9d1f24f7c..c4812cc637c 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -107,4 +107,30 @@ newer Nix version, which may involve an upgrade of Nix’s database schema. This cannot be undone easily, so in that case you will not be able to go back to your original channel. + +
Automatic Upgrades + +You can keep a NixOS system up-to-date automatically by adding +the following to configuration.nix: + + +system.autoUpgrade.enable = true; + + +This enables a periodically executed systemd service named +nixos-upgrade.service. It runs +nixos-rebuild switch --upgrade to upgrade NixOS to +the latest version in the current channel. (To see when the service +runs, see systemctl list-timers.) You can also +specify a channel explicitly, e.g. + + +system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09; + + + + +
+ + From 6e767657951788775451859f1c36d4eb0230581c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2015 16:09:05 +0200 Subject: [PATCH 110/188] If !cfg.mutableUsers, require a password or SSH authorized key Fixes https://github.com/NixOS/nixpkgs/issues/7308 --- nixos/modules/config/users-groups.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 478f433b431..776c482bf7f 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -216,7 +216,7 @@ let exist. If is true, the password can be changed subsequently using the passwd command. Otherwise, it's - equivalent to setting the option. + equivalent to setting the option. ${hashedPasswordDescription} ''; @@ -525,6 +525,27 @@ in { { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); message = "UIDs and GIDs must be unique!"; } + { # If mutableUsers is false, to prevent users creating a + # configuration that locks them out of the system, ensure that + # there is at least one "privileged" account that has a + # password or an SSH authorized key. Privileged accounts are + # root and users in the wheel group. + assertion = !cfg.mutableUsers -> + any id (mapAttrsToList (name: cfg: + (name == "root" + || cfg.group == "wheel" + || elem "wheel" cfg.extraGroups) + && + ((cfg.hashedPassword != null && cfg.hashedPassword != "!") + || cfg.password != null + || cfg.passwordFile != null + || cfg.openssh.authorizedKeys.keys != [] + || cfg.openssh.authorizedKeys.keyFiles != []) + ) cfg.extraUsers); + message = '' + Neither the root account nor any wheel user has a password or SSH authorized key. + You must set one to prevent being locked out of your system.''; + } ]; }; From 07542d12eaf344c7e0c7b9e9735826eecba607c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 16:24:06 +0200 Subject: [PATCH 111/188] hoogle: use $NIX_BUILD_CORES to determine the proper level of parallelism for database creation --- pkgs/development/haskell-modules/hoogle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index e2f6c289a80..14464ceca80 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { echo building hoogle database # FIXME: rehoo is marked as depricated on Hackage chmod 644 *.hoo *.txt - rehoo -j4 -c64 . + rehoo -j$NIX_BUILD_CORES -c64 . mv default.hoo .x rm -fr downloads *.dep *.txt *.hoo From dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 16:51:35 +0200 Subject: [PATCH 112/188] haskell-generic-builder: improve meta.platforms vs. meta.hydraPlatforms logic hydraPlatforms now defaults to the value of meta.platforms rather than defaulting to ghc.meta.hydraPlatforms. This solution is, in fact, still sub-optimal. See https://github.com/NixOS/nixpkgs/issues/9608 for further details. --- pkgs/development/haskell-modules/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c04d8fdb409..3442e873080 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -22,7 +22,8 @@ , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms +, platforms ? ghc.meta.platforms +, hydraPlatforms ? platforms , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -31,7 +32,6 @@ , doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] -, platforms ? ghc.meta.platforms , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] , testTarget ? "" , broken ? false From 14321ae2431e33f5ed81f1ee43eddd29c7e9d01d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2015 17:32:38 +0200 Subject: [PATCH 113/188] Rename users.extraUsers -> users.users, users.extraGroup -> users.groups The "extra" part hasn't made sense for years. --- nixos/modules/config/users-groups.nix | 32 +++++++++---------- nixos/modules/rename.nix | 2 ++ .../modules/services/networking/ssh/sshd.nix | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 776c482bf7f..adc014eed41 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -336,13 +336,13 @@ let map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n") user.subUidRanges); - subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers)); + subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.users)); mkSubgidEntry = user: concatStrings ( map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") user.subGidRanges); - subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers)); + subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.users)); idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }: let @@ -354,8 +354,8 @@ let else { dup = false; acc = newAcc; } ) { dup = false; acc = {}; } (builtins.attrNames set)).dup; - uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.extraUsers) "uid"; - gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.extraGroups) "gid"; + uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.users) "uid"; + gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.groups) "gid"; spec = pkgs.writeText "users-groups.json" (builtins.toJSON { inherit (cfg) mutableUsers; @@ -364,13 +364,13 @@ let name uid group description home shell createHome isSystemUser password passwordFile hashedPassword initialPassword initialHashedPassword; - }) cfg.extraUsers; + }) cfg.users; groups = mapAttrsToList (n: g: { inherit (g) name gid; members = g.members ++ (mapAttrsToList (n: u: u.name) ( - filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers + filterAttrs (n: u: elem g.name u.extraGroups) cfg.users )); - }) cfg.extraGroups; + }) cfg.groups; }); in { @@ -388,10 +388,10 @@ in { groupadd commands. On system activation, the existing contents of the /etc/passwd and /etc/group files will be merged with the - contents generated from the users.extraUsers and - users.extraGroups options. + contents generated from the users.users and + users.groups options. The initial password for a user will be set - according to users.extraUsers, but existing passwords + according to users.users, but existing passwords will not be changed. @@ -399,7 +399,7 @@ in { group files will simply be replaced on system activation. This also holds for the user passwords; all changed passwords will be reset according to the - users.extraUsers configuration on activation. + users.users configuration on activation. ''; }; @@ -412,7 +412,7 @@ in { ''; }; - users.extraUsers = mkOption { + users.users = mkOption { default = {}; type = types.loaOf types.optionSet; example = { @@ -433,7 +433,7 @@ in { options = [ userOpts ]; }; - users.extraGroups = mkOption { + users.groups = mkOption { default = {}; example = { students.gid = 1001; @@ -461,7 +461,7 @@ in { config = { - users.extraUsers = { + users.users = { root = { uid = ids.uids.root; description = "System administrator"; @@ -478,7 +478,7 @@ in { }; }; - users.extraGroups = { + users.groups = { root.gid = ids.gids.root; wheel.gid = ids.gids.wheel; disk.gid = ids.gids.disk; @@ -541,7 +541,7 @@ in { || cfg.passwordFile != null || cfg.openssh.authorizedKeys.keys != [] || cfg.openssh.authorizedKeys.keyFiles != []) - ) cfg.extraUsers); + ) cfg.users); message = '' Neither the root account nor any wheel user has a password or SSH authorized key. You must set one to prevent being locked out of your system.''; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 6f7dcb837a0..cb378b02449 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -77,6 +77,8 @@ in zipModules ([] ++ obsolete [ "environment" "nix" ] [ "nix" "package" ] ++ obsolete [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ] ++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ] +++ alias [ "users" "extraUsers" ] [ "users" "users" ] +++ alias [ "users" "extraGroups" ] [ "users" "groups" ] ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ] ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ] diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 4c7e4d8d088..5baea4bc6ae 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -214,7 +214,7 @@ in }; - users.extraUsers = mkOption { + users.users = mkOption { options = [ userOptions ]; }; From 13532ee161c4f0b2d26365bf94403f48a4ada8c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2015 17:40:19 +0200 Subject: [PATCH 114/188] command-not-found: Use attribute name --- .../modules/programs/command-not-found/command-not-found.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 916649059d3..621b79d1654 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -30,11 +30,11 @@ The program ‘$program’ is currently not installed. It is provided by the package ‘$package’, which I will now install for you. EOF ; - exit 126 if system("nix-env", "-i", $package) == 0; + exit 126 if system("nix-env", "-iA", $package) == 0; } else { print STDERR <{package}\n" foreach @$res; + print STDERR " nix-env -iA $_->{package}\n" foreach @$res; } exit 127; From ada81b80fd638724a0aa5800762d7f4b6a4e344b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 17:29:20 +0200 Subject: [PATCH 115/188] cabal2nix: update to version 20150824-66-gd281a60 This patch fixes https://github.com/NixOS/nixpkgs/issues/9599. --- .../haskell-modules/configuration-common.nix | 6 +- .../tools/haskell/cabal2nix/cabal2nix.nix | 37 ++++++++++++ .../tools/haskell/cabal2nix/default.nix | 56 ------------------- .../cabal2nix/distribution-nixpkgs.nix | 33 +++++++++++ .../tools/haskell/cabal2nix/hackage2nix.nix | 32 +++++++++++ .../tools/haskell/cabal2nix/language-nix.nix | 23 ++++++++ .../cabal2nix/lens-construction-helper.nix | 18 ++++++ 7 files changed, 148 insertions(+), 57 deletions(-) create mode 100644 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix delete mode 100644 pkgs/development/tools/haskell/cabal2nix/default.nix create mode 100644 pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix create mode 100644 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix create mode 100644 pkgs/development/tools/haskell/cabal2nix/language-nix.nix create mode 100644 pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 759b1658968..6c602627fe7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -754,7 +754,11 @@ self: super: { zlib = dontCheck super.zlib; # Override the obsolete version from Hackage with our more up-to-date copy. - cabal2nix = self.callPackage ../tools/haskell/cabal2nix {}; + cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {}; + hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {}; + lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.nix {}; + language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {}; + distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {}; # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7 HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding; diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix new file mode 100644 index 00000000000..c12cd2cfce2 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -0,0 +1,37 @@ +{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs +, language-nix, lens, lens-construction-helper, optparse-applicative, pretty +, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper +}: + +mkDerivation rec { + pname = "cabal2nix"; + version = "20150824-66-gd281a60"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + }; + postUnpack = "sourceRoot+=/${pname}"; + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + executableHaskellDepends = [ + ansi-wl-pprint base Cabal containers distribution-nixpkgs + language-nix lens lens-construction-helper optparse-applicative + pretty pretty-show + ]; + executableToolDepends = [ makeWrapper ]; + postInstall = '' + exe=$out/libexec/${pname}-${version}/${pname} + install -D $out/bin/${pname} $exe + rm -rf $out/{bin,lib,share} + makeWrapper $exe $out/bin/${pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin" + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname} + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix deleted file mode 100644 index eb0a7c5add9..00000000000 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ mkDerivation, fetchgit, 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 -, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default -, nix-prefetch-scripts -}: - -mkDerivation rec { - pname = "cabal2nix"; - version = "20150824"; - src = fetchgit { - url = "http://github.com/NixOS/cabal2nix.git"; - rev = "560fb2b1d22f4c995a526529bb034bd183e85a31"; - sha256 = "1pyjy9kb8g18g6shlg7vnyaspa892zaq4hqvmqvdbxrlf24vg0wp"; - deepClone = true; - }; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - 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 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 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 data-default - ]; - buildDepends = [ cartel ]; - buildTools = [ gitMinimal makeWrapper ]; - preConfigure = '' - git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes. - runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal - ''; - postInstall = '' - exe=$out/libexec/${pname}-${version}/cabal2nix - install -D $out/bin/cabal2nix $exe - rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix - ''; - 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 ]; -} diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix new file mode 100644 index 00000000000..d879ea051e8 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -0,0 +1,33 @@ +{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq +, deepseq-generics, directory, doctest, filepath, hackage-db, hspec +, language-nix, lens, lens-construction-helper, pretty, process +, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub +}: + +mkDerivation rec { + pname = "distribution-nixpkgs"; + version = "20150824-66-gd281a60"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + }; + postUnpack = "sourceRoot+=/${pname}"; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq deepseq-generics + directory doctest filepath hackage-db hspec language-nix lens + lens-construction-helper pretty process SHA split transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers deepseq deepseq-generics + directory doctest filepath hackage-db hspec language-nix lens + lens-construction-helper pretty process SHA split transformers + utf8-string + ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix new file mode 100644 index 00000000000..5345fe5f413 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -0,0 +1,32 @@ +{ mkDerivation, base, Cabal, containers, distribution-nixpkgs +, filepath, language-nix, lens, monad-par, monad-par-extras, mtl +, optparse-applicative, pretty, stdenv, fetchFromGitHub +}: + +mkDerivation rec { + pname = "hackage2nix"; + version = "20150824-66-gd281a60"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + }; + postUnpack = "sourceRoot+=/${pname}"; + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + executableHaskellDepends = [ + base Cabal containers distribution-nixpkgs filepath language-nix + lens monad-par monad-par-extras mtl optparse-applicative pretty + ]; + postInstall = '' + exe=$out/bin/${pname} + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname} + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix new file mode 100644 index 00000000000..a9e02f25449 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix @@ -0,0 +1,23 @@ +{ mkDerivation, base, data-default-class, deepseq-generics, lens +, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub +}: + +mkDerivation rec { + pname = "language-nix"; + version = "20150824-66-gd281a60"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + }; + postUnpack = "sourceRoot+=/${pname}"; + libraryHaskellDepends = [ + base data-default-class deepseq-generics lens + lens-construction-helper pretty regex-posix + ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Data types and useful functions to represent and manipulate the Nix language"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix new file mode 100644 index 00000000000..0508795486f --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }: + +mkDerivation rec { + pname = "lens-construction-helper"; + version = "20150824-66-gd281a60"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + }; + postUnpack = "sourceRoot+=/${pname}"; + libraryHaskellDepends = [ base data-default-class lens ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Use data-default to create default instances of various types"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} From 7182ef35f458de1e2e96317ad2d71517e8abe58c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 17:45:39 +0200 Subject: [PATCH 116/188] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4 with hackage2nix v20150824-68-ga8b9f17 --- pkgs/development/haskell-modules/hackage-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dab185b20ea..7accc1626eb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -126301,6 +126301,11 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; From 44788bb2ce5ecb025b63c71226ab613a05a334d3 Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Thu, 27 Aug 2015 14:01:10 +0000 Subject: [PATCH 117/188] fixed syncthing service to work as expected --- nixos/modules/services/networking/syncthing.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 02572c1e27d..d5accfef1cb 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -36,9 +36,7 @@ in dataDir = mkOption { default = "/var/lib/syncthing"; description = '' - Path where the `.syncthing` (settings and keys) and `Sync` - (your synced files) directories will exist. This can be your home - directory. + Path where the settings and keys will exist. ''; }; @@ -57,18 +55,12 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment.STNORESTART = "placeholder"; # do not self-restart - environment.HOME = "${cfg.dataDir}"; serviceConfig = { User = "${cfg.user}"; PermissionsStartOnly = true; Restart = "always"; - ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${cfg.dataDir}/.syncthing"; + ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; }; - preStart = '' - mkdir -p ${cfg.dataDir} - chown ${cfg.user} ${cfg.dataDir} - ''; - }; environment.systemPackages = [ pkgs.syncthing ]; From c090efb9d84b7be09c1109de7a39e6ac711d6b16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2015 19:48:52 +0200 Subject: [PATCH 118/188] command-not-found: Fix nix-env invocation --- .../programs/command-not-found/command-not-found.nix | 4 ++-- .../modules/programs/command-not-found/command-not-found.pl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index bead2dcdcf9..9524d91ea3b 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -57,9 +57,9 @@ in if [ $? = 126 ]; then "$@" fi - else + else # Indicate than there was an error so ZSH falls back to its default handler - return 127 + return 127 fi } ''; diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 621b79d1654..b233d973a4a 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -30,11 +30,11 @@ The program ‘$program’ is currently not installed. It is provided by the package ‘$package’, which I will now install for you. EOF ; - exit 126 if system("nix-env", "-iA", $package) == 0; + exit 126 if system("nix-env", "-iA", "nixos.$package") == 0; } else { print STDERR <{package}\n" foreach @$res; + print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res; } exit 127; From 5385a0a82a42e6bbd2d8244d9042dcee11bf180e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 2 Sep 2015 19:58:44 +0200 Subject: [PATCH 119/188] cassandra: use mirrors Upstream likes to move "old" releases to an archive mirror as soon as a new one is released. This is now handled for free by mirrors.nix. (No idea why cs.utah.edu was used to begin with; it's now added to mirrors.nix. Note that it doesn't support SSL, but that applies to several others so I don't see the harm.) --- pkgs/build-support/fetchurl/mirrors.nix | 1 + pkgs/servers/nosql/cassandra/1.2.nix | 2 +- pkgs/servers/nosql/cassandra/2.0.nix | 2 +- pkgs/servers/nosql/cassandra/2.1.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 2f6a4d36327..cf986a064d9 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -280,6 +280,7 @@ rec { http://archive.apache.org/dist/ # fallback for old releases ftp://ftp.funet.fi/pub/mirrors/apache.org/ http://apache.cs.uu.nl/dist/ + http://apache.cs.utah.edu/ ]; postgresql = [ diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix index 75992ceb9ef..1507787ae00 100644 --- a/pkgs/servers/nosql/cassandra/1.2.nix +++ b/pkgs/servers/nosql/cassandra/1.2.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index a4aca1c55c1..d1c76c83a7e 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 9869682ae8a..36905b5675a 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; From 513bae1f2e8aee3ed2dd8b63379d629f13b8c43c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Sep 2015 21:13:45 +0300 Subject: [PATCH 120/188] bomi, mpv: avoid using deprecated youtube-dl name --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b9a82edf33..41c27b598d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11012,6 +11012,7 @@ let cmatrix = callPackage ../applications/misc/cmatrix { }; bomi = callPackage ../applications/video/bomi { + youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; }; @@ -12244,6 +12245,7 @@ let mpv = callPackage ../applications/video/mpv rec { lua = lua5_1; lua5_sockets = lua5_1_sockets; + youtube-dl = pythonPackages.youtube-dl; bs2bSupport = config.mpv.bs2bSupport or true; youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; From fb16b908bc099409650cfc8028dbc057a4cf366b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Sep 2015 20:22:32 +0200 Subject: [PATCH 121/188] qbittorrent: partial revert of 1d78f31b765f8e3fe81d79f5bc9ae381271094da MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It still fails on 32bit: http://hydra.nixos.org/build/25460116/nixlog/1/raw (cherry picked from commit 57391b7322d97aa03158c730aec318cb0e8d2b2d) Signed-off-by: Domen Kožar --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 8ff11dba905..f8c025ba241 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { (if webuiSupport then "" else "--disable-webui") ] ++ optional debugSupport "--enable-debug"; - enableParallelBuilding = true; + # https://github.com/qbittorrent/qBittorrent/issues/1992 + enableParallelBuilding = false; meta = { description = "Free Software alternative to µtorrent"; From 0dfdb8938bb89a59b82206a606adf7231f350f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Sep 2015 20:26:02 +0200 Subject: [PATCH 122/188] meshlab: broken on i686 --- pkgs/applications/graphics/meshlab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 94102663a8c..49bfb47c85a 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = stdenv.isLinux && stdenv.isi686; }; } From 282bc1a10ca37aea7e1e20decc62971e15b3897e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Sep 2015 20:29:09 +0200 Subject: [PATCH 123/188] ocaml.asn1-combinators: mark broken on i686 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 36b406fd1b993c070579a1857cfd3ca816e21f91) Signed-off-by: Domen Kožar --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 41f73b2f834..b3555d7fddb 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { platforms = ocaml.meta.platforms; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; + broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 }; } From 9aa6ca473b100132c6d89a0733044dca865f3844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Sep 2015 20:35:46 +0200 Subject: [PATCH 124/188] pcg-c: mark as broken on i686 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6cfbdda1e9b28817772bb322c40c62f65ac101c2) Signed-off-by: Domen Kožar --- pkgs/development/libraries/pcg-c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 4b8cedd90c7..a165c539ae8 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.linus ]; repositories.git = git://github.com/imneme/pcg-c.git; + broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } From 13b63c29aea88276227da8fbff85af5eb3c78441 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Sep 2015 21:40:40 +0300 Subject: [PATCH 125/188] rxvt_unicode_with-plugins: move to the deprecated names section --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41c27b598d4..904290caf94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12746,9 +12746,6 @@ let plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ]; }; - # FIXME: remove somewhere in future - rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; - sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte_290; }; @@ -15347,6 +15344,7 @@ let nfsUtils = nfs-utils; # added 2014-12-06 rdiff_backup = rdiff-backup; # added 2014-11-23 rssglx = rss-glx; #added 2015-03-25 + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 From acdc9370f5bceb1f8fdadc0b096cb6b6e888125f Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 2 Sep 2015 12:13:57 -0700 Subject: [PATCH 126/188] emacs-packages: idris-mode 0.9.18 -> 0.9.19 --- pkgs/top-level/emacs-packages.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4e03c300448..6ec01551aed 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -828,13 +828,14 @@ let self = _self // overrides; idris-mode = melpaBuild rec { pname = "idris-mode"; - version = "0.9.18"; + version = "0.9.19"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; rev = version; - sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg"; + sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92"; }; + packageRequires = [ prop-menu ]; meta = { license = gpl3Plus; }; }; @@ -1105,6 +1106,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + prop-menu = melpaBuild rec { + pname = "prop-menu"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "david-christiansen"; + repo = "${pname}-el"; + rev = version; + sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc"; + }; + meta = { license = gpl3Plus; }; + }; + rainbow-delimiters = melpaBuild rec { pname = "rainbow-delimiters"; version = "2.1.1"; From 89cec0c096d3b06c61553d616cabbab229ea616f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Sep 2015 21:16:00 +0200 Subject: [PATCH 127/188] racket: don't build docs as it causes failures sometimes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1a392bd62e4d8ff92ec92ebe48912b8295714e2e) Signed-off-by: Domen Kožar --- pkgs/development/interpreters/racket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d41b0424b44..8aa75829554 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cd src/build ''; - configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; + configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"]; configureScript = "../configure"; From 424ad5302e089e213d734ac460620c623205ab8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 2 Sep 2015 22:12:34 +0200 Subject: [PATCH 128/188] Remove tessel: too outdated, and broken --- pkgs/applications/misc/tessel/default.nix | 40 - pkgs/applications/misc/tessel/package.nix | 1974 --------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 2016 deletions(-) delete mode 100644 pkgs/applications/misc/tessel/default.nix delete mode 100644 pkgs/applications/misc/tessel/package.nix diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix deleted file mode 100644 index 6a11713c750..00000000000 --- a/pkgs/applications/misc/tessel/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }: - -with stdenv.lib; - -let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - neededNatives = [ libusb1 pkgconfig python utillinux ]; - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - name = "tessel-0.3.16"; - bin = true; - - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz"; - name = "tessel-0.3.16.tgz"; - sha1 = "900a8d897ba03d7a9d5927697180284772d70738"; - }) - ]; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - postInstall = '' - mkdir -p $out/etc/udev/rules.d - cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/ - ''; - - passthru.names = [ "tessel" ]; - - meta = { - description = "Command line tools and programmatic access library for Tessel devices"; - homepage = https://tessel.io; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix deleted file mode 100644 index d388387ccaf..00000000000 --- a/pkgs/applications/misc/tessel/package.nix +++ /dev/null @@ -1,1974 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.5"; - by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; - name = "abbrev-1.0.5.tgz"; - sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; - }) - ]; - buildInputs = - (self.nativeDeps."abbrev" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "abbrev" ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "asn1-0.1.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }) - ]; - buildInputs = - (self.nativeDeps."asn1" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "asn1" ]; - }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "assert-plus-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; - }) - ]; - buildInputs = - (self.nativeDeps."assert-plus" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "assert-plus" ]; - }; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.10"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.9.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign2-0.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sign2" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "aws-sign2" ]; - }; - by-spec."bindings-shyp"."~0.2.3" = - self.by-version."bindings-shyp"."0.2.3"; - by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "bindings-shyp-0.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz"; - name = "bindings-shyp-0.2.3.tgz"; - sha1 = "909151c14c701f350eb6be8ad14784ad79813671"; - }) - ]; - buildInputs = - (self.nativeDeps."bindings-shyp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bindings-shyp" ]; - }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "block-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; - }) - ]; - buildInputs = - (self.nativeDeps."block-stream" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "block-stream" ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "boom-0.4.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }) - ]; - buildInputs = - (self.nativeDeps."boom" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "boom" ]; - }; - by-spec."buffer-equal"."~0.0.0" = - self.by-version."buffer-equal"."0.0.1"; - by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-equal-0.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - name = "buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "buffer-equal" ]; - }; - by-spec."bunker"."0.1.X" = - self.by-version."bunker"."0.1.2"; - by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "bunker-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; - name = "bunker-0.1.2.tgz"; - sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; - }) - ]; - buildInputs = - (self.nativeDeps."bunker" or []); - deps = { - "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; - }; - peerDependencies = [ - ]; - passthru.names = [ "bunker" ]; - }; - by-spec."burrito".">=0.2.5 <0.3" = - self.by-version."burrito"."0.2.12"; - by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "burrito-0.2.12"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; - name = "burrito-0.2.12.tgz"; - sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; - }) - ]; - buildInputs = - (self.nativeDeps."burrito" or []); - deps = { - "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; - "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "burrito" ]; - }; - by-spec."charm"."0.1.x" = - self.by-version."charm"."0.1.2"; - by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "charm-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; - name = "charm-0.1.2.tgz"; - sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; - }) - ]; - buildInputs = - (self.nativeDeps."charm" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "charm" ]; - }; - by-spec."colony-compiler"."~0.6.21" = - self.by-version."colony-compiler"."0.6.23"; - by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-0.6.23"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz"; - name = "colony-compiler-0.6.23.tgz"; - sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler" or []); - deps = { - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "optimist-0.5.2" = self.by-version."optimist"."0.5.2"; - "nan-1.0.0" = self.by-version."nan"."1.0.0"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler" ]; - }; - "colony-compiler" = self.by-version."colony-compiler"."0.6.23"; - by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-darwin-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - sha1 = "33eedbee7ff8679fde69ba03bf27777110113732"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-darwin-x64" ]; - }; - by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-ia32-0.6.17-1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-ia32" ]; - }; - by-spec."colony-compiler-shyp-win32-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-x64" ]; - }; - by-spec."colors"."0.5.x" = - self.by-version."colors"."0.5.1"; - by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.5.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; - name = "colors-0.5.1.tgz"; - sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - by-spec."colors"."~0.6.0-1" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - "colors" = self.by-version."colors"."0.6.2"; - by-spec."colors"."~0.6.1" = - self.by-version."colors"."0.6.2"; - by-spec."colorsafeconsole"."0.0.4" = - self.by-version."colorsafeconsole"."0.0.4"; - by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "colorsafeconsole-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz"; - name = "colorsafeconsole-0.0.4.tgz"; - sha1 = "dc10508bb000e51964fb485fd8557faa169effbe"; - }) - ]; - buildInputs = - (self.nativeDeps."colorsafeconsole" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colorsafeconsole" ]; - }; - "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4"; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "combined-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }) - ]; - buildInputs = - (self.nativeDeps."combined-stream" or []); - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "combined-stream" ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "cryptiles-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }) - ]; - buildInputs = - (self.nativeDeps."cryptiles" or []); - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "cryptiles" ]; - }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "ctype-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }) - ]; - buildInputs = - (self.nativeDeps."ctype" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ctype" ]; - }; - by-spec."debug"."^0.8.1" = - self.by-version."debug"."0.8.1"; - by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.8.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - name = "debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - "debug" = self.by-version."debug"."0.8.1"; - by-spec."deep-equal"."~0.0.0" = - self.by-version."deep-equal"."0.0.0"; - by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - name = "deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-equal"."~0.2.0" = - self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-is"."0.1.x" = - self.by-version."deep-is"."0.1.3"; - by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "deep-is-0.1.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - name = "deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-is" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-is" ]; - }; - by-spec."defined"."~0.0.0" = - self.by-version."defined"."0.0.0"; - by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "defined-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; - name = "defined-0.0.0.tgz"; - sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; - }) - ]; - buildInputs = - (self.nativeDeps."defined" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "defined" ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "delayed-stream-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }) - ]; - buildInputs = - (self.nativeDeps."delayed-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "delayed-stream" ]; - }; - by-spec."difflet"."~0.2.0" = - self.by-version."difflet"."0.2.6"; - by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "difflet-0.2.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; - name = "difflet-0.2.6.tgz"; - sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; - }) - ]; - buildInputs = - (self.nativeDeps."difflet" or []); - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; - "charm-0.1.2" = self.by-version."charm"."0.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "difflet" ]; - }; - by-spec."effess"."~0.0.2" = - self.by-version."effess"."0.0.5"; - by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "effess-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz"; - name = "effess-0.0.5.tgz"; - sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db"; - }) - ]; - buildInputs = - (self.nativeDeps."effess" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "effess" ]; - }; - by-spec."effess"."~0.0.5" = - self.by-version."effess"."0.0.5"; - "effess" = self.by-version."effess"."0.0.5"; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "forever-agent-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "forever-agent" ]; - }; - by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; - }; - by-spec."fstream"."~0.1.25" = - self.by-version."fstream"."0.1.31"; - by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.31"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - name = "fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream" or []); - deps = { - "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - "fstream" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.28" = - self.by-version."fstream"."0.1.31"; - by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.11"; - by-spec."graceful-fs"."~1" = - self.by-version."graceful-fs"."1.2.3"; - by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - name = "graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.4"; - by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"; - name = "graceful-fs-3.0.4.tgz"; - sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."hardware-resolve"."~0.1.3" = - self.by-version."hardware-resolve"."0.1.6"; - by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "hardware-resolve-0.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz"; - name = "hardware-resolve-0.1.6.tgz"; - sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a"; - }) - ]; - buildInputs = - (self.nativeDeps."hardware-resolve" or []); - deps = { - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - "effess-0.0.5" = self.by-version."effess"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hardware-resolve" ]; - }; - "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6"; - by-spec."hawk"."~1.0.0" = - self.by-version."hawk"."1.0.0"; - by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "hawk-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - name = "hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.9.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.10.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature" or []); - deps = { - "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; - }; - by-spec."humanize"."0.0.9" = - self.by-version."humanize"."0.0.9"; - by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "humanize-0.0.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - name = "humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }) - ]; - buildInputs = - (self.nativeDeps."humanize" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "humanize" ]; - }; - "humanize" = self.by-version."humanize"."0.0.9"; - by-spec."inherits"."*" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "inherits-2.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.0" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-5.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; - }; - by-spec."keypress"."~0.2.1" = - self.by-version."keypress"."0.2.1"; - by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "keypress-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - name = "keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }) - ]; - buildInputs = - (self.nativeDeps."keypress" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "keypress" ]; - }; - "keypress" = self.by-version."keypress"."0.2.1"; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - by-spec."mime"."~1.2.9" = - self.by-version."mime"."1.2.11"; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.14"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.8"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; - by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - by-spec."mkdirp"."~0.3 || 0.4 || 0.5" = - self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."~0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mute-stream"."~0.0.4" = - self.by-version."mute-stream"."0.0.4"; - by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "mute-stream-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - name = "mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }) - ]; - buildInputs = - (self.nativeDeps."mute-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mute-stream" ]; - }; - by-spec."my-local-ip"."~1.0.0" = - self.by-version."my-local-ip"."1.0.0"; - by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "my-local-ip-1.0.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz"; - name = "my-local-ip-1.0.0.tgz"; - sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; - }) - ]; - buildInputs = - (self.nativeDeps."my-local-ip" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "my-local-ip" ]; - }; - "my-local-ip" = self.by-version."my-local-ip"."1.0.0"; - by-spec."nan"."~1.0.0" = - self.by-version."nan"."1.0.0"; - by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - name = "nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; - }; - by-spec."nomnom"."~1.6.2" = - self.by-version."nomnom"."1.6.2"; - by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { - name = "nomnom-1.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; - name = "nomnom-1.6.2.tgz"; - sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; - }) - ]; - buildInputs = - (self.nativeDeps."nomnom" or []); - deps = { - "colors-0.5.1" = self.by-version."colors"."0.5.1"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nomnom" ]; - }; - "nomnom" = self.by-version."nomnom"."1.6.2"; - by-spec."nopt"."~2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt" or []); - deps = { - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - by-spec."oauth-sign"."~0.3.0" = - self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "oauth-sign-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }) - ]; - buildInputs = - (self.nativeDeps."oauth-sign" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "oauth-sign" ]; - }; - by-spec."object-inspect"."~0.4.0" = - self.by-version."object-inspect"."0.4.0"; - by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "object-inspect-0.4.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - name = "object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }) - ]; - buildInputs = - (self.nativeDeps."object-inspect" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "object-inspect" ]; - }; - by-spec."optimist"."~0.5.2" = - self.by-version."optimist"."0.5.2"; - by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz"; - name = "optimist-0.5.2.tgz"; - sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = { - "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - by-spec."osenv"."0.0.3" = - self.by-version."osenv"."0.0.3"; - by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "osenv-0.0.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - name = "osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }) - ]; - buildInputs = - (self.nativeDeps."osenv" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "osenv" ]; - }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.2"; - by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.3.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - name = "punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."~0.6.0" = - self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - by-spec."read"."^1.0.5" = - self.by-version."read"."1.0.5"; - by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - name = "read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read" or []); - deps = { - "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - "read" = self.by-version."read"."1.0.5"; - by-spec."request"."~2.33.0" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.33.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - "request" = self.by-version."request"."2.33.0"; - by-spec."resumer"."~0.0.0" = - self.by-version."resumer"."0.0.0"; - by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resumer-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - name = "resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; - }) - ]; - buildInputs = - (self.nativeDeps."resumer" or []); - deps = { - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "resumer" ]; - }; - by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."rimraf"."~2.1.4" = - self.by-version."rimraf"."2.1.4"; - by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - name = "rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."runforcover"."~0.0.2" = - self.by-version."runforcover"."0.0.2"; - by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "runforcover-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; - name = "runforcover-0.0.2.tgz"; - sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; - }) - ]; - buildInputs = - (self.nativeDeps."runforcover" or []); - deps = { - "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "runforcover" ]; - }; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.3.2"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; - name = "semver-2.3.2.tgz"; - sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - "semver" = self.by-version."semver"."2.3.2"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "sigmund-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; - }; - by-spec."slide"."*" = - self.by-version."slide"."1.1.6"; - by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - name = "slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }) - ]; - buildInputs = - (self.nativeDeps."slide" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "slide" ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sntp-0.2.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }) - ]; - buildInputs = - (self.nativeDeps."sntp" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "sntp" ]; - }; - by-spec."structured-clone"."~0.2.2" = - self.by-version."structured-clone"."0.2.2"; - by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "structured-clone-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz"; - name = "structured-clone-0.2.2.tgz"; - sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2"; - }) - ]; - buildInputs = - (self.nativeDeps."structured-clone" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "structured-clone" ]; - }; - "structured-clone" = self.by-version."structured-clone"."0.2.2"; - by-spec."tap"."~0.4.8" = - self.by-version."tap"."0.4.13"; - by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage { - name = "tap-0.4.13"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz"; - name = "tap-0.4.13.tgz"; - sha1 = "3986134d6759727fc2223e61126eeb87243accbc"; - }) - ]; - buildInputs = - (self.nativeDeps."tap" or []); - deps = { - "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; - "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tap" ]; - }; - "tap" = self.by-version."tap"."0.4.13"; - by-spec."tape"."~2.12.3" = - self.by-version."tape"."2.12.3"; - by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage { - name = "tape-2.12.3"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz"; - name = "tape-2.12.3.tgz"; - sha1 = "5559d5454050292627537c012991ec6971f66156"; - }) - ]; - buildInputs = - (self.nativeDeps."tape" or []); - deps = { - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; - "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0"; - "resumer-0.0.0" = self.by-version."resumer"."0.0.0"; - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tape" ]; - }; - "tape" = self.by-version."tape"."2.12.3"; - by-spec."tar"."~0.1.18" = - self.by-version."tar"."0.1.20"; - by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.20"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; - name = "tar-0.1.20.tgz"; - sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; - }) - ]; - buildInputs = - (self.nativeDeps."tar" or []); - deps = { - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - "tar" = self.by-version."tar"."0.1.20"; - by-spec."temp"."~0.6.0" = - self.by-version."temp"."0.6.0"; - by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.6.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; - name = "temp-0.6.0.tgz"; - sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; - }) - ]; - buildInputs = - (self.nativeDeps."temp" or []); - deps = { - "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "temp" ]; - }; - "temp" = self.by-version."temp"."0.6.0"; - by-spec."through"."~2.3.4" = - self.by-version."through"."2.3.6"; - by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage { - name = "through-2.3.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz"; - name = "through-2.3.6.tgz"; - sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8"; - }) - ]; - buildInputs = - (self.nativeDeps."through" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "through" ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.12.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; - by-spec."traverse"."0.6.x" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."traverse"."~0.5.1" = - self.by-version."traverse"."0.5.2"; - by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; - name = "traverse-0.5.2.tgz"; - sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."tunnel-agent"."~0.3.0" = - self.by-version."tunnel-agent"."0.3.0"; - by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "tunnel-agent-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - name = "tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; - }; - by-spec."uglify-js"."~1.1.1" = - self.by-version."uglify-js"."1.1.1"; - by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-1.1.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; - name = "uglify-js-1.1.1.tgz"; - sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; - by-spec."underscore"."~1.4.4" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - by-spec."usb"."~0.3.11" = - self.by-version."usb"."0.3.11"; - by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "usb-0.3.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz"; - name = "usb-0.3.11.tgz"; - sha1 = "ee61d114181fd1de8738053920cde069d0aa428e"; - }) - ]; - buildInputs = - (self.nativeDeps."usb" or []); - deps = { - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "usb" ]; - }; - "usb" = self.by-version."usb"."0.3.11"; - by-spec."usb-shyp-darwin-x64"."0.3.x" = - self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-darwin-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz"; - name = "usb-shyp-darwin-x64-0.3.11-0.tgz"; - sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-darwin-x64" ]; - }; - by-spec."usb-shyp-win32-ia32"."0.3.x" = - self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-ia32-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz"; - name = "usb-shyp-win32-ia32-0.3.11-0.tgz"; - sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-ia32" ]; - }; - by-spec."usb-shyp-win32-x64"."0.3.x" = - self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz"; - name = "usb-shyp-win32-x64-0.3.11-0.tgz"; - sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-x64" ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; - }; - by-spec."yamlish"."*" = - self.by-version."yamlish"."0.0.6"; - by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "yamlish-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz"; - name = "yamlish-0.0.6.tgz"; - sha1 = "c5df8f7661731351e39eb52223f83a46659452e3"; - }) - ]; - buildInputs = - (self.nativeDeps."yamlish" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "yamlish" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904290caf94..44864062330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3169,8 +3169,6 @@ let telnet = callPackage ../tools/networking/telnet { }; - tessel = callPackage ../applications/misc/tessel { }; - texmacs = callPackage ../applications/editors/texmacs { tex = texLive; /* tetex is also an option */ extraFonts = true; From fdfd9d294e0a46ab242ca2922f128f539b08f62e Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 2 Sep 2015 21:24:35 +0000 Subject: [PATCH 129/188] mkvtoolnix: 7.9.0 -> 8.3.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0dbf4271383..e3f586a3a0f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -17,11 +17,11 @@ assert legacyGUI -> wxGTK != null; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "7.9.0"; + version = "8.3.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r"; + sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7"; }; patchPhase = '' From e87fa04ddc78c667e99eb6662f3de575279fea08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 3 Sep 2015 01:16:41 +0200 Subject: [PATCH 130/188] nixos: move left-behind allowUnfree comment --- nixos/lib/eval-config.nix | 5 ----- nixos/modules/misc/extra-arguments.nix | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 3e07df6c086..a87b285c5b7 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -54,11 +54,6 @@ in rec { # These are the extra arguments passed to every module. In # particular, Nixpkgs is passed through the "pkgs" argument. - # FIXME: we enable config.allowUnfree to make packages like - # nvidia-x11 available. This isn't a problem because if the user has - # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on - # the 64-bit package anyway. However, it would be cleaner to respect - # nixpkgs.config here. extraArgs = extraArgs_ // { inherit modules baseModules; }; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index 02ac6e7a59d..19002b17dac 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -4,6 +4,11 @@ _module.args = { pkgs_i686 = import ../../.. { system = "i686-linux"; + # FIXME: we enable config.allowUnfree to make packages like + # nvidia-x11 available. This isn't a problem because if the user has + # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on + # the 64-bit package anyway. However, it would be cleaner to respect + # nixpkgs.config here. config.allowUnfree = true; }; From a9b1c91285355daa0a8962822bbbb3d176171b1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 3 Sep 2015 01:17:27 +0200 Subject: [PATCH 131/188] geolite-legacy: update 2015-08-31 -> 2015-09-03 --- pkgs/data/misc/geolite-legacy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index eeefc4744a2..dc68b1ad2fd 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,23 +8,23 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-31"; + version = "2015-09-03"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" - "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n"; + "11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "GeoIPv6.dat.gz" - "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd"; + "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz" - "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8"; + "07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz" - "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; + "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc"; From 81c9095d90df9338928f26525b1bddc512ddd46c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 16:56:15 -0700 Subject: [PATCH 132/188] rocksdb: 3.12.1 -> 3.13.1 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c5db9787706..1ea90340021 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "3.12.1"; + version = "3.13.1"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "rocksdb-${version}"; - sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa"; + sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9"; }; buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; From 5b134427473e1e6eb4bedc579ffe968efbb88352 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:05:42 -0700 Subject: [PATCH 133/188] flannel: Migrate to go-packages --- pkgs/tools/networking/flannel/default.nix | 25 ----------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 7 +++++++ 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 pkgs/tools/networking/flannel/default.nix diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix deleted file mode 100644 index 3c439541e91..00000000000 --- a/pkgs/tools/networking/flannel/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.1.0"; - name = "flannel-${version}"; - goPackagePath = "github.com/coreos/flannel"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "flannel"; - rev = "v${version}"; - sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd"; - }; - - dontInstallSrc = true; - - meta = with lib; { - description = "Flannel is an etcd backed network fabric for containers"; - homepage = https://github.com/coreos/flannel; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44864062330..ff7dd06c090 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1489,7 +1489,7 @@ let inherit (perlPackages) ImageExifTool JSON; }; - flannel = callPackage ../tools/networking/flannel { }; + flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; }; flashbench = callPackage ../os-specific/linux/flashbench { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 81cfbb250d0..836daa0427b 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -581,6 +581,13 @@ let }; }; + flannel = buildFromGitHub { + rev = "v0.5.3"; + owner = "coreos"; + repo = "flannel"; + sha256 = "0d9khv0bczvsaqnz16p546m4r5marmnkcrdhi0f3ajnwxb776r9p"; + }; + fsnotify.v1 = buildGoPackage rec { rev = "v1.2.0"; name = "fsnotify.v1-${rev}"; From dea4d952ae6f9f603284664ead027ec1eea6eec7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:18:40 -0700 Subject: [PATCH 134/188] ngrok: Move to go-packages --- pkgs/tools/misc/ngrok/default.nix | 43 ------------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 42 +++++++++++++++++++++--------- 3 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 pkgs/tools/misc/ngrok/default.nix diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix deleted file mode 100644 index 5b55175217a..00000000000 --- a/pkgs/tools/misc/ngrok/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, git, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - name = "ngrok-1.7"; - goPackagePath = "ngrok"; - - src = fetchFromGitHub { - rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8"; - owner = "inconshreveable"; - repo = "ngrok"; - sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4"; - }; - - subPackages = [ "main/ngrok" "main/ngrokd" ]; - - preConfigure = '' - sed -e '/jteeuwen\/go-bindata/d' \ - -e '/export GOPATH/d' \ - -e 's/go get/#go get/' \ - -e 's|bin/go-bindata|go-bindata|' -i Makefile - make assets BUILDTAGS=release - export sourceRoot=$sourceRoot/src/ngrok - ''; - - buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics - yaml-v1 go-bindata.bin go-update binarydist osext ]; - - buildFlags = "-tags release"; - - dontInstallSrc = true; - - meta = with stdenv.lib; { - description = "Reverse proxy that creates a secure tunnel between from a public endpoint t -o a locally running web service"; - homepage = https://ngrok.com/; - license = licenses.asl20; - maintainers = with maintainers; [ iElectric cstrahan ]; - platforms = with platforms; linux ++ darwin; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff7dd06c090..9b09fae5007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2385,7 +2385,7 @@ let inherit gnumake3; }; - ngrok = callPackage ../tools/misc/ngrok { }; + ngrok = pkgs.goPackages.ngrok.bin // { outputs = [ "bin" ]; }; noip = callPackage ../tools/networking/noip { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 836daa0427b..4869363ed04 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1279,19 +1279,13 @@ let buildInputs = [ dbus ]; }; - go-update = buildGoPackage rec { - rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d"; - name = "go-update-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/inconshreveable/go-update"; - + go-update-v0 = buildFromGitHub { + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + owner = "inconshreveable"; + repo = "go-update"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; buildInputs = [ osext binarydist ]; - - src = fetchFromGitHub { - inherit rev; - owner = "inconshreveable"; - repo = "go-update"; - sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn"; - }; }; go-uuid = buildFromGitHub { @@ -1781,6 +1775,30 @@ let propagatedBuildInputs = [ ugorji.go ]; }; + ngrok = buildFromGitHub { + rev = "1.7.1"; + owner = "inconshreveable"; + repo = "ngrok"; + sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; + goPackagePath = "ngrok"; + + preConfigure = '' + sed -e '/jteeuwen\/go-bindata/d' \ + -e '/export GOPATH/d' \ + -e 's/go get/#go get/' \ + -e 's|bin/go-bindata|go-bindata|' -i Makefile + make assets BUILDTAGS=release + export sourceRoot=$sourceRoot/src/ngrok + ''; + + buildInputs = [ + git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics + yaml-v1 go-bindata.bin go-update-v0 binarydist osext + ]; + + buildFlags = [ "-tags release" ]; + }; + ntp = buildFromGitHub { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; owner = "beevik"; From a8d64c8eea41e5c5eb2c650b1938d11c47d8b6b7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:26:57 -0700 Subject: [PATCH 135/188] fzf: Move to go-packages and 0.10.0 -> 0.10.4 --- pkgs/tools/misc/fzf/default.nix | 33 --------------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 11 +++++++++++ 3 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/misc/fzf/default.nix diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix deleted file mode 100644 index 5692fc25a32..00000000000 --- a/pkgs/tools/misc/fzf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }: - -with goPackages; - -buildGoPackage rec { - name = "fzf-${version}"; - version = "0.10.0"; - goPackagePath = "github.com/junegunn/fzf"; - src = fetchFromGitHub { - owner = "junegunn"; - repo = "fzf"; - rev = "${version}"; - sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2"; - }; - - buildInputs = with goPackages; [ - crypto - ginkgo - gomega - junegunn.go-runewidth - go-shellwords - ncurses - syncthing - text - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/junegunn/fzf; - description = "A command-line fuzzy finder written in Go"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b09fae5007..bd51242f8c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -892,7 +892,7 @@ let filter_audio = callPackage ../development/libraries/filter_audio { }; - fzf = callPackage ../tools/misc/fzf { }; + fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; gist = callPackage ../tools/text/gist { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4869363ed04..54043d9c859 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -601,6 +601,17 @@ let }; }; + fzf = buildFromGitHub { + rev = "0.10.4"; + owner = "junegunn"; + repo = "fzf"; + sha256 = "06wda8pm1invnj4sfwcicw9qim3jdf9s1fcrai7xqz7wgy74qv1f"; + + buildInputs = [ + crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text + ]; + }; + g2s = buildFromGitHub { rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; owner = "peterbourgon"; From 72d86374f25ad047554d1cb193c7d0d7873d0169 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:35:09 -0700 Subject: [PATCH 136/188] all-packages: goPackages Cleanups --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd51242f8c9..aa529fffe1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1489,7 +1489,7 @@ let inherit (perlPackages) ImageExifTool JSON; }; - flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; }; + flannel = goPackages.flannel.bin // { outputs = [ "bin" ]; }; flashbench = callPackage ../os-specific/linux/flashbench { }; @@ -1708,7 +1708,7 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; grafana-frontend = callPackage ../development/tools/misc/grafana { }; - grafana-backend = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; }; + grafana-backend = goPackages.grafana.bin // { outputs = [ "bin" ]; }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -2385,7 +2385,7 @@ let inherit gnumake3; }; - ngrok = pkgs.goPackages.ngrok.bin // { outputs = [ "bin" ]; }; + ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; }; noip = callPackage ../tools/networking/noip { }; @@ -13705,7 +13705,7 @@ let chessdb = callPackage ../games/chessdb { }; - confd = pkgs.goPackages.confd.bin // { outputs = [ "bin" ]; }; + confd = goPackages.confd.bin // { outputs = [ "bin" ]; }; construoBase = lowPrio (callPackage ../games/construo { mesa = null; @@ -14568,7 +14568,7 @@ let camlp5 = ocamlPackages.camlp5_strict; }; - hologram = pkgs.goPackages.hologram.bin // { outputs = [ "bin" ]; }; + hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; }; isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; From b50567912ae2329a4bc9b9d29900649c18be48f6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:36:23 -0700 Subject: [PATCH 137/188] mtpfs: Update to 2015-08-01 and move to go-packages --- pkgs/tools/filesystems/mtpfs/default.nix | 26 -------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 44 +++++++++++++----------- 3 files changed, 24 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/filesystems/mtpfs/default.nix diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix deleted file mode 100644 index 7725b0d7af8..00000000000 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: - -stdenv.mkDerivation rec { - name = "mtpfs-1.1"; - - buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ]; - - # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs - preConfigure = '' - export MAD_CFLAGS=${libmad}/include - export MAD_LIBS=${libmad}/lib/libmad.so - export LIBS=${libid3tag}/lib/libid3tag.so - ''; - - src = fetchurl { - url = "http://www.adebenham.com/files/mtp/${name}.tar.gz"; - sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; - }; - - meta = { - homepage = https://code.google.com/p/mtpfs/; - description = "FUSE Filesystem providing access to MTP devices"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa529fffe1b..a04874e49e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7713,7 +7713,7 @@ let mtdev = callPackage ../development/libraries/mtdev { }; - mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 54043d9c859..81681bb186a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1036,17 +1036,12 @@ let sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; }; - go-fuse = buildGoPackage rec { - rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58"; - name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/go-fuse"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "go-fuse"; - sha256 = "0lycfhchn88kbs81ypz8m5jh032fpbv14gldrjirf32wm1d4f8pj"; - }; - subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; + go-fuse = buildFromGitHub rec { + rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8"; + date = "2015-07-27"; + owner = "hanwen"; + repo = "go-fuse"; + sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf"; }; go-github = buildFromGitHub { @@ -1748,6 +1743,16 @@ let }; }; + mtpfs = buildFromGitHub { + rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94"; + date = "2015-08-01"; + owner = "hanwen"; + repo = "go-mtpfs"; + sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8"; + + buildInputs = [ go-fuse usb ]; + }; + mux = buildFromGitHub { rev = "5a8a0400500543e28b2886a8c52d21a435815411"; date = "2015-08-05"; @@ -2636,18 +2641,15 @@ let sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; }; - usb = buildGoPackage rec { + usb = buildFromGitHub rec { rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - name = "usb-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/usb"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "usb"; - sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; - }; + date = "2014-12-17"; + owner = "hanwen"; + repo = "usb"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.libusb ]; + buildInputs = [ pkgs.libusb1 ]; }; vault = buildFromGitHub { From acd17d21b38c03235a35dab7e8af1df7069f41fd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:39:42 -0700 Subject: [PATCH 138/188] mtpfs: Fix accidental deletion --- pkgs/tools/filesystems/go-mtpfs/default.nix | 29 --------------------- pkgs/tools/filesystems/mtpfs/default.nix | 26 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 28 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/filesystems/go-mtpfs/default.nix create mode 100644 pkgs/tools/filesystems/mtpfs/default.nix diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix deleted file mode 100644 index cf521425a76..00000000000 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, pkgconfig, libmtp, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "9c2b46050e8ea8574eaec2124867ac7b11e6471d"; - name = "go-mtpfs-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/go-mtpfs"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "go-mtpfs"; - sha256 = "0kxi18cb078q4wikfajp3yvp802wzfsfdp431j0dg2jdw8y7gfii"; - }; - - buildInputs = [ go-fuse libmtp usb ]; - - subPackages = [ "./" ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; - homepage = https://github.com/hanwen/go-mtpfs; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix new file mode 100644 index 00000000000..7725b0d7af8 --- /dev/null +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: + +stdenv.mkDerivation rec { + name = "mtpfs-1.1"; + + buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ]; + + # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs + preConfigure = '' + export MAD_CFLAGS=${libmad}/include + export MAD_LIBS=${libmad}/lib/libmad.so + export LIBS=${libid3tag}/lib/libid3tag.so + ''; + + src = fetchurl { + url = "http://www.adebenham.com/files/mtp/${name}.tar.gz"; + sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; + }; + + meta = { + homepage = https://code.google.com/p/mtpfs/; + description = "FUSE Filesystem providing access to MTP devices"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a04874e49e4..eb9fc9c4376 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1693,7 +1693,7 @@ let goaccess = callPackage ../tools/misc/goaccess { }; - go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; + go-mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -7713,7 +7713,7 @@ let mtdev = callPackage ../development/libraries/mtdev { }; - mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; + mtpfs = callPackage ../tools/filesystems/mtpfs { }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; From 8f34c4482403bcadf00d44fc32496ede0aa53e4d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:43:36 -0700 Subject: [PATCH 139/188] asciinema: Move to go-packages --- pkgs/tools/misc/asciinema/default.nix | 22 ---------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 7 +++++++ 3 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/misc/asciinema/default.nix diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix deleted file mode 100644 index 626fb5c2321..00000000000 --- a/pkgs/tools/misc/asciinema/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages }: - -goPackages.buildGoPackage rec { - name = "asciinema-${version}"; - version = "1.1.1"; - - goPackagePath = "github.com/asciinema/asciinema"; - - src = fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2"; - sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173"; - }; - - meta = { - homepage = https://asciinema.org/; - license = stdenv.lib.licenses.gpl3; - description = "Terminal session recorder"; - maintainers = with stdenv.lib.maintainers; [ lassulus ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb9fc9c4376..94bce20d75b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,7 +611,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asciinema = callPackage ../tools/misc/asciinema { }; + asciinema = pkgs.goPackages.asciinema.bin // { outputs = [ "bin" ]; }; asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 81681bb186a..a3bbc6ed4fd 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -167,6 +167,13 @@ let sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; }; + asciinema = buildFromGitHub { + rev = "v1.1.1"; + owner = "asciinema"; + repo = "asciinema"; + sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc"; + }; + asn1-ber = buildGoPackage rec { rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; From 5f35b0f7dafbf67d447a28b916ce81edfb52dc7e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 17:51:03 -0700 Subject: [PATCH 140/188] serfdom: Migrate to go-packages --- pkgs/servers/serfdom/default.nix | 28 ---------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 15 +++++---------- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 pkgs/servers/serfdom/default.nix diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix deleted file mode 100644 index 94a46459d4e..00000000000 --- a/pkgs/servers/serfdom/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.6.4"; - name = "serfdom-${version}"; - goPackagePath = "github.com/hashicorp/serf"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "serf"; - rev = "v${version}"; - sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438"; - }; - - buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; - homepage = http://www.serfdom.io/; - license = licenses.mpl20; - maintainers = with maintainers; [ msackman cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94bce20d75b..018793fbe29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9328,7 +9328,7 @@ let shairport-sync = callPackage ../servers/shairport-sync { }; - serfdom = callPackage ../servers/serfdom { }; + serfdom = pkgs.goPackages.serf.bin // { outputs = [ "bin" ]; }; seyren = callPackage ../servers/monitoring/seyren { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a3bbc6ed4fd..1c53e986651 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2489,17 +2489,12 @@ let buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ]; }; - serf = buildGoPackage rec { + serf = buildFromGitHub { rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; - name = "serf-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hashicorp/serf"; - - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "serf"; - sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; - }; + date = "2015-05-15"; + owner = "hashicorp"; + repo = "serf"; + sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; buildInputs = [ circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist From cb8a2e95030b74a982e6acddd03b8c28cda2e235 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 18:14:50 -0700 Subject: [PATCH 141/188] nsq: Move to go-packages and 0.2.28 -> 0.3.5 --- pkgs/servers/nsq/default.nix | 32 ------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 87 ++++++++++++++++++++------------- 3 files changed, 55 insertions(+), 66 deletions(-) delete mode 100644 pkgs/servers/nsq/default.nix diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix deleted file mode 100644 index a7b77b8802a..00000000000 --- a/pkgs/servers/nsq/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, goPackages, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.2.28"; - name = "nsq-${version}"; - goPackagePath = "github.com/bitly/nsq"; - src = fetchFromGitHub { - owner = "bitly"; - repo = "nsq"; - rev = "v${version}"; - sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx"; - }; - - subPackages = [ "nsqadmin" ] ++ - map (x: "apps/"+x) [ "nsq_pubsub" "nsq_stat" "nsq_tail" - "nsq_to_file" "nsq_to_http" "nsq_to_nsq" - "nsqd" "nsqlookupd" ]; - - buildInputs = [ go-nsq go-options toml perks go-hostpool ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A realtime distributed messaging platform"; - homepage = http://nsq.io/; - license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 018793fbe29..bdf365fa1ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9108,7 +9108,7 @@ let nsd = callPackage ../servers/dns/nsd (config.nsd or {}); - nsq = callPackage ../servers/nsq { }; + nsq = pkgs.goPackages.nsq.bin // { outputs = [ "bin" ]; }; openpts = callPackage ../servers/openpts { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1c53e986651..1343bef2dec 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1075,10 +1075,11 @@ let }; go-hostpool = buildFromGitHub { - rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + date = "2015-03-31"; owner = "bitly"; repo = "go-hostpool"; - sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; }; go-ini = buildFromGitHub { @@ -1169,24 +1170,21 @@ let sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; }; - go-nsq = buildGoPackage rec { - rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0"; - name = "go-nsq-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/bitly/go-nsq"; - src = fetchFromGitHub { - inherit rev; - owner = "bitly"; - repo = "go-nsq"; - sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p"; - }; + go-nsq = buildFromGitHub { + rev = "v1.0.4"; + owner = "nsqio"; + repo = "go-nsq"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; propagatedBuildInputs = [ go-simplejson go-snappystream ]; + goPackageAliases = [ "github.com/bitly/go-nsq" ]; }; go-options = buildFromGitHub { - rev = "896a539cd709f4f39d787562d1583c016ce7517e"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + date = "2014-12-20"; owner = "mreiferson"; repo = "go-options"; - sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; }; go-querystring = buildFromGitHub { @@ -1235,22 +1233,19 @@ let }; go-simplejson = buildFromGitHub { - rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + date = "2015-03-31"; owner = "bitly"; repo = "go-simplejson"; - sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; }; - go-snappystream = buildGoPackage rec { + go-snappystream = buildFromGitHub { rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; - name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/mreiferson/go-snappystream"; - src = fetchFromGitHub { - inherit rev; - owner = "mreiferson"; - repo = "go-snappystream"; - sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; - }; + date = "2015-04-16"; + owner = "mreiferson"; + repo = "go-snappystream"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; }; go-sqlite3 = buildFromGitHub { @@ -1822,6 +1817,15 @@ let buildFlags = [ "-tags release" ]; }; + nsq = buildFromGitHub { + rev = "v0.3.5"; + owner = "bitly"; + repo = "nsq"; + sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; + + buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ]; + }; + ntp = buildFromGitHub { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; owner = "beevik"; @@ -1931,13 +1935,6 @@ let propagatedBuildInputs = [ osext ]; }; - perks = buildFromGitHub { - rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; - owner = "bmizerany"; - repo = "perks"; - sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k"; - }; - pb = buildFromGitHub { rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; owner = "cheggaaa"; @@ -1945,13 +1942,20 @@ let sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; }; + perks = buildFromGitHub rec { + date = "2014-07-16"; + owner = "bmizerany"; + repo = "perks"; + rev = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa"; + sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n"; + }; + beorn7.perks = buildFromGitHub rec { date = "2015-02-23"; owner = "beorn7"; repo = "perks"; rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - goPackagePath = "github.com/beorn7/perks"; }; pflag = buildGoPackage rec { @@ -2489,6 +2493,14 @@ let buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ]; }; + semver = buildFromGitHub { + rev = "31b736133b98f26d5e078ec9eb591666edfd091f"; + date = "2015-07-20"; + owner = "blang"; + repo = "semver"; + sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10"; + }; + serf = buildFromGitHub { rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; date = "2015-05-15"; @@ -2627,6 +2639,14 @@ let propagatedBuildInputs = [ pty ]; }; + timer_metrics = buildFromGitHub { + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + date = "2015-02-02"; + owner = "bitly"; + repo = "timer_metrics"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + tomb = buildFromGitHub { rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; owner = "go-tomb"; @@ -2638,6 +2658,7 @@ let toml = buildFromGitHub { rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + date = "2015-05-01"; owner = "BurntSushi"; repo = "toml"; sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; From e7a783dccfae45a0b6650ff9c3fbd6924d72dcb7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 18:18:08 -0700 Subject: [PATCH 142/188] goPackages: More cleanups --- 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 bdf365fa1ba..ca8ef6d121e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,7 +611,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asciinema = pkgs.goPackages.asciinema.bin // { outputs = [ "bin" ]; }; + asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; }; asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { @@ -1693,7 +1693,7 @@ let goaccess = callPackage ../tools/misc/goaccess { }; - go-mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; + go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -9108,7 +9108,7 @@ let nsd = callPackage ../servers/dns/nsd (config.nsd or {}); - nsq = pkgs.goPackages.nsq.bin // { outputs = [ "bin" ]; }; + nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; }; openpts = callPackage ../servers/openpts { }; @@ -9328,7 +9328,7 @@ let shairport-sync = callPackage ../servers/shairport-sync { }; - serfdom = pkgs.goPackages.serf.bin // { outputs = [ "bin" ]; }; + serfdom = goPackages.serf.bin // { outputs = [ "bin" ]; }; seyren = callPackage ../servers/monitoring/seyren { }; From 4fc7619d23aa847e0aa8a5141da623da80859dd5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 18:19:47 -0700 Subject: [PATCH 143/188] nsq: Remove benchmark utilies as they are uneeded --- 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 1343bef2dec..b01062d1c49 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1823,6 +1823,8 @@ let repo = "nsq"; sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; + excludedPackages = "bench"; + buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ]; }; From a906355b8ab404baa20dc167225d57e3120f067d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 3 Sep 2015 03:38:44 +0200 Subject: [PATCH 144/188] zbar: ghostscript was missing for zbar --- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 51dcc2a9c80..af98e3c014c 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l - , qt4, lzma, gtk2 + , qt4, lzma, gtk2, ghostscript , ...}: builderDefsPackage (a : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca8ef6d121e..6921ded707a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3620,6 +3620,7 @@ let pygtk = lib.overrideDerivation pygtk (x: { gtk = gtk2; }); + ghostscript = ghostscriptX; }; zdelta = callPackage ../tools/compression/zdelta { }; From 21370fb1502aed0aef31b025b80c5e4863d81ec4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 21:49:40 -0700 Subject: [PATCH 145/188] bind: 9.10.2-P3 -> 9.10.2-P4 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8a5b7f2af53..457ae1cedf6 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.10.2-P3"; in +let version = "9.10.2-P4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0jhxbsdb8q5q0vn5aga53ixz2iy9zz8p5vwkzvngymd4vmk9l1vq"; + sha256 = "1f4w89qmsgql88nbykz82p2nwbf5m889vzlfy9bjj8gg3pn222y0"; }; patchPhase = '' From 45734349bfad80849cc956699944da605166f227 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 22:16:53 -0700 Subject: [PATCH 146/188] dclxvi: Init at 2013-01-27 --- pkgs/development/libraries/dclxvi/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/dclxvi/default.nix diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix new file mode 100644 index 00000000000..1b8528dd08b --- /dev/null +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "dclxvi-2013-01-27"; + + src = fetchFromGitHub { + owner = "agl"; + repo = "dclxvi"; + rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2"; + sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g"; + }; + + buildFlags = [ "libdclxvipairing.so" ]; + + installPhase = '' + mkdir -p $out/{include,lib} + find . -name \*.h -exec cp {} $out/include \; + find . -name \*.so -exec cp {} $out/lib \; + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/agl/dclxvi"; + description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6921ded707a..9ed91ee05b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1261,6 +1261,8 @@ let dbench = callPackage ../development/tools/misc/dbench { }; + dclxvi = callPackage ../development/libraries/dclxvi { }; + dcraw = callPackage ../tools/graphics/dcraw { }; dcfldd = callPackage ../tools/system/dcfldd { }; From 20a1c9cc3b3e5171d4c935387136e9f17e40ce47 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 22:17:31 -0700 Subject: [PATCH 147/188] goPackages: Update appengine --- pkgs/top-level/go-packages.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b01062d1c49..052e0fce8e5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1135,16 +1135,12 @@ let buildInputs = [ influxdb8 stathat ]; }; - appengine = buildGoPackage rec { - rev = "25b8450bec636c6b6e3b9b33d3a3f55230b10812"; - name = "appengine-${stdenv.lib.strings.substring 0 7 rev}"; + appengine = buildFromGitHub { + rev = "72f4367c4f14a20a98dcc8b762953b40788407be"; + owner = "golang"; + repo = "appengine"; + sha256 = "1phjkb0f0xp08db3irbf5wzdsxzsddsig5wv70wvmnr44ijllh4f"; goPackagePath = "google.golang.org/appengine"; - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "appengine"; - sha256 = "1b0v244hmw8078601v18xda501aix0kw4q2m1g3ai33dl0p2dh2n"; - }; buildInputs = [ protobuf net ]; }; From 4bd817b82aaf4a46eba9f2d842aa102b57f03c70 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 22:17:45 -0700 Subject: [PATCH 148/188] pond: Migrate to go-packages --- pkgs/applications/networking/pond/default.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 11 +++++++ 3 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/networking/pond/default.nix diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix deleted file mode 100644 index 21d99013a1a..00000000000 --- a/pkgs/applications/networking/pond/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, goPackages, fetchgit, trousers }: - -with goPackages; - -buildGoPackage rec { - rev = "f4e441c77a2039814046ff8219629c547fe8b689"; - name = "pond-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/agl/pond"; - src = fetchgit { - inherit rev; - url = "git://github.com/agl/pond.git"; - sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; - }; - - subPackages = [ "client" ]; - - buildInputs = [ trousers net crypto protobuf ed25519 govers ]; - - buildFlags = "--tags nogui"; - - dontInstallSrc = true; - - meta = with lib; { - description = "Forward secure, asynchronous messaging for the discerning"; - homepage = https://pond.imperialviolet.org; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ed91ee05b4..bc1067d88cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12543,7 +12543,7 @@ let inherit (xorg) libXpm; }; - pond = callPackage ../applications/networking/pond { }; + pond = goPackages.pond.bin // { outputs = [ "bin" ]; }; ponymix = callPackage ../applications/audio/ponymix { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 052e0fce8e5..ea3dcd6a279 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1969,6 +1969,17 @@ let doCheck = false; # bad import path in tests }; + pond = buildFromGitHub { + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + owner = "agl"; + repo = "pond"; + sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + + buildInputs = [ net crypto protobuf ed25519 pkgs.trousers pkgs.dclxvi ]; + buildFlags = "-tags nogui"; + excludedPackages = "appengine"; + }; + pongo2 = buildFromGitHub { rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; date = "2014-10-27"; From 27ffcf78726b3de150c015e3dacb9cf9d40efc35 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Thu, 3 Sep 2015 01:23:56 -0500 Subject: [PATCH 149/188] stevedore: add pbr to propagatedBuildInputs This fixes a crash in flexget and possibly other packages. I think the issue was introduced in fc1165b0d94ec8b1b01b7522ed3143bd3dd03e5c --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d16d98d2374..cafae9864e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13010,8 +13010,8 @@ let doCheck = false; - buildInputs = with self; [ pbr oslosphinx ]; - propagatedBuildInputs = with self; [ six argparse ]; + buildInputs = with self; [ oslosphinx ]; + propagatedBuildInputs = with self; [ pbr six argparse ]; meta = { description = "Manage dynamic plugins for Python applications"; From 6cb878e9c278aeeeb8905b6370c0182293d102f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 3 Sep 2015 10:11:15 +0200 Subject: [PATCH 150/188] redmine: shorten flags line to avoid yaml parsing bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c56f25d06fcd1eb4b0b232296a055b2dce997a05) Signed-off-by: Domen Kožar --- pkgs/applications/version-management/redmine/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 26ca2ad9748..3a8df10f166 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -45,13 +45,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - bundle config build.nokogiri \ - --use-system-libraries \ - --with-iconv-dir=${libiconv} \ - --with-xslt-dir=${libxslt} \ - --with-xml2-dir=${libxml2} \ - --with-pkg-config \ - --with-pg-config=${postgresql}/bin/pg_config + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}" bundle install --verbose --local --deployment From c0e97bb547ea1e200b6db9bc1af118b82a52f307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 3 Sep 2015 10:30:11 +0200 Subject: [PATCH 151/188] panamax_ui: fix libv8 pinpoint --- pkgs/applications/networking/cluster/panamax/ui/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 572deb62ba0..3dac1061362 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" + # fix libv8 dependency + substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" ''; configurePhase = '' From 7133fca524ab6b2ed3b8434e6c4a238743ee640f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 1 Sep 2015 14:28:13 +0300 Subject: [PATCH 152/188] texLiveModerntimeline: fix sha256 checksum Looks like an upstream update. cc @peti --- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 6cf9ac3e5ce..ec8ffed25bc 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -7,7 +7,7 @@ rec { "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" ]; - sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8"; + sha256 = "155c3m9qk8pzbkvy60pan5byfzf1wn6pd43fq7k3732g9zjzrsak"; }; buildInputs = [texLive unzip]; From c7580cd17568ddd855774a8391fad14fd6d97be8 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 3 Sep 2015 04:36:31 +0200 Subject: [PATCH 153/188] dragonegg: does not build with gcc49 https://llvm.org/bugs/show_bug.cgi?id=19847 --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc1067d88cd..3910bbbb064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6194,8 +6194,6 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = llvmPackages_35.dragonegg; - dxflib = callPackage ../development/libraries/dxflib {}; eigen = callPackage ../development/libraries/eigen {}; From ad99ea691246dbe6c0bd0aeb8b7914869a720917 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 3 Sep 2015 10:16:29 +0200 Subject: [PATCH 154/188] wml: fix build and unbreak --- pkgs/development/web/wml/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 6dc7b68c71c..22cc5001c92 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -20,30 +20,40 @@ perlPackages.buildPerlPackage rec { sed -i '/p2_mp4h\/doc/d' Makefile.in ''; - buildInputs = [ perlPackages.perl ncurses lynx makeWrapper ]; + buildInputs = with perlPackages; + [ perl TermReadKey GD BitVector ncurses lynx makeWrapper ImageSize ]; patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; - preFixup = '' - substituteInPlace $out/bin/wml \ + postPatch = '' + substituteInPlace wml_frontend/wml.src \ --replace "File::PathConvert::realpath" "Cwd::realpath" \ --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \ --replace "File::PathConvert" "File::Spec" + for i in wml_include/des/imgbg.src wml_include/des/imgdot.src; do + substituteInPlace $i \ + --replace "WML::GD" "GD" + done + + rm wml_test/t/11-wmk.t + ''; + + preFixup = '' wrapProgram $out/bin/wml \ --set PERL5LIB ${with perlPackages; stdenv.lib.makePerlPath [ BitVector TermReadKey ImageSize ]} ''; - enableParallelBuilding = true; + enableParallelBuilding = false; + + installTargets = "install"; meta = with stdenv.lib; { homepage = http://thewml.org/; description = "Off-line HTML generation toolkit for Unix"; license = licenses.gpl2; platforms = platforms.linux; - # Not sure what broke this build, it used to work - broken = true; }; } From e27c796b51c277a4faceeb25604133582c67448d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 3 Sep 2015 11:09:55 +0200 Subject: [PATCH 155/188] ffmpeg-full: fix src --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 37e23d4a324..654741283f9 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { version = "2.7.2"; src = fetchurl { - url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; }; From a536eda82e88dba648572334d9531af8012fdf59 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 10:54:13 +0200 Subject: [PATCH 156/188] Add firefox-esr --- .../networking/browsers/firefox/default.nix | 28 +++++++++++++++---- pkgs/top-level/all-packages.nix | 8 ++++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index e510b329714..12d581b1566 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.3"; in +let -stdenv.mkDerivation rec { - name = "firefox-${version}"; +common = { pname, version, sha1 }: stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + inherit sha1; }; patches = if !enableGTK3 then null else [(fetchpatch { @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { '' mkdir ../objdir cd ../objdir - configureScript=../mozilla-release/configure + configureScript=../mozilla-*/configure ''; preInstall = @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Web browser"; + description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; @@ -131,4 +131,20 @@ stdenv.mkDerivation rec { inherit gtk nspr version; isFirefox3Like = true; }; +}; + +in { + + firefox = common { + pname = "firefox"; + version = "40.0.3"; + sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + }; + + firefox-esr = common { + pname = "firefox-esr"; + version = "38.2.1esr"; + sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3910bbbb064..35c0d809f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11527,14 +11527,15 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox = callPackage ../applications/networking/browsers/firefox { + inherit (callPackages ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; - }; + }) firefox firefox-esr; - firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; + firefox-wrapper = wrapFirefox { browser = pkgs.firefox; }; + firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; }; firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; @@ -15331,6 +15332,7 @@ let cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 + firefoxWrapper = firefox-wrapper; haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 htmlTidy = html-tidy; # added 2014-12-06 From 9cea5bcf2cb180638e2e5e47692e57387fcbb051 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 30 Aug 2015 18:41:57 +0300 Subject: [PATCH 157/188] bundler-HEAD: fix checksum Related to #8567 --- pkgs/development/interpreters/ruby/bundler-head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 0aa6e9f90ce..1b63fb422dc 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -5,7 +5,7 @@ buildRubyGem { src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; - sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9"; + sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr"; leaveDotGit = true; }; dontPatchShebangs = true; From 6ab7e0de2953b5d13f52372258825e90fdea3fd3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 11:29:46 +0200 Subject: [PATCH 158/188] Create /var/log/journal Fixes #9614. --- nixos/modules/system/boot/systemd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 05369da4f16..4976dfe8eea 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -643,6 +643,10 @@ in if ! [ -e /etc/machine-id ]; then ${systemd}/bin/systemd-machine-id-setup fi + + # Keep a persistent journal. Note that systemd-tmpfiles will + # set proper ownership/permissions. + mkdir -m 0700 -p /var/log/journal ''; users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; From 7bc624f5723123324b5a4a00b96b09aa66a5296c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 3 Sep 2015 11:39:39 +0200 Subject: [PATCH 159/188] And next release is called Emu! http://img.gawkerassets.com/img/17qtp0agra45ajpg/original.jpg --- nixos/modules/misc/version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index dc8eb4e8832..b4b0281fe58 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -75,7 +75,7 @@ with lib; mkDefault (if pathExists fn then readFile fn else "master"); # Note: code names must only increase in alphabetical order. - system.nixosCodeName = "Dingo"; + system.nixosCodeName = "Emu"; # Generate /etc/os-release. See # http://0pointer.de/public/systemd-man/os-release.html for the From 126d8dba964b3c058399ffe38ba0b99e6194c98d Mon Sep 17 00:00:00 2001 From: RoboNickBot Date: Tue, 1 Sep 2015 21:09:47 -0500 Subject: [PATCH 160/188] texlive-moderntimeline: 0.8 (broken) -> 0.9 (close #9612) The v0.8 build was broken because the CTAN package updated to v0.9 and CTAN doesn't keep old versions of packages. Besides bumping the version, this commit changes the src url from the unversioned CTAN link (which would break the derivation every time a new version of the package released, as it did yesterday) to the versioned Github release link. --- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index ec8ffed25bc..e80e53f9128 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,13 +1,10 @@ args: with args; rec { - version = "0.8"; + version = "0.9"; name = "moderntimeline-${version}"; src = fetchurl { - urls = [ - "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" - "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" - ]; - sha256 = "155c3m9qk8pzbkvy60pan5byfzf1wn6pd43fq7k3732g9zjzrsak"; + url = "https://github.com/raphink/moderntimeline/archive/v0.9.zip"; + sha256 = "1h1sfdh0whb74y6f999hs80flwpdbs2n4n2b9c450rvs1y7abcml"; }; buildInputs = [texLive unzip]; @@ -15,7 +12,7 @@ rec { doCopy = fullDepEntry ('' mkdir -p $out/texmf-dist/tex/latex/moderntimeline $out/texmf-dist/doc/moderntimeline $out/share mv *.dtx *.ins $out/texmf-dist/tex/latex/moderntimeline/ - mv *.pdf $out/texmf-dist/doc/moderntimeline/ + mv *.md $out/texmf-dist/doc/moderntimeline/ ln -s $out/texmf* $out/share/ '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; From 5c014feb0a091fbd8b201a3734f91061190a40dc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 3 Sep 2015 11:52:13 +0200 Subject: [PATCH 161/188] imagemagick: fix ghostscript reference in .la files --- pkgs/applications/graphics/ImageMagick/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3575eee2939..c25cc11c203 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -40,7 +40,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; - postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; + postInstall = '' + (cd "$out/include" && ln -s ImageMagick* ImageMagick) + '' + lib.optionalString (ghostscript != null) '' + for la in $out/lib/*.la; do + sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la + done + ''; meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; From 271b7ad0064b40a6ab970c5b46de9b89ccd6dabe Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 3 Sep 2015 11:52:26 +0200 Subject: [PATCH 162/188] Revert "zbar: ghostscript was missing for zbar" This reverts commit a906355b8ab404baa20dc167225d57e3120f067d. Fixed imagemagick -lgs reference in .la file. cc @garbas --- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index af98e3c014c..51dcc2a9c80 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l - , qt4, lzma, gtk2, ghostscript + , qt4, lzma, gtk2 , ...}: builderDefsPackage (a : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35c0d809f43..dfa4cfc3033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3622,7 +3622,6 @@ let pygtk = lib.overrideDerivation pygtk (x: { gtk = gtk2; }); - ghostscript = ghostscriptX; }; zdelta = callPackage ../tools/compression/zdelta { }; From 4080b744b2e1db1b7dcc79f5abe9ba03b6f26ceb Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Sep 2015 11:29:04 +0900 Subject: [PATCH 163/188] php-imagick: init at 3.1.2, fixes #9627 --- pkgs/top-level/php-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9fc605be1e3..e9f2d145226 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -12,6 +12,13 @@ let self = with self; { sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; }; + imagick = buildPecl { + name = "imagick-3.1.2"; + sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; + configureFlags = "--with-imagick=${pkgs.imagemagick}"; + buildInputs = [ pkgs.pkgconfig ]; + }; + memcache = buildPecl { name = "memcache-3.0.8"; From e7f9bdcba1717717dd5420d8f993707406cfd697 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Thu, 3 Sep 2015 08:58:59 +0200 Subject: [PATCH 164/188] Bump k2pdfopt to 2.32, fixes #9631 --- pkgs/applications/misc/k2pdfopt/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 9c592fcbb2d..ce57db371dd 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -5,8 +5,8 @@ let mupdf_src = fetchurl { - url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz; - sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; + url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz; + sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq"; }; tess_src = fetchurl { @@ -21,10 +21,10 @@ let in stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.30"; + version = "2.32"; src = fetchzip { url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5"; + sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m"; }; buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib @@ -41,8 +41,8 @@ in stdenv.mkDerivation rec { plibs=`pwd`/patched_libraries tar zxf ${mupdf_src} - cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/ - cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf + cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/ + cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf tar zxf ${tess_src} cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { make libs cp src/libPgm2asc.a $plibs/lib - cd ../mupdf-1.5-source + cd ../mupdf-1.6-source make prefix=$plibs install install -Dm644 build/debug/libmujs.a $plibs/lib From f5205a7ba6bea953e50318dad947956a0426e079 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 2 Sep 2015 22:12:17 +0200 Subject: [PATCH 165/188] python-web.py: disable Py3k interpreter, fixes #9619 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cafae9864e0..4109625cab5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14828,6 +14828,7 @@ let web = buildPythonPackage rec { version = "0.37"; name = "web.py-${version}"; + disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz"; From 3e0fab38646afa67bd9c908b407f47738e66841e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Sep 2015 12:17:43 +0200 Subject: [PATCH 166/188] nox: use propagatedBuildInputs instead of pythonPath, fixes #9633 This way, when accessing Nox via Python, the dependencies will be available. --- pkgs/tools/package-management/nox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 2930e6fdce2..92edd915ad7 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ pythonPackages.pbr ]; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ dogpile_cache click requests2 From b02921d4ca7fd269694b483c01f42785dc17c349 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Tue, 1 Sep 2015 11:23:11 +0100 Subject: [PATCH 167/188] libixp-hg: init at 2012-12-02 --- .../libraries/libixp-hg/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libixp-hg/default.nix diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix new file mode 100644 index 00000000000..456e1de25df --- /dev/null +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchhg, txt2tags }: + +stdenv.mkDerivation rec { + rev = "148"; + version = "hg-2012-12-02"; + name = "libixp-${version}"; + + src = fetchhg { + url = https://code.google.com/p/libixp/; + sha256 = "1nbnh2ff18fsrs28mx4bfgncq1d1nw5dd6iwhwvv5x2g9w7q5vvj"; + inherit rev; + }; + + configurePhase = '' + sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk + ''; + + buildInputs = [ txt2tags ]; + + meta = { + homepage = https://code.google.com/p/libixp/; + description = "Portable, simple C-language 9P client and server libary"; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = stdenv.lib.licenses.mit; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa4cfc3033..ed86a7dfda2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7560,6 +7560,8 @@ let inherit fetchurl stdenv; }); + libixp_hg = callPackage ../development/libraries/libixp-hg { }; + libyaml = callPackage ../development/libraries/libyaml { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; From c0b710fc68352d672ff1c450010b35d9992154af Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Tue, 1 Sep 2015 12:36:03 +0100 Subject: [PATCH 168/188] wmii-hg: init at 2012-12-09 --- .../window-managers/wmii-hg/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/window-managers/wmii-hg/default.nix diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix new file mode 100644 index 00000000000..a7d492a05dc --- /dev/null +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python +, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: + +stdenv.mkDerivation rec { + rev = "2823"; + version = "hg-2012-12-09"; + name = "wmii-${version}"; + + src = fetchhg { + url = https://code.google.com/p/wmii/; + sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51"; + inherit rev; + }; + + # for dlopen-ing + patchPhase = '' + substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" + ''; + + configurePhase = '' + for file in $(grep -lr '#!.*sh'); do + sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file + done + + cat <> config.mk + PREFIX = $out + LIBIXP = ${libixp_hg}/lib/libixp.a + BINSH = ${dash}/bin/dash + EOF + ''; + + buildInputs = [ pkgconfig libixp_hg txt2tags dash python + libX11 libXrender libXext libXinerama libXrandr libXft ]; + + # For some reason including mercurial in buildInputs did not help + makeFlags = "WMII_HGVERSION=hg${rev}"; + + meta = { + homepage = "https://code.google.com/p/wmii/"; + description = "A small window manager controlled by a 9P filesystem"; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = stdenv.lib.licenses.mit; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed86a7dfda2..1ca22091e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13322,6 +13322,8 @@ let includeUnpack = config.stdenv.includeUnpack or false; }; + wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; + wordnet = callPackage ../applications/misc/wordnet { }; workrave = callPackage ../applications/misc/workrave { From 553e7d49ffe2e688f8d38b66e544375d2bee7186 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Tue, 1 Sep 2015 12:39:11 +0100 Subject: [PATCH 169/188] wmii service: refactor to use wmii_hg --- .../services/x11/window-managers/wmii.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index 75f6fdfe3bc..e6f534a1be6 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -1,47 +1,43 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, pkgs, options, modulesPath }: let - + inherit (lib) mkOption mkIf singleton; cfg = config.services.xserver.windowManager.wmii; - + wmii = pkgs.wmii_hg; in - { options = { - services.xserver.windowManager.wmii.enable = mkOption { default = false; example = true; description = "Enable the wmii window manager."; }; - }; config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton # stop wmii by # $wmiir xwrite /ctl quit # this will cause wmii exiting with exit code 0 + # (or "mod+a quit", which is bound to do the same thing in wmiirc + # by default) # # why this loop? # wmii crashes once a month here. That doesn't matter that much - # wmii can recover very well. However without loop the x session terminates and then your workspace setup is - # lost and all applications running on X will terminate. + # wmii can recover very well. However without loop the X session + # terminates and then your workspace setup is lost and all + # applications running on X will terminate. # Another use case is kill -9 wmii; after rotating screen. - # Note: we don't like kill for that purpose. But it works (-> subject "wmii and xrandr" on mailinglist) + # Note: we don't like kill for that purpose. But it works (-> + # subject "wmii and xrandr" on mailinglist) { name = "wmii"; start = '' while :; do - ${pkgs.wmiiSnap}/bin/wmii && break + ${wmii}/bin/wmii && break done ''; }; - environment.systemPackages = [ pkgs.wmiiSnap ]; - + environment.systemPackages = [ wmii ]; }; - } From b22e6cb29927511c14b745405f4c157dd66513b4 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Tue, 1 Sep 2015 13:52:08 +0100 Subject: [PATCH 170/188] wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609 wiimenu superseded by wimenu from wmii wmiiSnap superseded by wmii_hg libixp_for_wmii superseded by libixp_hg --- .../manual/release-notes/release-notes.xml | 1 + .../doc/manual/release-notes/rl-unstable.xml | 27 ++++++++++++++ .../window-managers/wmii/default.nix | 35 ------------------- .../window-managers/wmii31/default.nix | 35 ------------------- .../libraries/libixp_for_wmii/default.nix | 26 -------------- pkgs/top-level/all-packages.nix | 18 ---------- 6 files changed, 28 insertions(+), 114 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-unstable.xml delete mode 100644 pkgs/applications/window-managers/wmii/default.nix delete mode 100644 pkgs/applications/window-managers/wmii31/default.nix delete mode 100644 pkgs/development/libraries/libixp_for_wmii/default.nix diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index e326f89d4f4..6ed99315a7a 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +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-unstable.xml new file mode 100644 index 00000000000..2781cee3614 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -0,0 +1,27 @@ +
+ +Unstable + +When upgrading from a previous release, please be aware of the + following incompatible changes: + + + + wmiiSnap has been replaced with + wmii_hg, but + services.xserver.windowManager.wmii.enable + has been updated respectively so this only affects you if you + have explicitly installed wmiiSnap. + + + wmiimenu is removed, as it has been removed by + the developers upstream. Use wimenu from the + wmii-hg package. + + + +
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix deleted file mode 100644 index e8ecc72a6d3..00000000000 --- a/pkgs/applications/window-managers/wmii/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmii-3.6"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; - sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; - }; - - buildInputs = [ libX11 libixp xextproto libXt libXext ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - for i in libfmt libutf libregexp libbio; do - cd $i; make; cd .. - done - mkdir -p \$out/lib - cp ${libixp}/lib/libixp.a \$out/lib - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\ - config.mk - # don't use the default one installed by nixos! - #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - make install - "; - meta = { homepage = "www.suckless.org"; - description = "a really cool window manager which can by driven by keyboard only"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix deleted file mode 100644 index 568be30f1c5..00000000000 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmiimenu-3.1"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz; - sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk"; - }; - - buildInputs = [ libX11 libixp ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - # don't use the default one installed by nixos! - # sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - - # This will fail but wmiimenu has been built (hack!) - set +e - make &> /dev/null - set -e - mkdir -p \$out/bin - cp cmd/wmiimenu \$out/bin - "; - meta = { homepage = "www.suckless.org"; - description = "One small tool of the wmii window manger to let the user select an item from a list by filtering"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix deleted file mode 100644 index cbe9e20f0b1..00000000000 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "libixp_for_wmii-0.4"; - phases = "unpackPhase installPhase"; - installPhase = " - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - make - mkdir -p \$out/include - cp -r include/*.h \$out/include - cp -r lib \$out - "; - src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; - sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; - }; - - meta = { - homepage = http://libs.suckless.org/libixp; - description = "stand-alone client/server 9P library"; - license = with stdenv.lib.licenses; [ mit lpl-102 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca22091e3d..984485e893c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,10 +7556,6 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { - inherit fetchurl stdenv; - }); - libixp_hg = callPackage ../development/libraries/libixp-hg { }; libyaml = callPackage ../development/libraries/libyaml { }; @@ -13308,20 +13304,6 @@ let wmctrl = callPackage ../tools/X11/wmctrl { }; - # I'm keen on wmiimenu only >wmii-3.5 no longer has it... - wmiimenu = import ../applications/window-managers/wmii31 { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11; - }; - - wmiiSnap = import ../applications/window-managers/wmii { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11 xextproto libXt libXext; - includeUnpack = config.stdenv.includeUnpack or false; - }; - wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; From 32d0d863bcda824d7d8952daf871d398e3a049b1 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Wed, 2 Sep 2015 21:04:24 +0100 Subject: [PATCH 171/188] {lib}mediainfo{-gui}: 0.7.76 -> 0.7.77, fixes #9617 Local build and run successful. From the ChangeLog: ``` Version 0.7.77, 2015-09-02 + #B941, MXF: files having only a video stream and an ancillary data stream were having incorrect second video stream + MOV: detection of r210 CodecID as raw RGB + Ancillary data: detection of all metadata blocks (previously: only the first one was detected) x MPEG-TS: Wrong demux of TSP (188+16 TS) files having PES with only padding x MediaTrace #2: XML malformed with Flags items (hotfix, flags meaning disabled in XML output) x MediaTrace #3: XML malformed with some MP4 files x MediaTrace #6: XML duplicated attributes x MediaTrace #10: versioned xsd, creating library name and version x MediaTrace: XML content was not escaped x #B947, Amazon S3 support (REST API v2), CLI/DLL only and if compiled with libcurl support: Analyze file on s3 was not working if secret key contains / character ``` --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 939edc97be1..55de1425787 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 4a5fffe533d..5c6f3f9a148 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 010318073c7..dd17f7a4c00 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "088hxj3x12ww8zym3g6izz1w9m6wxgdy7hc2m089cd4sv9dlccnq"; + sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; From 882b2465c239d1fd9299ac4f94a9591327f043f3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 12:58:43 +0200 Subject: [PATCH 172/188] Remove ad hoc README It's unlikely that people will see this file, so it's kind of pointless. --- nixos/modules/services/x11/desktop-managers/README | 1 - 1 file changed, 1 deletion(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/README diff --git a/nixos/modules/services/x11/desktop-managers/README b/nixos/modules/services/x11/desktop-managers/README deleted file mode 100644 index 78c75ff7098..00000000000 --- a/nixos/modules/services/x11/desktop-managers/README +++ /dev/null @@ -1 +0,0 @@ -Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`. \ No newline at end of file From f223448d5d0fe07a939c6b67d01a2b6ab724c4cf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 13:01:49 +0200 Subject: [PATCH 173/188] Shorten inhibit message This also makes it consistent with KDE's inhibit message. --- nixos/modules/services/x11/display-managers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 98e36954712..fc0803f2aca 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -62,7 +62,7 @@ let if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then export _INHIBITION_LOCK_TAKEN=1 if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then - exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information." "$0" "$sessionType" + exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="Desktop environment handles power events" "$0" "$sessionType" fi fi From 7bd6aac2d0881d6ac17d684e36234913094286bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= Date: Wed, 2 Sep 2015 19:41:29 +0200 Subject: [PATCH 174/188] lgogdownloader: init at 2.24, fixes #9613 htmlcxx: init at 0.85, dependency of lgogdownloader --- .../development/libraries/htmlcxx/default.nix | 20 +++++++++++++ .../libraries/htmlcxx/ptrdiff.patch | 13 +++++++++ pkgs/games/lgogdownloader/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/htmlcxx/default.nix create mode 100644 pkgs/development/libraries/htmlcxx/ptrdiff.patch create mode 100644 pkgs/games/lgogdownloader/default.nix diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix new file mode 100644 index 00000000000..63cc7477385 --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "htmlcxx-${version}"; + version = "0.85"; + + src = fetchurl { + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + }; + + patches = [ ./ptrdiff.patch ]; + + meta = { + homepage = http://htmlcxx.sourceforge.net/; + description = "htmlcxx is a simple non-validating css1 and html parser for C++."; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch new file mode 100644 index 00000000000..6348ba24f8d --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/ptrdiff.patch @@ -0,0 +1,13 @@ +diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h +*** htmlcxx-orig-0.85/html/tree.h 2015-09-02 13:57:17.988688798 +0200 +--- htmlcxx-0.85/html/tree.h 2015-09-02 13:57:52.737768811 +0200 +*************** +*** 45,50 **** +--- 45,51 ---- + #ifndef tree_hh_ + #define tree_hh_ + ++ #include + #include + #include + #include diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix new file mode 100644 index 00000000000..4ef3e533772 --- /dev/null +++ b/pkgs/games/lgogdownloader/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }: + +stdenv.mkDerivation rec { + name = "lgogdownloader-${version}"; + version = "2.24"; + + src = fetchgit { + url = "https://github.com/Sude-/lgogdownloader.git"; + rev = "refs/tags/v${version}"; + sha256 = "1h5l4zc22hj4all2w0vfby1rmhpca33g3bhdnqw11w2ligk8j14r"; + }; + + buildInputs = [ curl boost jsoncpp liboauth rhash tinyxml htmlcxx help2man ]; + + buildPhase = '' + make release + ''; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = https://github.com/Sude-/lgogdownloader; + description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader."; + license = stdenv.lib.licenses.wtfpl; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 984485e893c..c99a1d67f88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6657,6 +6657,8 @@ let hstr = callPackage ../applications/misc/hstr { }; + htmlcxx = callPackage ../development/libraries/htmlcxx { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -13793,6 +13795,8 @@ let kobodeluxe = callPackage ../games/kobodeluxe { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; + lincity = builderDefsPackage (import ../games/lincity) { inherit (xlibs) libX11 libXext xextproto libICE libSM xproto; From 4028f8878683ed9fc281f376a05d2b5bbe8d1ace Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 28 Aug 2015 21:33:15 +1000 Subject: [PATCH 175/188] pidgin-opensteamworks: 1.5.1 -> 1.6.1, fixes #9489 Also, changed source url to (new) official github repo --- .../pidgin-plugins/pidgin-opensteamworks/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 30d90ba302d..e03b61b6182 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : stdenv.mkDerivation rec { - name = "pidgin-opensteamworks-1.5.1"; + name = "pidgin-opensteamworks-${version}"; + version = "1.6.1"; - # Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service src = fetchFromGitHub { - owner = "Shados"; + owner = "EionRobb"; repo = "pidgin-opensteamworks"; - rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd"; - sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025"; + rev = "${version}"; + sha256 = "6ab27831e454ad3b440e4f06b52e0b3671a4f8417ba4da3ab6f56c56d82cc29b"; }; preConfigure = "cd steam-mobile"; From 1967d9135a0886b54fb3b87b7cfff3ad557409da Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Sep 2015 14:25:02 +0300 Subject: [PATCH 176/188] julia: 0.3.10 -> 0.3.11 --- pkgs/development/compilers/julia/0.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 1a496f457af..27b58b4d0f1 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.10"; + version = "0.3.11"; name = "${pname}-${version}"; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; - sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg"; + sha256 = "06xmv2l8hskdh1s5y2dh28vpb5pc0gzmfl5a03yp0qjjsl5cb284"; name = "julia-git-v${version}"; }; From fe16722cf91f15787ecf40a2ce6c5eef6d5f29f3 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 18 Aug 2015 11:18:32 +0200 Subject: [PATCH 177/188] botocore: 1.1.4 -> 1.1.10 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4109625cab5..2936bc9a00c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1521,12 +1521,12 @@ let }; botocore = buildPythonPackage rec { - version = "1.1.4"; + version = "1.1.10"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "1wbbaj0y6bfzsh61hgnnssn5j8m93r6r2m5r1jmlf6iz3l9gqkkp"; + sha256 = "0syj0m0l7k4wa0n9h7h8ywayjv9fgpn5wyzpdriws0j417y1zlyc"; }; propagatedBuildInputs = From 8828a174cb4d6a35ceb6f381f91711277c062d69 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 18 Aug 2015 11:18:55 +0200 Subject: [PATCH 178/188] awscli: 1.7.41 -> 1.7.47 People in #nixos told me to switch from fetchzip to fetchFromGitHub; let me know if that's a bad change. --- pkgs/tools/admin/awscli/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f544b81e78d..06c9b85b8d6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchzip, pythonPackages, groff }: +{ stdenv, fetchFromGitHub, pythonPackages, groff }: pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.7.41"; + version = "1.7.47"; namePrefix = ""; - src = fetchzip { - url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "1xfvpqyxi5qaqcvm56q616k9zjidbc9l2vk1v3ld6lnlzri3a1ra"; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + rev = version; + sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi"; }; propagatedBuildInputs = [ From 06b66487709bff98ae02f001ca9814074cdc8f58 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 18 Aug 2015 11:12:04 +0200 Subject: [PATCH 179/188] flow: 0.13.1 -> 0.14.0, fixes #9321 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 893ac521307..b0e021f54cc 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ocaml, libelf }: stdenv.mkDerivation rec { - version = "0.13.1"; + version = "0.14.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1p7rzhvmz9y7ii2z05mfdb49i45f82kx8c9ywciwqma06zycvd80"; + sha256 = "02adbn2h5bfc4drcpbalq7acx573a657ik3008fr8s9qyqdp2nl6"; }; installPhase = '' From ecd873ddb0433d055cf4503aa4c5761e413a559b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 28 Aug 2015 14:19:27 +0100 Subject: [PATCH 180/188] pythonPackages.jsonpath_rw: init at 1.4.0, fixes #9493 --- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2936bc9a00c..4d6c31cfd72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7274,6 +7274,33 @@ let }; + jsonpath_rw = buildPythonPackage rec { + name = "jsonpath-rw-${version}"; + version = "1.4.0"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpath-rw/${name}.tar.gz"; + md5 = "3a807e05c2c12158fc6bb0a402fd5778"; + }; + + propagatedBuildInputs = with self; [ + ply + six + decorator + ]; + + # ImportError: No module named tests + doCheck = false; + + meta = { + homepage = https://github.com/kennknowles/python-jsonpath-rw; + description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; + license = licenses.asl20; + }; + }; + + keyring = buildPythonPackage rec { name = "keyring-3.3"; From 1942480e95a47b1d4d749fd4f1bff155102c741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Thu, 3 Sep 2015 14:04:59 +0100 Subject: [PATCH 181/188] rkt: Don't download stage1 image during build. Second attempt to resolve this issue. Copies stage1 image into expected place manually. This has been improved in rkt master where there is a configure option for specifying the location of this file. Can update when next stable rkt is released. --- .../applications/virtualization/rkt/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index e873608733a..1d03eece46c 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -3,7 +3,7 @@ let coreosImageRelease = "738.1.0"; - + in stdenv.mkDerivation rec { version = "0.8.0"; name = "rkt-${version}"; @@ -19,20 +19,25 @@ in stdenv.mkDerivation rec { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0"; }; - + buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; - + preConfigure = '' ./autogen.sh ''; - configureFlags = "--with-stage1-image-path=${stage1image}"; - + preBuild = '' + # hack to avoid downloading image during build, this has been + # improved in rkt master + mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos + cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img + ''; + installPhase = '' mkdir -p $out/bin cp -Rv build-rkt-${version}/bin/* $out/bin ''; - + meta = with lib; { description = "A fast, composable, and secure App Container runtime for Linux"; homepage = http://rkt.io; From 6c885b38eee3abade20a56a3f3c2a634d4cafcbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2015 20:32:52 +0200 Subject: [PATCH 182/188] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/d7dddc66daaf3a0e4aac6026dea879fcbfaed3cc with hackage2nix v20150824-72-g87526c2 --- .../haskell-modules/hackage-packages.nix | 265 ++++++++++++------ 1 file changed, 174 insertions(+), 91 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7accc1626eb..78efcabdfd8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2221,6 +2221,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal_1_20_0_3" = callPackage @@ -2246,6 +2247,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal_1_22_4_0" = callPackage @@ -2272,6 +2274,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal-ide-backend" = callPackage @@ -4551,20 +4554,16 @@ self: { "Euterpea" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring - , Cabal, CCA, containers, deepseq, ghc-prim, HCodecs, heap - , markov-chain, monadIO, mtl, PortMidi, pure-fft, QuickCheck - , random, stm, syb, template-haskell, UISF + , Cabal, containers, deepseq, ghc-prim, HCodecs, heap, markov-chain + , PortMidi, pure-fft, QuickCheck, random, stm, UISF }: mkDerivation { pname = "Euterpea"; - version = "1.0.0"; - sha256 = "ba6d412a87431694aa50b7e1fb398b1f8671d3bbf1c6da3ef961e9436ad6cc31"; - revision = "1"; - editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; + version = "1.1.0"; + sha256 = "b9f311ce03c58e3a8da502713d5ac5cd2463e76a9bc4c7b2b3556de2e42d58b4"; libraryHaskellDepends = [ - array arrows base bytestring CCA containers deepseq ghc-prim - HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm - syb template-haskell UISF + array arrows base bytestring containers deepseq ghc-prim HCodecs + heap markov-chain PortMidi pure-fft random stm UISF ]; testHaskellDepends = [ ansi-terminal base Cabal QuickCheck ]; jailbreak = true; @@ -5026,8 +5025,8 @@ self: { ({ mkDerivation, base, containers, HUnit, parsec }: mkDerivation { pname = "Folly"; - version = "0.1.5.2"; - sha256 = "d91356d28619c50115160d078277104bac9567f099a5b9fd13b0079b7f164e0d"; + version = "0.2.0.0"; + sha256 = "47ceb0db6bbfe935e0d931a5d6d4425e46fd059657398ae0be67f2f0e714ee05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec ]; @@ -7733,6 +7732,7 @@ self: { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -8565,8 +8565,8 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.2.2"; - sha256 = "9d2e9e4886e816c5e97e91c27cf007d18f0dafeb2acdf1e1d7023764b9a4d22c"; + version = "0.3.0"; + sha256 = "24f324d8cab517d23d14fd6350bd854b97226802b9ae3eb0e5f05cc344e95e3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8574,7 +8574,7 @@ self: { RBTree regex-posix template-haskell threepenny-gui ]; homepage = "http://maartenfaddegon.nl"; - description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack"; + description = "Lighweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12955,6 +12955,7 @@ self: { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck" = callPackage @@ -15623,15 +15624,15 @@ self: { }) {}; "UISF" = callPackage - ({ mkDerivation, arrows, base, containers, deepseq, GLFW, OpenGL - , stm, transformers + ({ mkDerivation, array, arrows, base, containers, deepseq, GLUT + , OpenGL, stm, transformers }: mkDerivation { pname = "UISF"; - version = "0.3.0.2"; - sha256 = "86a89d4e23d00916138d686e206240f0df282d971faf5e049c844c0f0ae1b344"; + version = "0.4.0.0"; + sha256 = "1d2084f1c81364b830fab4937901b83bee08addf6ea4e8123573b084cd80f3e7"; libraryHaskellDepends = [ - arrows base containers deepseq GLFW OpenGL stm transformers + array arrows base containers deepseq GLUT OpenGL stm transformers ]; homepage = "http://haskell.cs.yale.edu/"; description = "Library for Arrowized Graphical User Interfaces"; @@ -18295,6 +18296,7 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson" = callPackage @@ -21623,12 +21625,9 @@ self: { ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "app-lens"; - version = "0.1.0.0"; - sha256 = "280cfa13e1f52d40fa10f70f5f98e13e7de9633fa8919a9dcfef857e98953f3e"; - revision = "2"; - editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d"; + version = "0.1.0.1"; + sha256 = "717cb2d1abc9add860d6e058b2da8ba45a124f8a637b4ab5984a89a42d485627"; libraryHaskellDepends = [ base containers lens mtl ]; - jailbreak = true; homepage = "https://bitbucket.org/kztk/app-lens"; description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; @@ -22257,6 +22256,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "array-forth" = callPackage @@ -24868,6 +24868,7 @@ self: { libraryHaskellDepends = [ ghc-prim rts ]; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat" = callPackage @@ -25972,6 +25973,7 @@ self: { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-bits" = callPackage @@ -29595,6 +29597,7 @@ self: { homepage = "https://github.com/haskell/bytestring"; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-arbitrary" = callPackage @@ -30384,6 +30387,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install" = callPackage @@ -32433,10 +32437,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.4.1"; - sha256 = "1d3bd0bab9a927e0efd386e8786ad7e0936921553edf275e7d2b676b40c310fd"; - revision = "1"; - editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692"; + version = "0.4.2"; + sha256 = "f2852d1f13c434f5e49ed319afc8f1a79cbb5e06d4235e5b342dc44cba6c2519"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -36455,6 +36457,7 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit" = callPackage @@ -37134,6 +37137,7 @@ self: { jailbreak = true; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers_0_5_6_3" = callPackage @@ -37152,6 +37156,7 @@ self: { ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers-benchmark" = callPackage @@ -37461,6 +37466,7 @@ self: { homepage = "http://github.com/pepeiborra/control-monad-free"; description = "Free monads and monad transformers"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-free" = callPackage @@ -40116,8 +40122,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.3"; - sha256 = "0e1eb50a1a1185bc898e87f93040f47b80d8a0beb132fb2c14a77b6720011f32"; + version = "0.1.3.1"; + sha256 = "3c22a5ddb373178203093f1bea6ea8921810e352df1cf1cc50b94c758cea96f9"; libraryHaskellDepends = [ async attoparsec base binary blaze-builder bytestring conduit conduit-extra containers data-binary-ieee754 data-default @@ -42735,6 +42741,7 @@ self: { jailbreak = true; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deepseq_1_4_1_2" = callPackage @@ -42751,6 +42758,7 @@ self: { ]; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deepseq-bounded" = callPackage @@ -43258,15 +43266,15 @@ self: { }) {}; "dequeue" = callPackage - ({ mkDerivation, base, QuickCheck, safe }: + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck + , safe + }: mkDerivation { pname = "dequeue"; - version = "0.1.7"; - sha256 = "ceecc24ce84cabf5df5291eda19400f452d3dc1b102f6ebef2c6c689ec7c5eea"; - isLibrary = true; - isExecutable = true; + version = "0.1.12"; + sha256 = "c70aedbb1965affe07b7151f12e9a8e42f2cb54652bb0a0bbc5d0ba8e21721ab"; libraryHaskellDepends = [ base QuickCheck safe ]; - executableHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43468,6 +43476,7 @@ self: { homepage = "https://github.com/chrisdone/descriptive"; description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "descriptive" = callPackage @@ -44809,6 +44818,7 @@ self: { testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directory-layout" = callPackage @@ -52184,6 +52194,7 @@ self: { homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filepath-io-access" = callPackage @@ -56611,6 +56622,7 @@ self: { libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-flamegraph" = callPackage @@ -58082,7 +58094,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss" = callPackage @@ -61863,6 +61875,7 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddock-api" = callPackage @@ -64354,6 +64367,7 @@ self: { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskeline-class" = callPackage @@ -64938,6 +64952,7 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts" = callPackage @@ -66268,6 +66283,8 @@ self: { pname = "haste-compiler"; version = "0.5.1.2"; sha256 = "106f844a4ffef0a8b0af954b369bf052c434e1713aa8bdde3d3c3ebc53046b4c"; + revision = "1"; + editedCabalFile = "b7ef9b6e6475a75c96dc5c97460143429abfb60a6453da57dad4d15f2b8e4d9a"; configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; @@ -68461,15 +68478,15 @@ self: { "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , containers, directory, exceptions, filepath, HandsomeSoup, hspec - , http-types, hxt, iso8601-time, MissingH, mtl, multipart - , optparse-applicative, random, silently, stm, tar, temporary, text - , time, transformers, unix, unordered-containers, utf8-string, wai - , warp + , hspec-wai, http-types, hxt, iso8601-time, MissingH, mtl + , multipart, optparse-applicative, random, silently, stm, tar + , temporary, text, time, transformers, unix, unordered-containers + , utf8-string, wai, wai-extra, warp }: mkDerivation { pname = "heyefi"; - version = "0.1.1.1"; - sha256 = "0efccccc2f8b0cfce5496a39df575d50f007611ebfcc7bc260f74911ac6fa936"; + version = "1.0.0.0"; + sha256 = "76faae3d15478468c5c77021e8de886143da550e11e540fbd0e4abf8e1f24886"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68480,10 +68497,10 @@ self: { ]; testHaskellDepends = [ base bytestring case-insensitive configurator containers directory - exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time - MissingH mtl multipart optparse-applicative random silently stm tar - temporary text time transformers unix unordered-containers - utf8-string wai warp + exceptions filepath HandsomeSoup hspec hspec-wai http-types hxt + iso8601-time MissingH mtl multipart optparse-applicative random + silently stm tar temporary text time transformers unix + unordered-containers utf8-string wai wai-extra warp ]; homepage = "https://github.com/ryantm/heyefi"; description = "A server for Eye-Fi SD cards"; @@ -71774,6 +71791,7 @@ self: { homepage = "http://ghc.cs.tufts.edu/hoopl/"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoovie" = callPackage @@ -72437,6 +72455,7 @@ self: { ]; description = "Code Coverage Library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-coveralls" = callPackage @@ -79107,6 +79126,18 @@ self: { license = "GPL"; }) {}; + "ifcxt" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "ifcxt"; + version = "0.1.0.0"; + sha256 = "7c09ff72dc72b288bb2020970adabc87ef1e5913175a745dd1573faf3422169d"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/mikeizbicki/ifcxt"; + description = "put if statements within type constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iff" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -79144,8 +79175,8 @@ self: { }: mkDerivation { pname = "ig"; - version = "0.5"; - sha256 = "07d955a37fb619f14941801e2afda7795910137b14856b3b4fb07a9fba661958"; + version = "0.5.1"; + sha256 = "1e97b3de79b9d78b32b74dbb1ab70451f7be544979fee90fb61d099b992b60e8"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -80567,6 +80598,7 @@ self: { libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -86223,14 +86255,15 @@ self: { }: mkDerivation { pname = "language-qux"; - version = "0.1.1.0"; - sha256 = "c5259a61229368bc90a64b755bb91d21fd6be3392d907db536ae8e752fce1018"; + version = "0.1.1.2"; + sha256 = "5d9d794cb899005f0c917d3c8e9b856fd8dc9c1162e1f6d94ef1b8d8d3300d25"; libraryHaskellDepends = [ base containers either indents mtl parsec pretty transformers ]; homepage = "https://github.com/qux-lang/language-qux"; description = "Utilities for working with the Qux language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-sh" = callPackage @@ -89876,8 +89909,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.2.4"; - sha256 = "56f3e654199a547551faa93fe8a97e2f3d7412bd3c20c5dd2b3c1eac9947d5b5"; + version = "0.3.0"; + sha256 = "dca1bb49f899d7db636db183bb5404b464d120ed793181f3257adf44e5130862"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq exceptions hpqtypes lifted-base monad-control monad-time mtl @@ -90254,6 +90287,8 @@ self: { pname = "loops"; version = "0.2.0.2"; sha256 = "47cfc98476c1a3267b27531825849978d3c0ccb5a2d6cd61132a7f719f10ddeb"; + revision = "1"; + editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce"; libraryHaskellDepends = [ base primitive transformers vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Fast imperative-style loops"; @@ -94534,8 +94569,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "0.1.2.0"; - sha256 = "70a4c0f996d4e6787f3dd736f2885c6e2bd5bb0109f333a696b75093971cc31d"; + version = "0.1.2.10"; + sha256 = "b0e316ea784810049c5674903150697b818e873fd8ab531f9e62d807a4016f69"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96362,6 +96397,7 @@ self: { homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl" = callPackage @@ -96428,6 +96464,7 @@ self: { homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-prelude" = callPackage @@ -98004,8 +98041,8 @@ self: { }: mkDerivation { pname = "nats-queue"; - version = "0.1.2.0"; - sha256 = "eee9a423a1ae8eb5fb4af05a98958e32a8b86f5bf8abeba0074afe7690c30f3f"; + version = "0.1.2.1"; + sha256 = "278abe19802ac26b2a720ad9bab84c9ce74f348eabff55ee96e67286f5453ca3"; libraryHaskellDepends = [ aeson async base bytestring containers dequeue network network-uri random text @@ -103310,6 +103347,7 @@ self: { jailbreak = true; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parallel" = callPackage @@ -104311,15 +104349,16 @@ self: { }) {}; "pcre-heavy" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, pcre-light - , stringable, template-haskell + ({ mkDerivation, base, base-compat, bytestring, doctest, Glob + , pcre-light, semigroups, string-conversions, template-haskell }: mkDerivation { pname = "pcre-heavy"; - version = "0.2.5"; - sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7"; + version = "1.0.0.1"; + sha256 = "a83e86a72c2bd8073dc71fc115c3b432c00c6294918250bed87f34a8c31ab0ec"; libraryHaskellDepends = [ - base bytestring pcre-light stringable template-haskell + base base-compat bytestring pcre-light semigroups + string-conversions template-haskell ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/myfreeweb/pcre-heavy"; @@ -105855,6 +105894,7 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipe-enumerator" = callPackage @@ -108036,10 +108076,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.3"; - sha256 = "a08c0cc84ec664cb35acb399c7e57c390db658a8e7a672479dc7b143d5ed249e"; - revision = "1"; - editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce"; + version = "0.1.4"; + sha256 = "274dac6dcd5d263b4e2023d35901f9b02914b804aa71cd39f10ee813e2cd4ffd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108048,7 +108086,6 @@ self: { executableHaskellDepends = [ base base-prelude old-locale optparse-applicative shelly text time ]; - jailbreak = true; homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; @@ -108182,15 +108219,14 @@ self: { , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, jwt , MissingH, mtl, network, network-uri, optparse-applicative , packdeps, process, QuickCheck, Ranged-sets, regex-base - , regex-tdfa, regex-tdfa-text, resource-pool, scientific, split - , string-conversions, stringsearch, text, time, transformers - , unordered-containers, vector, wai, wai-cors, wai-extra - , wai-middleware-static, warp + , regex-tdfa, resource-pool, scientific, split, string-conversions + , stringsearch, text, time, transformers, unordered-containers + , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.2.10.0"; - sha256 = "fe2e67f849ac37427f1ef4a9d98c44ce4b77078232a655a959987ad96eab3668"; + version = "0.2.11.1"; + sha256 = "5cc8f06c2db31640709245a7eceb0894e5c66fd65a6a03228f8ab263c355792b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108198,18 +108234,18 @@ self: { case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + resource-pool scientific split string-conversions stringsearch text + time transformers unordered-containers vector wai wai-cors + wai-extra wai-middleware-static warp ]; executableHaskellDepends = [ aeson base base64-string bcrypt blaze-builder bytestring case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + resource-pool scientific split string-conversions stringsearch text + time transformers unordered-containers vector wai wai-cors + wai-extra wai-middleware-static warp ]; testHaskellDepends = [ aeson base base64-string bcrypt blaze-builder bytestring @@ -108217,8 +108253,8 @@ self: { hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP http-media http-types jwt MissingH mtl network network-uri optparse-applicative packdeps process QuickCheck Ranged-sets - regex-base regex-tdfa regex-tdfa-text resource-pool scientific - split string-conversions stringsearch text time transformers + regex-base regex-tdfa resource-pool scientific split + string-conversions stringsearch text time transformers unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; @@ -108779,6 +108815,7 @@ self: { homepage = "http://github.com/haskell/pretty"; description = "Pretty-printing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-class" = callPackage @@ -108929,6 +108966,7 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive" = callPackage @@ -109139,6 +109177,7 @@ self: { testHaskellDepends = [ base ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-conduit" = callPackage @@ -111594,6 +111633,7 @@ self: { homepage = "https://github.com/qux-lang/qux"; description = "Command line binary for working with the Qux language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rabocsv2qif" = callPackage @@ -113441,6 +113481,8 @@ self: { pname = "reflex-dom"; version = "0.2"; sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd"; + revision = "1"; + editedCabalFile = "772321874e1c03eb514ba47c9866f0a856da71b708bffc27701f0a051bca1b24"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -119518,6 +119560,7 @@ self: { jailbreak = true; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid" = callPackage @@ -119541,6 +119584,7 @@ self: { jailbreak = true; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid-streams" = callPackage @@ -123974,20 +124018,19 @@ self: { "snaplet-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, clientsession, configurator - , errors, lens, MonadCatchIO-transformers, mtl, postgresql-simple + , lens, MonadCatchIO-transformers, mtl, postgresql-simple , resource-pool-catchio, snap, text, transformers , unordered-containers }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6.0.3"; - sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866"; + version = "0.6.0.4"; + sha256 = "44cca67347a81257533edc9570bf9303081a11d40e8000390a75f3f48e071687"; libraryHaskellDepends = [ - base bytestring clientsession configurator errors lens + base bytestring clientsession configurator lens MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -125548,6 +125591,7 @@ self: { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "split" = callPackage @@ -128409,6 +128453,24 @@ self: { license = "GPL"; }) {}; + "sub-state" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "sub-state"; + version = "0.0.0.1"; + sha256 = "970080595b22141e63563f4718515554bf3a59a0c7cfabe694285597468b6dde"; + libraryHaskellDepends = [ base mtl sets ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + description = "Get the total, put a single element"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim @@ -130553,6 +130615,7 @@ self: { ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tar" = callPackage @@ -131181,6 +131244,7 @@ self: { libraryHaskellDepends = [ base pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-util" = callPackage @@ -131542,6 +131606,7 @@ self: { homepage = "https://github.com/judah/terminfo"; description = "Haskell bindings to the terminfo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "terminfo-hs" = callPackage @@ -133729,6 +133794,7 @@ self: { homepage = "https://github.com/haskell/time"; description = "A time library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-compat" = callPackage @@ -135059,6 +135125,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-abort" = callPackage @@ -138173,6 +138240,7 @@ self: { homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-bytestring" = callPackage @@ -139686,6 +139754,7 @@ self: { homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validation" = callPackage @@ -139913,8 +139982,8 @@ self: { }: mkDerivation { pname = "vcache-trie"; - version = "0.2.0"; - sha256 = "6238b76a198e9608e80569f95e0039e67f57a7af439ec18caf69aa3406a2a634"; + version = "0.2.1"; + sha256 = "bf4572fae3cfb58f859b3b6071b71778ce77750e70ad9c6c37b027f50e8504da"; libraryHaskellDepends = [ array base bytestring bytestring-builder vcache ]; @@ -140083,6 +140152,7 @@ self: { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector" = callPackage @@ -143031,6 +143101,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webrtc-vad" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "webrtc-vad"; + version = "0.1.0.2"; + sha256 = "d3ad3ba58ca2389102be09bda8bca69a525c766ada824898cf833d1993368293"; + libraryHaskellDepends = [ base primitive vector ]; + description = "Easy voice activity detection"; + license = stdenv.lib.licenses.mit; + }) {}; + "webserver" = callPackage ({ mkDerivation, base, bytestring, c10k, containers, directory , filepath, network, old-locale, parsec, process, stm, time, unix @@ -144769,6 +144850,7 @@ self: { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xhtml-combinators" = callPackage @@ -148317,8 +148399,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.1.0"; - sha256 = "ec851e33888b6fdf74b1c41e3fa5a796c091c375aa51d2b5026870a4556bc70f"; + version = "0.1.0.1"; + sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi yi-language yi-rope @@ -149123,6 +149205,7 @@ self: { librarySystemDepends = [ zlib ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib" = callPackage From acb05dfc15121b1d568e28c86d169637f3892803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Sep 2015 14:38:52 +0200 Subject: [PATCH 183/188] haskell-base32-bytestring: disable failing 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 6c602627fe7..4b6a5fe38ec 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1026,4 +1026,7 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch; + # https://github.com/pxqr/base32-bytestring/issues/4 + base32-bytestring = dontCheck super.base32-bytestring; + } From 407b4f764131d899944c3d154773a28ccac3e89c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Sep 2015 14:39:18 +0200 Subject: [PATCH 184/188] haskell-sophia: 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 4b6a5fe38ec..e733fe8088c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -295,21 +295,22 @@ self: super: { hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; + ide-backend = dontCheck super.ide-backend; marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 memcached-binary = dontCheck super.memcached-binary; + msgpack-rpc = dontCheck super.msgpack-rpc; persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; + sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1 xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; - ide-backend = dontCheck super.ide-backend; - msgpack-rpc = dontCheck super.msgpack-rpc; # These packages try to access the network. amqp = dontCheck super.amqp; From 38a74e27de09479bb9f2c65b9b4aa471f1cd17b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 16:46:09 +0200 Subject: [PATCH 185/188] Remove Linux 4.0 It's EOL. --- pkgs/os-specific/linux/kernel/linux-4.0.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.0.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix deleted file mode 100644 index eee052ad3bb..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.0.9"; - extraMeta.branch = "4.0"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0k42blafzd954fncc0b78vi9x1h2k0jhfvkjqxmpv64i7xwwdhsx"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c99a1d67f88..346edc6b63b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9799,16 +9799,6 @@ let ]; }; - linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) { - inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -10004,7 +9994,6 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); - linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); From 90dc8da64d26af0c5582f10b044533dbaf78402a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Sep 2015 16:50:14 +0200 Subject: [PATCH 186/188] linux: Update to 3.18.21 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 05c4b989f39..02052b5d2ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.20"; + version = "3.18.21"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1mwm9xgilsqnj95v3jn94dz9a108ggfm4ifb3kxsfsx5rcl5yy8d"; + sha256 = "0y54kh55grgbyw4k8fa9vx8b426bq9lz12bpvwvzfjs7vimachyw"; }; features.iwlwifi = true; From 65a415a1b24cb0c8d8bce6caceed228bf387df38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Sep 2015 17:49:50 +0200 Subject: [PATCH 187/188] cabal2nix: update to version 20180903 --- .../haskell-modules/configuration-common.nix | 1 - .../tools/haskell/cabal2nix/cabal2nix.nix | 8 ++++---- .../haskell/cabal2nix/distribution-nixpkgs.nix | 14 ++++++-------- .../tools/haskell/cabal2nix/hackage2nix.nix | 4 ++-- .../tools/haskell/cabal2nix/language-nix.nix | 14 ++++++++------ .../cabal2nix/lens-construction-helper.nix | 18 ------------------ 6 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e733fe8088c..1545e49130a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -757,7 +757,6 @@ self: super: { # Override the obsolete version from Hackage with our more up-to-date copy. cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {}; hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {}; - lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.nix {}; language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {}; distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {}; diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index c12cd2cfce2..537e427f66c 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -1,16 +1,16 @@ { mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs -, language-nix, lens, lens-construction-helper, optparse-applicative, pretty +, language-nix, lens, optparse-applicative, pretty , pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper }: mkDerivation rec { pname = "cabal2nix"; - version = "20150824-66-gd281a60"; + version = "20180903"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; @@ -18,7 +18,7 @@ mkDerivation rec { enableSharedExecutables = false; executableHaskellDepends = [ ansi-wl-pprint base Cabal containers distribution-nixpkgs - language-nix lens lens-construction-helper optparse-applicative + language-nix lens optparse-applicative pretty pretty-show ]; executableToolDepends = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index d879ea051e8..3262008e25a 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -1,30 +1,28 @@ { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq , deepseq-generics, directory, doctest, filepath, hackage-db, hspec -, language-nix, lens, lens-construction-helper, pretty, process -, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub +, language-nix, lens, pretty, process, SHA, split, stdenv +, transformers, utf8-string, fetchFromGitHub }: mkDerivation rec { pname = "distribution-nixpkgs"; - version = "20150824-66-gd281a60"; + version = "20180903"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics directory doctest filepath hackage-db hspec language-nix lens - lens-construction-helper pretty process SHA split transformers - utf8-string + pretty process SHA split transformers utf8-string ]; testHaskellDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics directory doctest filepath hackage-db hspec language-nix lens - lens-construction-helper pretty process SHA split transformers - utf8-string + pretty process SHA split transformers utf8-string ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index 5345fe5f413..28a767e31f0 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "hackage2nix"; - version = "20150824-66-gd281a60"; + version = "20180903"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix index a9e02f25449..ea282d75101 100644 --- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix @@ -1,20 +1,22 @@ -{ mkDerivation, base, data-default-class, deepseq-generics, lens -, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub +{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix +, stdenv, fetchFromGitHub, QuickCheck }: mkDerivation rec { pname = "language-nix"; - version = "20150824-66-gd281a60"; + version = "20180903"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; + sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ - base data-default-class deepseq-generics lens - lens-construction-helper pretty regex-posix + base deepseq lens pretty regex-posix + ]; + testHaskellDepends = [ + base deepseq doctest lens pretty regex-posix QuickCheck ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; diff --git a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix deleted file mode 100644 index 0508795486f..00000000000 --- a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }: - -mkDerivation rec { - pname = "lens-construction-helper"; - version = "20150824-66-gd281a60"; - src = fetchFromGitHub { - owner = "nixos"; - repo = "cabal2nix"; - rev = "v${version}"; - sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; - }; - postUnpack = "sourceRoot+=/${pname}"; - libraryHaskellDepends = [ base data-default-class lens ]; - homepage = "https://github.com/nixos/cabal2nix#readme"; - description = "Use data-default to create default instances of various types"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; -} From d169882bb2173402b9ff9691dc7b7004f09cdf51 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Thu, 3 Sep 2015 17:01:00 +0300 Subject: [PATCH 188/188] qtcreator: add missing QML modules (fixes #9629) Fixes empty welcome screen because of missing QML modules. --- pkgs/development/qtcreator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 0f55d4ee9af..8dabd3347fc 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { Categories=Qt;Development;IDE; __EOF__ # Wrap the qtcreator binary + addToSearchPath QML2_IMPORT_PATH "${qtLib.quickcontrols}/lib/qt5/qml" wrapProgram $out/bin/qtcreator \ --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \