diff options
46 files changed, 2279 insertions, 564 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f3b325ed2978..b92308622eed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,72 +7,6 @@ * Clearly describe the issue including steps to reproduce when it is a bug. * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision). -## Making patches - -* Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/). -* Fork the repository on GitHub. -* Create a branch for your future fix. - * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve packages from binary cache. - * For example: `nixos-version` returns `15.05.git.0998212 (Dingo)`. So you can do: - - ```bash - git checkout 0998212 - git checkout -b 'fix/pkg-name-update' - ``` - * Please avoid working directly on the `master` branch. -* Make commits of logical units. - * If you removed pkgs, made some major NixOS changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`. -* Check for unnecessary whitespace with `git diff --check` before committing. -* Format the commit in a following way: - - ``` - (pkg-name | service-name): (from -> to | init at version | refactor | etc) - - Additional information. - ``` - * Examples: - * `nginx: init at 2.0.1` - * `firefox: 3.0 -> 3.1.1` - * `hydra service: add bazBaz option` - * `nginx service: refactor config generation` -* Test your changes. If you work with - * nixpkgs: - * update pkg -> - * `nix-env -i pkg-name -f <path to your local nixpkgs folder>` - * add pkg -> - * Make sure it's in `pkgs/top-level/all-packages.nix` - * `nix-env -i pkg-name -f <path to your local nixpkgs folder>` - * _If you don't want to install pkg in you profile_. - * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`. - * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system. - * NixOS and its modules: - * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`). - And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`. -* If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`. -* Rebase you branch against current `master`. - ## Submitting changes -* Push your changes to your fork of nixpkgs. -* Create pull request: - * Write the title in format `(pkg-name | service): improvement`. - * If you update the pkg, write versions `from -> to`. - * Write in comment if you have tested your patch. Do not rely much on `TravisCI`. - * If you make an improvement, write about your motivation. - * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`. - -## Hotfixing pull requests - -* Make the appropriate changes in you branch. -* Don't create additional commits, do - * `git rebase -i` - * `git push --force` to your branch. - -## Commit policy - -* Commits must be sufficiently tested before being merged, both for the master and staging branches. -* Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested. -* Master should only see non-breaking commits that do not cause mass rebuilds. -* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447). -* If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. [Keep an eye on the staging evaluations here](http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations). -* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra. +See the nixpkgs manual for details on how to [Submit changes to nixpkgs](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-submitting-changes). diff --git a/doc/manual.xml b/doc/manual.xml index 1321f4b7ad22..1f1f50f75fb6 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,6 +18,7 @@ <xi:include href="language-support.xml" /> <xi:include href="package-notes.xml" /> <xi:include href="coding-conventions.xml" /> + <xi:include href="submitting-changes.xml" /> <xi:include href="haskell-users-guide.xml" /> <xi:include href="contributing.xml" /> diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml new file mode 100644 index 000000000000..fe331d082506 --- /dev/null +++ b/doc/submitting-changes.xml @@ -0,0 +1,283 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="chap-submitting-changes"> + +<title>Submitting changes</title> + +<section> +<title>Making patches</title> + +<itemizedlist> +<listitem> +<para>Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.</para> +</listitem> + +<listitem> +<para>Fork the repository on GitHub.</para> +</listitem> + +<listitem> +<para>Create a branch for your future fix. + +<itemizedlist> +<listitem> +<para>You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache. + +<itemizedlist> +<listitem> +<para>For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:</para> +</listitem> +</itemizedlist> + +<screen> +$ git checkout 0998212 +$ git checkout -b 'fix/pkg-name-update' +</screen> +</para> +</listitem> + +<listitem> +<para>Please avoid working directly on the <command>master</command> branch.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>Make commits of logical units. + +<itemizedlist> +<listitem> +<para>If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>Check for unnecessary whitespace with <command>git diff --check</command> before committing.</para> +</listitem> + +<listitem> +<para>Format the commit in a following way:</para> +<programlisting> +(pkg-name | service-name): (from -> to | init at version | refactor | etc) +Additional information. +</programlisting> + +<itemizedlist> +<listitem> +<para>Examples: + +<itemizedlist> +<listitem> +<para> +<command>nginx: init at 2.0.1</command> +</para> +</listitem> + +<listitem> +<para> +<command>firefox: 3.0 -> 3.1.1</command> +</para> +</listitem> + +<listitem> +<para> +<command>hydra service: add bazBaz option</command> +</para> +</listitem> + +<listitem> +<para> +<command>nginx service: refactor config generation</command> +</para> +</listitem> +</itemizedlist> +</para> +</listitem> +</itemizedlist> +</listitem> + +<listitem> +<para>Test your changes. If you work with + +<itemizedlist> +<listitem> +<para>nixpkgs: + +<itemizedlist> +<listitem> +<para>update pkg -> + +<itemizedlist> +<listitem> +<para> +<command>nix-env -i pkg-name -f <path to your local nixpkgs folder></command> +</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>add pkg -> + +<itemizedlist> +<listitem> +<para>Make sure it's in <command>pkgs/top-level/all-packages.nix</command> +</para> +</listitem> + +<listitem> +<para> +<command>nix-env -i pkg-name -f <path to your local nixpkgs folder></command> +</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para> +<emphasis>If you don't want to install pkg in you profile</emphasis>. + +<itemizedlist> +<listitem> +<para> +<command>nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>NixOS and its modules: + +<itemizedlist> +<listitem> +<para>You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>). + And do <command>sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast</command>.</para> +</listitem> +</itemizedlist> +</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.</para> +</listitem> + +<listitem> +<para>Rebase you branch against current <command>master</command>.</para> +</listitem> +</itemizedlist> +</section> + +<section> +<title>Submitting changes</title> + +<itemizedlist> +<listitem> +<para>Push your changes to your fork of nixpkgs.</para> +</listitem> + +<listitem> +<para>Create pull request: + +<itemizedlist> +<listitem> +<para>Write the title in format <command>(pkg-name | service): improvement</command>. + +<itemizedlist> +<listitem> +<para>If you update the pkg, write versions <command>from -> to</command>.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +<listitem> +<para>Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.</para> +</listitem> + +<listitem> +<para>If you make an improvement, write about your motivation.</para> +</listitem> + +<listitem> +<para>Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.</para> +</listitem> +</itemizedlist> +</para> +</listitem> +</itemizedlist> +</section> + +<section> +<title>Hotfixing pull requests</title> + +<itemizedlist> +<listitem> +<para>Make the appropriate changes in you branch.</para> +</listitem> + +<listitem> +<para>Don't create additional commits, do + +<itemizedlist> +<listitem> +<para><command>git rebase -i</command></para> +</listitem> +<listitem> +<para> +<command>git push --force</command> to your branch.</para> +</listitem> +</itemizedlist> +</para> +</listitem> + +</itemizedlist> +</section> + +<section> +<title>Commit policy</title> + +<itemizedlist> +<listitem> +<para>Commits must be sufficiently tested before being merged, both for the master and staging branches.</para> +</listitem> + +<listitem> +<para>Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.</para> +</listitem> + +<listitem> +<para>Master should only see non-breaking commits that do not cause mass rebuilds.</para> +</listitem> + +<listitem> +<para>Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.</para> +</listitem> + +<listitem> +<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.</para> +</listitem> + +<listitem> +<para>When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.</para> +</listitem> +</itemizedlist> + +</section> +</chapter> + diff --git a/lib/licenses.nix b/lib/licenses.nix index d0e146f0dea9..5769f9e49152 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -327,6 +327,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "University of Illinois/NCSA Open Source License"; }; + notion_lgpl = { + url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE"; + fullName = "Notion modified LGPL"; + }; + ofl = spdx { spdxId = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 157d2be7f904..73156ac0b25f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -117,6 +117,7 @@ jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jb55 = "William Casarin <bill@casarin.me>"; jcumming = "Jack Cummings <jack@mudshark.org>"; + jfb = "James Felix Black <james@yamtime.com>"; jgeerds = "Jascha Geerds <jg@ekby.de>"; jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>"; joachifm = "Joachim Fasting <joachifm@fastmail.fm>"; @@ -141,6 +142,7 @@ linus = "Linus Arver <linusarver@gmail.com>"; lnl7 = "Daiderd Jordan <daiderd@gmail.com>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; + lsix = "Lancelot SIX <lsix@lancelotsix.com>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; magnetophon = "Bart Brouns <bart@magnetophon.nl>"; diff --git a/lib/modules.nix b/lib/modules.nix index 73dbdd371f61..ea600127617b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -91,9 +91,11 @@ rec { let toClosureList = file: parentKey: imap (n: x: if isAttrs x || isFunction x then - unifyModuleSyntax file "${parentKey}:anon-${toString n}" (unpackSubmodule applyIfFunction x args) + let key = "${parentKey}:anon-${toString n}"; in + unifyModuleSyntax file key (unpackSubmodule (applyIfFunction key) x args) else - unifyModuleSyntax (toString x) (toString x) (applyIfFunction (import x) args)); + let file = toString x; key = toString x; in + unifyModuleSyntax file key (applyIfFunction key (import x) args)); in builtins.genericClosure { startSet = toClosureList unknownModule "" modules; @@ -122,7 +124,7 @@ rec { config = removeAttrs m ["key" "_file" "require" "imports"]; }; - applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then + applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the @@ -137,11 +139,18 @@ rec { # not their values. The values are forwarding the result of the # evaluation of the option. requiredArgs = builtins.attrNames (builtins.functionArgs f); + context = name: ''while evaluating the module argument `${name}' in "${key}":''; extraArgs = builtins.listToAttrs (map (name: { inherit name; - value = config._module.args.${name}; + value = addErrorContext (context name) + (args.${name} or config._module.args.${name}); }) requiredArgs); - in f (extraArgs // arg) + + # Note: we append in the opposite order such that we can add an error + # context on the explicited arguments of "args" too. This update + # operator is used to make the "args@{ ... }: with args.lib;" notation + # works. + in f (args // extraArgs) else f; diff --git a/lib/strings.nix b/lib/strings.nix index 39112407c570..d9f7f6c2db81 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -107,11 +107,13 @@ rec { # replaceChars ["<" ">"] ["<" ">"] "<foo>" returns "<foo>". replaceChars = del: new: s: let + substList = lib.zipLists del new; subst = c: - (lib.fold - (sub: res: if sub.fst == c then sub else res) - {fst = c; snd = c;} (lib.zipLists del new) - ).snd; + let found = lib.findFirst (sub: sub.fst == c) null substList; in + if found == null then + c + else + found.snd; in stringAsChars subst s; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 66c6f560fbe8..65de8e378c7e 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -12,7 +12,7 @@ evalConfig() { local attr=$1 shift; local script="import ./default.nix { modules = [ $@ ];}" - nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only + nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace } reportFailure() { @@ -100,7 +100,15 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enabl checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix # Check _module.args. -checkConfigOutput "true" config.enable ./declare-enable.nix ./custom-arg-define-enable.nix +set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix +checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@" +checkConfigOutput "true" "$@" ./define-_module-args-custom.nix + +# Check that using _module.args on imports cause infinite recursions, with +# the proper error context. +set -- "$@" ./define-_module-args-custom.nix ./import-custom-arg.nix +checkConfigError 'while evaluating the module argument .*custom.* in .*import-custom-arg.nix.*:' "$@" +checkConfigError 'infinite recursion encountered' "$@" # Check _module.check. set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub-foo.nix diff --git a/lib/tests/modules/define-_module-args-custom.nix b/lib/tests/modules/define-_module-args-custom.nix new file mode 100644 index 000000000000..e565fd215a57 --- /dev/null +++ b/lib/tests/modules/define-_module-args-custom.nix @@ -0,0 +1,7 @@ +{ lib, ... }: + +{ + config = { + _module.args.custom = true; + }; +} diff --git a/lib/tests/modules/custom-arg-define-enable.nix b/lib/tests/modules/define-enable-with-custom-arg.nix index f04d30dd9b9f..7da74671d148 100644 --- a/lib/tests/modules/custom-arg-define-enable.nix +++ b/lib/tests/modules/define-enable-with-custom-arg.nix @@ -2,7 +2,6 @@ { config = { - _module.args.custom = true; enable = custom; }; } diff --git a/lib/tests/modules/import-custom-arg.nix b/lib/tests/modules/import-custom-arg.nix new file mode 100644 index 000000000000..3e687b661c16 --- /dev/null +++ b/lib/tests/modules/import-custom-arg.nix @@ -0,0 +1,6 @@ +{ lib, custom, ... }: + +{ + imports = [] + ++ lib.optional custom ./define-enable-force.nix; +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 097e4fe70d58..a8b1044ad365 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -16,6 +16,7 @@ in ./i3.nix ./metacity.nix ./openbox.nix + ./notion.nix ./ratpoison.nix ./sawfish.nix ./stumpwm.nix diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixos/modules/services/x11/window-managers/notion.nix new file mode 100644 index 000000000000..1bfc2a86e965 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/notion.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.notion; +in + +{ + options = { + services.xserver.windowManager.notion = { + enable = mkOption { + default = false; + example = true; + description = "Enable the notion tiling window manager."; + }; + }; + }; + + config = mkIf cfg.enable { + services.xserver.windowManager = { + session = [{ + name = "notion"; + start = '' + ${pkgs.notion}/bin/notion & + waitPID=$! + ''; + }]; + }; + environment.systemPackages = [ pkgs.notion ]; + }; +} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2d2976ea5b7c..52a1dcf99325 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -90,6 +90,7 @@ in rec { nixpkgs.tarball (all nixpkgs.emacs) + (all nixpkgs.jdk) ]; }); diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 11155c853696..8e53064f99d0 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -87,7 +87,10 @@ in rec { }; constituents = let all = x: map (system: x.${system}) supportedSystems; in - [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos; + [ nixpkgs.tarball + (all nixpkgs.jdk) + ] + ++ lib.collect lib.isDerivation nixos; }); } diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 1f008e56c151..d5de42f6a6ef 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, libav, libkeyfinder }: +{ stdenv, fetchFromGitHub, libav, libkeyfinder_0_11 }: -let version = "20150130"; in +let version = "20150201"; in stdenv.mkDerivation rec { name = "keyfinder-cli-${version}"; @@ -12,19 +12,20 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; description = "Musical key detection for digital audio (command-line tool)"; longDescription = '' This small utility is the automation-oriented DJ's best friend. By making use of Ibrahim Sha'ath's high quality libKeyFinder library, it can be used to estimate the musical key of many different audio formats. ''; - homepage = https://github.com/EvanPurkhiser/keyfinder-cli; license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ libav libkeyfinder ]; + buildInputs = [ libav libkeyfinder_0_11 ]; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index d3438e1ada43..edbedb1c013f 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: -let version = "1.26"; in +let version = "2.00"; in stdenv.mkDerivation { name = "keyfinder-${version}"; src = fetchFromGitHub { - sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc"; + sha256 = "16gyvvws93fyvx5qb2x9qhsg4bn710kgdh6q9sl2dwfsx6npkh9m"; rev = version; repo = "is_KeyFinder"; owner = "ibsh"; @@ -32,10 +32,14 @@ stdenv.mkDerivation { # TODO: upgrade libav when "Audio sample format conversion failed" is fixed buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ]; - configurePhase = '' + postPatch = '' substituteInPlace is_KeyFinder.pro \ --replace "keyfinder.0" "keyfinder" \ - --replace '$$[QT_INSTALL_PREFIX]' "$out" + --replace '$$[QT_INSTALL_PREFIX]' "$out" \ + --replace "-stdlib=libc++" "" + ''; + + configurePhase = '' qmake ''; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 88952f5eb761..aefa4f755b8e 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -26,16 +26,18 @@ stdenv.mkDerivation rec { install -Dpm755 -D diffpdf $out/bin/diffpdf install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1 - install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/pixmaps $out/share/applications + install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications install -Dpm644 CHANGES README help.html $out/share/doc/${name}/ install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/ - install -Dpm644 images/icon.png $out/share/pixmaps/${name}.png + install -Dpm644 images/icon.png $out/share/icons/diffpdf.png + install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png cat > $out/share/applications/diffpdf.desktop <<EOF [Desktop Entry] Type=Application Version=1.0 Name=diffpdf + Icon=diffpdf Comment=PDF diffing tool Exec=$out/bin/diffpdf Terminal=false diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix new file mode 100644 index 000000000000..85a1c72b349d --- /dev/null +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit, qt4, trousers }: + +stdenv.mkDerivation rec { + version = "0.8.1"; + name = "tpmmanager-${version}"; + + src = fetchgit { + url = "https://github.com/Sirrix-AG/TPMManager"; + rev = "9f989206635a6d2c1342576c90fa73eb239519cd"; + sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e"; + }; + + buildInputs = [ qt4 trousers ]; + + preBuild = '' + qmake -makefile PREFIX=\$out + ''; + + installPhase = '' + mkdir -p $out/bin + install -Dpm755 -D bin/tpmmanager $out/bin/tpmmanager + + mkdir -p $out/share/applications + cat > $out/share/applications/tpmmanager.desktop <<EOF + [Desktop Entry] + Type=Application + Version=1.0 + Name=tpmmanager + Comment=TPM manager + Exec=$out/bin/tpmmanager + Terminal=false + EOF + ''; + + meta = { + homepage = https://projects.sirrix.com/trac/tpmmanager; + description = "Tool for managing the TPM"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; +} diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1a3430b128fb..449886a5de4f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.13"; + version = "0.11.15"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "07045f4c24e546f4e8307acedeb5fe72b023db57bbf4d73b56d7fe2c75d694dc"; + sha256 = "8afd0a0999c7d7d285f361589330421c00012da86ce91623c5ad6b96d8fb9695"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3af4b6e84b6b..e77e848bed2c 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5, perl -, libiconv }: +{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }: stdenv.mkDerivation rec { name = "stellarium-0.13.3"; @@ -9,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij"; }; - buildInputs = [ cmake freetype libpng mesa gettext openssl qt5.base qt5.quick1 perl libiconv ]; + buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix new file mode 100644 index 000000000000..d99f569d7e6b --- /dev/null +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, iasl, flex, bison }: + +stdenv.mkDerivation rec { + name = "cbfstool-${version}"; + version = "git-2015-07-09"; + + src = fetchgit { + url = "http://review.coreboot.org/p/coreboot"; + rev = "5d866213f42fd22aed80abb5a91d74f6d485ac3f"; + sha256 = "148155829jbabsgg1inmcpqmwbg0fgp8a685bzybv9j4ibasi0z2"; + }; + + buildInputs = [ iasl flex bison ]; + + buildPhase = '' + export LEX=${flex}/bin/flex + make -C util/cbfstool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/cbfstool/cbfstool $out/bin + cp util/cbfstool/fmaptool $out/bin + cp util/cbfstool/rmodtool $out/bin + ''; + + meta = with stdenv.lib; { + description = "CBFS tool"; + homepage = http://www.coreboot.org; + license = licenses.gpl2; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix new file mode 100644 index 000000000000..cd43c06d33e2 --- /dev/null +++ b/pkgs/applications/window-managers/notion/default.nix @@ -0,0 +1,33 @@ +{ + enableXft ? true, libXft ? null, + patches ? [], + stdenv, fetchurl, + lua, gettext, groff, + pkgconfig, busybox, + x11, libXinerama, libXrandr, libX11 +}: + +assert enableXft -> libXft != null; + +stdenv.mkDerivation { + name = "notion"; + version = "3-2015061300"; + meta = with stdenv.lib; { + description = "Tiling tabbed window manager, follow-on to the ion window manager"; + homepage = http://notion.sourceforge.net; + platforms = platforms.linux; + license = licenses.notion_lgpl; + maintainers = [maintainers.jfb]; + }; + src = fetchurl { + url = https://github.com/raboof/notion/archive/3-2015061300.tar.gz; + sha256 = "3c9d9f35a9fb0d17c263b76fe28f7a1a4a05b7d6140545524cc1effd98c5c305"; + }; + + patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; + postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; + buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; + + buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; + installFlags = "PREFIX=\${out}"; +} diff --git a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff new file mode 100644 index 000000000000..542aa446c3f2 --- /dev/null +++ b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff @@ -0,0 +1,662 @@ +diff -ur notion-3-2015061300/de/brush.c notion-3-2015061300-PATCHED/de/brush.c +--- notion-3-2015061300/de/brush.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/brush.c 2015-07-13 10:37:23.093298917 -0400 +@@ -48,6 +48,9 @@ + + gr_stylespec_init(&brush->current_attr); + ++#ifdef XFT ++ brush->draw=NULL; ++#endif /* XFT */ + style->usecount++; + + if(!grbrush_init(&(brush->grbrush))){ +@@ -128,6 +131,10 @@ + { + destyle_unref(brush->d); + brush->d=NULL; ++#ifdef XFT ++ if(brush->draw!=NULL) ++ XftDrawDestroy(brush->draw); ++#endif /* XFT */ + gr_stylespec_unalloc(&brush->current_attr); + grbrush_deinit(&(brush->grbrush)); + } +@@ -139,6 +146,21 @@ + } + + ++#ifdef XFT ++XftDraw *debrush_get_draw(DEBrush *brush, Drawable d) ++{ ++ if(brush->draw==NULL) ++ brush->draw=XftDrawCreate(ioncore_g.dpy, d, ++ XftDEDefaultVisual(), ++ DefaultColormap(ioncore_g.dpy, ++ 0)); ++ else ++ XftDrawChange(brush->draw, d); ++ ++ return brush->draw; ++} ++#endif ++ + /*}}}*/ + + +diff -ur notion-3-2015061300/de/brush.h notion-3-2015061300-PATCHED/de/brush.h +--- notion-3-2015061300/de/brush.h 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/brush.h 2015-07-13 10:37:23.096298747 -0400 +@@ -15,6 +15,10 @@ + #include <ioncore/gr.h> + #include <ioncore/rectangle.h> + ++#ifdef XFT ++#include <X11/Xft/Xft.h> ++#endif /* XFT */ ++ + INTRCLASS(DEBrush); + + #include "style.h" +@@ -33,6 +37,9 @@ + DECLCLASS(DEBrush){ + GrBrush grbrush; + DEStyle *d; ++#ifdef XFT ++ XftDraw *draw; ++#endif + DEBrushExtrasFn *extras_fn; + int indicator_w; + Window win; +@@ -108,5 +115,8 @@ + extern void debrush_fill_area(DEBrush *brush, const WRectangle *geom); + extern void debrush_clear_area(DEBrush *brush, const WRectangle *geom); + ++#ifdef XFT ++XftDraw *debrush_get_draw(DEBrush *brush, Drawable d); ++#endif + + #endif /* ION_DE_BRUSH_H */ +diff -ur notion-3-2015061300/de/colour.c notion-3-2015061300-PATCHED/de/colour.c +--- notion-3-2015061300/de/colour.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/colour.c 2015-07-13 10:37:23.098298633 -0400 +@@ -12,9 +12,21 @@ + + bool de_alloc_colour(WRootWin *rootwin, DEColour *ret, const char *name) + { ++#ifndef XFT + XColor c; + bool ok=FALSE; ++#else /* XFT */ ++ if(name==NULL) ++ return FALSE; ++ return XftColorAllocName( ++ ioncore_g.dpy, ++ XftDEDefaultVisual(), ++ rootwin->default_cmap, ++ name, ++ ret); ++#endif /* XFT */ + ++#ifndef XFT + if(name==NULL) + return FALSE; + +@@ -25,11 +37,13 @@ + } + + return ok; ++#endif /* ! XFT */ + } + + + bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out) + { ++#ifndef XFT + XColor c; + c.pixel=in; + XQueryColor(ioncore_g.dpy, rootwin->default_cmap, &c); +@@ -38,11 +52,20 @@ + return TRUE; + } + return FALSE; ++#else /* XFT */ ++ return XftColorAllocName( ++ ioncore_g.dpy, ++ XftDEDefaultVisual(), ++ rootwin->default_cmap, ++ &(in.color), ++ out); ++#endif /* XFT */ + } + + + void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg) + { ++#ifndef XFT + DEColour pixels[5]; + + pixels[0]=cg->bg; +@@ -54,15 +77,26 @@ + XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 5, 0); + + gr_stylespec_unalloc(&cg->spec); ++#else /* XFT */ ++ de_free_colour(rootwin, cg->bg); ++ de_free_colour(rootwin, cg->fg); ++ de_free_colour(rootwin, cg->hl); ++ de_free_colour(rootwin, cg->sh); ++ de_free_colour(rootwin, cg->pad); ++#endif /* XFT */ + } + + + void de_free_colour(WRootWin *rootwin, DEColour col) + { ++#ifndef XFT + DEColour pixels[1]; + + pixels[0]=col; + + XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 1, 0); ++#else /* XFT */ ++ XftColorFree(ioncore_g.dpy, XftDEDefaultVisual(), rootwin->default_cmap, &col); ++#endif /* XFT */ + } + +diff -ur notion-3-2015061300/de/colour.h notion-3-2015061300-PATCHED/de/colour.h +--- notion-3-2015061300/de/colour.h 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/colour.h 2015-07-13 10:37:23.099298576 -0400 +@@ -12,12 +12,19 @@ + #include <ioncore/common.h> + #include <ioncore/global.h> + #include <ioncore/rootwin.h> ++#ifdef XFT ++#include <X11/Xft/Xft.h> ++#endif /* XFT */ + + + INTRSTRUCT(DEColourGroup); + + ++#ifndef XFT + typedef unsigned long DEColour; ++#else /* XFT */ ++typedef XftColor DEColour; ++#endif /* XFT */ + + + DECLSTRUCT(DEColourGroup){ +@@ -34,5 +41,6 @@ + bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out); + void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg); + void de_free_colour(WRootWin *rootwin, DEColour col); ++#define XftDEDefaultVisual() DefaultVisual(ioncore_g.dpy, 0) + + #endif /* ION_DE_COLOUR_H */ +diff -ur notion-3-2015061300/de/draw.c notion-3-2015061300-PATCHED/de/draw.c +--- notion-3-2015061300/de/draw.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/draw.c 2015-07-13 10:37:23.109298008 -0400 +@@ -20,6 +20,14 @@ + #include <X11/extensions/shape.h> + + ++#ifndef XFT ++#define PIXEL(x) x ++#else /* XFT */ ++#define PIXEL(x) x.pixel ++#endif /* XFT */ ++ ++ ++ + /*{{{ Colour group lookup */ + + +@@ -84,8 +92,7 @@ + w--; + h--; + +- XSetForeground(ioncore_g.dpy, gc, tlc); +- ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); + + a=(br!=0); + b=0; +@@ -104,7 +111,7 @@ + } + + +- XSetForeground(ioncore_g.dpy, gc, brc); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); + + a=(tl!=0); + b=0; +@@ -141,23 +148,23 @@ + GrBorderLine line) + { + if(line==GR_BORDERLINE_LEFT && geom->h>0 && tl>0){ +- XSetForeground(ioncore_g.dpy, gc, tlc); +- XSetBackground(ioncore_g.dpy, gc, tlc); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); ++ XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc)); + XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, tl, geom->h); + geom->x+=tl; + }else if(line==GR_BORDERLINE_TOP && geom->w>0 && tl>0){ +- XSetForeground(ioncore_g.dpy, gc, tlc); +- XSetBackground(ioncore_g.dpy, gc, tlc); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc)); ++ XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc)); + XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, geom->w, tl); + geom->y+=tl; + }else if(line==GR_BORDERLINE_RIGHT && geom->h>0 && br>0){ +- XSetForeground(ioncore_g.dpy, gc, brc); +- XSetBackground(ioncore_g.dpy, gc, brc); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); ++ XSetBackground(ioncore_g.dpy, gc, PIXEL(brc)); + XFillRectangle(ioncore_g.dpy, win, gc, geom->x+geom->w-br, geom->y, br, geom->h); + geom->w-=br; + }else if(line==GR_BORDERLINE_BOTTOM && geom->w>0 && br>0){ +- XSetForeground(ioncore_g.dpy, gc, brc); +- XSetBackground(ioncore_g.dpy, gc, brc); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(brc)); ++ XSetBackground(ioncore_g.dpy, gc, PIXEL(brc)); + XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y+geom->h-br, geom->w, br); + geom->h-=br; + } +@@ -388,7 +395,7 @@ + } + + if(ISSET(a2, GR_ATTR(tagged)) || ISSET(a1, GR_ATTR(tagged))){ +- XSetForeground(ioncore_g.dpy, d->copy_gc, cg->fg); ++ XSetForeground(ioncore_g.dpy, d->copy_gc, PIXEL(cg->fg)); + + copy_masked(brush, d->tag_pixmap, brush->win, 0, 0, + d->tag_pixmap_w, d->tag_pixmap_h, +@@ -437,7 +444,7 @@ + GC gc=brush->d->normal_gc; + + if(TRUE/*needfill*/){ +- XSetForeground(ioncore_g.dpy, gc, cg->bg); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg)); + XFillRectangle(ioncore_g.dpy, brush->win, gc, geom->x, geom->y, + geom->w, geom->h); + } +@@ -605,7 +612,7 @@ + attr.background_pixmap=ParentRelative; + }else{ + attrflags=CWBackPixel; +- attr.background_pixel=brush->d->cgrp.bg; ++ attr.background_pixel=brush->d->PIXEL(cgrp.bg); + } + + XChangeWindowAttributes(ioncore_g.dpy, brush->win, attrflags, &attr); +@@ -621,7 +628,7 @@ + if(cg==NULL) + return; + +- XSetForeground(ioncore_g.dpy, gc, cg->bg); ++ XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg)); + XFillRectangle(ioncore_g.dpy, brush->win, gc, + geom->x, geom->y, geom->w, geom->h); + } +diff -ur notion-3-2015061300/de/font.c notion-3-2015061300-PATCHED/de/font.c +--- notion-3-2015061300/de/font.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/font.c 2015-07-13 10:37:23.118297497 -0400 +@@ -13,7 +13,9 @@ + #include <ioncore/common.h> + #include <ioncore/log.h> + #include "font.h" ++#ifndef XFT + #include "fontset.h" ++#endif /* ! XFT */ + #include "brush.h" + #include "precompose.h" + +@@ -106,6 +108,9 @@ + + DEFont *de_load_font(const char *fontname) + { ++#ifdef XFT ++ XftFont *font; ++#endif + DEFont *fnt; + XFontSet fontset=NULL; + XFontStruct *fontstruct=NULL; +@@ -120,7 +125,8 @@ + return fnt; + } + } +- ++ ++#ifndef XFT + if(ioncore_g.use_mb && !(ioncore_g.enc_utf8 && iso10646_font(fontname))){ + LOG(DEBUG, FONT, "Loading fontset %s", fontname); + fontset=de_create_font_set(fontname); +@@ -149,13 +155,34 @@ + return NULL; + } + ++#else /* XFT */ ++ if(strncmp(fontname, "xft:", 4)==0){ ++ font=XftFontOpenName(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), ++ fontname+4); ++ }else{ ++ font=XftFontOpenXlfd(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), fontname); ++ } ++ ++ if(font==NULL){ ++ if(strcmp(fontname, CF_FALLBACK_FONT_NAME)!=0){ ++ warn(TR("Could not load font \"%s\", trying \"%s\""), ++ fontname, CF_FALLBACK_FONT_NAME); ++ return de_load_font(CF_FALLBACK_FONT_NAME); ++ } ++ return NULL; ++ } ++#endif /* XFT */ + fnt=ALLOC(DEFont); + + if(fnt==NULL) + return NULL; + ++#ifndef XFT + fnt->fontset=fontset; + fnt->fontstruct=fontstruct; ++#else ++ fnt->font=font; ++#endif + fnt->pattern=scopy(fontname); + fnt->next=NULL; + fnt->prev=NULL; +@@ -175,11 +202,13 @@ + style->font=font; + font->refcount++; + ++#ifndef XFT + if(style->font->fontstruct!=NULL){ + XSetFont(ioncore_g.dpy, style->normal_gc, + style->font->fontstruct->fid); + } + ++#endif /* ! XFT */ + return TRUE; + } + +@@ -194,11 +223,13 @@ + if(style->font==NULL) + return FALSE; + ++#ifndef XFT + if(style->font->fontstruct!=NULL){ + XSetFont(ioncore_g.dpy, style->normal_gc, + style->font->fontstruct->fid); + } + ++#endif /* ! XFT */ + return TRUE; + } + +@@ -208,10 +239,15 @@ + if(--font->refcount!=0) + return; + ++#ifndef XFT + if(font->fontset!=NULL) + XFreeFontSet(ioncore_g.dpy, font->fontset); + if(font->fontstruct!=NULL) + XFreeFont(ioncore_g.dpy, font->fontstruct); ++#else /* XFT */ ++ if(font->font!=NULL) ++ XftFontClose(ioncore_g.dpy, font->font); ++#endif /* XFT */ + if(font->pattern!=NULL) + free(font->pattern); + +@@ -239,6 +275,7 @@ + + void defont_get_font_extents(DEFont *font, GrFontExtents *fnte) + { ++#ifndef XFT + if(font->fontset!=NULL){ + XFontSetExtents *ext=XExtentsOfFontSet(font->fontset); + if(ext==NULL) +@@ -254,7 +291,14 @@ + fnte->baseline=fnt->ascent; + return; + } +- ++#else /* XFT */ ++ if(font->font!=NULL){ ++ fnte->max_height=font->font->ascent+font->font->descent; ++ fnte->max_width=font->font->max_advance_width; ++ fnte->baseline=font->font->ascent; ++ return; ++ } ++#endif /* XFT */ + fail: + DE_RESET_FONT_EXTENTS(fnte); + } +@@ -271,6 +315,7 @@ + + uint defont_get_text_width(DEFont *font, const char *text, uint len) + { ++#ifndef XFT + if(font->fontset!=NULL){ + XRectangle lext; + #ifdef CF_DE_USE_XUTF8 +@@ -298,6 +343,18 @@ + }else{ + return 0; + } ++#else /* XFT */ ++ if(font->font!=NULL){ ++ XGlyphInfo extents; ++ if(ioncore_g.enc_utf8) ++ XftTextExtentsUtf8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents); ++ else ++ XftTextExtents8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents); ++ return extents.xOff; ++ }else{ ++ return 0; ++ } ++#endif /* XFT */ + } + + +@@ -307,6 +364,7 @@ + /*{{{ String drawing */ + + ++#ifndef XFT + void debrush_do_draw_string_default(DEBrush *brush, int x, int y, + const char *str, int len, bool needfill, + DEColourGroup *colours) +@@ -366,6 +424,43 @@ + } + } + ++#else /* XFT */ ++void debrush_do_draw_string_default(DEBrush *brush, ++ int x, int y, const char *str, ++ int len, bool needfill, ++ DEColourGroup *colours) ++{ ++ Window win = brush->win; ++ GC gc=brush->d->normal_gc; ++ XftDraw *draw; ++ XftFont *font; ++ ++ if(brush->d->font==NULL) ++ return; ++ ++ font=brush->d->font->font; ++ draw=debrush_get_draw(brush, win); ++ ++ if(needfill){ ++ XGlyphInfo extents; ++ if(ioncore_g.enc_utf8){ ++ XftTextExtentsUtf8(ioncore_g.dpy, font, (XftChar8 *)str, len, ++ &extents); ++ }else{ ++ XftTextExtents8(ioncore_g.dpy, font, (XftChar8 *)str, len, &extents); ++ XftDrawRect(draw, &(colours->bg), x-extents.x, y-extents.y, ++ extents.width+10, extents.height); ++ } ++ } ++ ++ if(ioncore_g.enc_utf8){ ++ XftDrawStringUtf8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, ++ len); ++ }else{ ++ XftDrawString8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, len); ++ } ++} ++#endif /* XFT */ + + void debrush_do_draw_string(DEBrush *brush, int x, int y, + const char *str, int len, bool needfill, +diff -ur notion-3-2015061300/de/font.h notion-3-2015061300-PATCHED/de/font.h +--- notion-3-2015061300/de/font.h 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/font.h 2015-07-13 10:37:23.119297440 -0400 +@@ -12,6 +12,9 @@ + + #include <ioncore/common.h> + #include <ioncore/gr.h> ++#ifdef XFT ++#include <X11/Xft/Xft.h> ++#endif /* XFT */ + + INTRSTRUCT(DEFont); + +@@ -27,6 +30,9 @@ + int refcount; + XFontSet fontset; + XFontStruct *fontstruct; ++#ifdef XFT /* XFT */ ++ XftFont *font; ++#endif /* XFT */ + DEFont *next, *prev; + }; + +diff -ur notion-3-2015061300/de/init.c notion-3-2015061300-PATCHED/de/init.c +--- notion-3-2015061300/de/init.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/init.c 2015-07-13 10:37:23.122297270 -0400 +@@ -165,17 +165,26 @@ + { + bool bgset; + DEColour padinh; +- ++ DEColour black, white; ++ ++#ifdef XFT ++ de_alloc_colour(rootwin, &black, "black"); ++ de_alloc_colour(rootwin, &white, "white"); ++#else ++ black=DE_BLACK(rootwin); ++ white=DE_WHITE(rootwin); ++#endif ++ + de_get_colour(rootwin, &(cg->hl), tab, "highlight_colour", +- (based_on ? based_on->cgrp.hl : DE_WHITE(rootwin))); ++ (based_on ? based_on->cgrp.hl : white)); + de_get_colour(rootwin, &(cg->sh), tab, "shadow_colour", +- (based_on ? based_on->cgrp.sh : DE_WHITE(rootwin))); ++ (based_on ? based_on->cgrp.sh : white)); + de_get_colour(rootwin, &(cg->fg), tab, "foreground_colour", +- (based_on ? based_on->cgrp.fg : DE_WHITE(rootwin))); ++ (based_on ? based_on->cgrp.fg : white)); + bgset=de_get_colour(rootwin, &(cg->bg), tab, "background_colour", +- (based_on ? based_on->cgrp.bg : DE_BLACK(rootwin))); ++ (based_on ? based_on->cgrp.bg : black)); + +- padinh=(based_on ? based_on->cgrp.pad : DE_WHITE(rootwin)); ++ padinh=(based_on ? based_on->cgrp.pad : white); + + de_get_colour_(rootwin, &(cg->pad), tab, "padding_colour", + (bgset ? cg->bg : padinh), padinh); +diff -ur notion-3-2015061300/de/style.c notion-3-2015061300-PATCHED/de/style.c +--- notion-3-2015061300/de/style.c 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/style.c 2015-07-13 10:37:23.128296929 -0400 +@@ -70,10 +70,17 @@ + /*gcv.function=GXclear;*/ + gcv.stipple=stipple_pixmap; + gcvmask=GCFillStyle|GCStipple/*|GCFunction*/; ++#ifndef XFT + if(style->font!=NULL && style->font->fontstruct!=NULL){ + gcv.font=style->font->fontstruct->fid; + gcvmask|=GCFont; + } ++#else /* XFT */ ++// if(style->font!=NULL){ ++// gcv.font=style->font; ++// gcvmask|=GCFont; ++// } ++#endif /* XFT */ + + style->stipple_gc=XCreateGC(dpy, root, gcvmask, &gcv); + XCopyGC(dpy, style->normal_gc, +@@ -201,6 +208,14 @@ + + bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name) + { ++ DEColour black, white; ++#ifdef XFT ++ de_alloc_colour(rootwin, &black, "black"); ++ de_alloc_colour(rootwin, &white, "white"); ++#else ++ black=DE_BLACK(rootwin); ++ white=DE_WHITE(rootwin); ++#endif /* XFT */ + if(!gr_stylespec_load(&style->spec, name)) + return FALSE; + +@@ -223,11 +238,11 @@ + style->textalign=DEALIGN_CENTER; + + style->cgrp_alloced=FALSE; +- style->cgrp.bg=DE_BLACK(rootwin); +- style->cgrp.pad=DE_BLACK(rootwin); +- style->cgrp.fg=DE_WHITE(rootwin); +- style->cgrp.hl=DE_WHITE(rootwin); +- style->cgrp.sh=DE_WHITE(rootwin); ++ style->cgrp.bg=black; ++ style->cgrp.pad=black; ++ style->cgrp.fg=white; ++ style->cgrp.hl=white; ++ style->cgrp.sh=white; + gr_stylespec_init(&style->cgrp.spec); + + style->font=NULL; +diff -ur notion-3-2015061300/de/style.h notion-3-2015061300-PATCHED/de/style.h +--- notion-3-2015061300/de/style.h 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/de/style.h 2015-07-13 10:37:23.130296815 -0400 +@@ -80,6 +80,7 @@ + Pixmap tag_pixmap; + int tag_pixmap_w; + int tag_pixmap_h; ++ int xft_style; + + DEStyle *next, *prev; + }; +diff -ur notion-3-2015061300/system-autodetect.mk notion-3-2015061300-PATCHED/system-autodetect.mk +--- notion-3-2015061300/system-autodetect.mk 2015-06-13 10:37:26.000000000 -0400 ++++ notion-3-2015061300-PATCHED/system-autodetect.mk 2015-07-13 10:38:14.921332013 -0400 +@@ -103,6 +103,19 @@ + + + ## ++## Xft support ++## ++ ++USE_XFT=1 ++ ++ifeq ($(USE_XFT),1) ++EXTRA_INCLUDES += `pkg-config xft --cflags` ++EXTRA_LIBS += `pkg-config xft --libs` ++DEFINES += -DXFT -DCF_FALLBACK_FONT_NAME=\"Sans\" ++endif ++ ++ ++## + ## Localisation + ## + diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index 646b32435837..a1faf8060be9 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -42,7 +42,7 @@ infoFile: let src = dirOf infoFile; in { - inherit repo settings; + inherit repo settings info; build = stdenv.mkDerivation { name = "${info.project.artifactId}-${info.project.version}.jar"; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index d6ca570ba52c..54d4e06be282 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2c11fbfcee"; package-name = "numix-icon-theme"; - + name = "${package-name}-20150302"; - buildInputs = [ unzip ]; - - src = fetchurl { - url = "https://github.com/numixproject/${package-name}/archive/${version}.zip"; - sha256 = "61dc170b8a70b20a9075f06e1668d6bd8907a6db0ef9e3568c473296d0f351e1"; + src = fetchFromGitHub { + owner = "numixproject"; + repo = package-name; + rev = version; + sha256 = "1bjh2j4vqk9s31syv7ig3hwpp5z0n6sx74iz332y0wdz6ngj5x08"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ ''; - + meta = { description = "Numix icon theme"; homepage = https://numixproject.org; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix index 4a07dbee129b..ccc56cfdb31f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { preFixup = '' for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done ''; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 014ed0db7c2f..b92521a044aa 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "45"; + patchVersion = "51"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1y1zymydd1azv14r0hh12zjr8k64wa8wfdbz8sn1css84aqwl87d"; - sha256_x86_64 = "0v9ilahx03isxdzh4ryv1bqmmzppckickz22hvgzs785769cm67j"; + sha256_i686 = "0awzgs090n2cj6a5mlla0pgxk0y6aslhm6024pqrnxgai1fkmm1z"; + sha256_x86_64 = "1wggrcr2gjwkv5bawgcw86h6rhyzw0jphxm1sfwcvhjirh99056p"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 92417e5e6813..de0fdacb3f9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -265,4 +265,7 @@ self: super: { # Won't work with LLVM 3.5. llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + # Inexplicable haddock failure + # https://github.com/gregwebs/aeson-applicative/issues/2 + aeson-applicative = dontHaddock super.aeson-applicative; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a522133b721b..c62f9071c5fe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -233,27 +233,28 @@ self: { }) {}; "ADPfusion" = callPackage - ({ mkDerivation, base, bits, mmorph, monad-primitive, mtl - , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict - , template-haskell, test-framework, test-framework-quickcheck2 - , test-framework-th, transformers, tuple, vector + ({ mkDerivation, base, bits, containers, ghc-prim, mmorph + , monad-primitive, mtl, OrderedBits, primitive, PrimitiveArray + , QuickCheck, strict, template-haskell, test-framework + , test-framework-quickcheck2, test-framework-th, th-orphans + , transformers, tuple, vector }: mkDerivation { pname = "ADPfusion"; - version = "0.4.0.2"; - sha256 = "1wawzavw7sx7lwvgqa88a34rrazl54z44cwc5mznp2ynfivk5qlq"; + version = "0.4.1.0"; + sha256 = "1x75kb01080hkm00a26vsqy13qgmmsi7xjbcv180v14lh0dm7yjn"; isLibrary = true; isExecutable = true; buildDepends = [ - base bits mmorph monad-primitive mtl OrderedBits primitive - PrimitiveArray QuickCheck strict template-haskell transformers - tuple vector + base bits containers ghc-prim mmorph monad-primitive mtl + OrderedBits primitive PrimitiveArray QuickCheck strict + template-haskell th-orphans transformers tuple vector ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -742,6 +743,7 @@ self: { ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "Collection of alignment algorithms"; license = stdenv.lib.licenses.gpl3; @@ -1161,6 +1163,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "BenchmarkHistory" = callPackage + ({ mkDerivation, base, bytestring, cassava, deepseq, directory + , statistics, time, vector + }: + mkDerivation { + pname = "BenchmarkHistory"; + version = "0.0.0.1"; + sha256 = "07qdadcs76h7yd0k4hn3x3yqdiq7hp5lflxbxxlicx76k20fgl99"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring cassava deepseq directory statistics time vector + ]; + homepage = "https://github.com/choener/BenchmarkHistory"; + description = "Benchmark functions with history"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "BerkeleyDB" = callPackage ({ mkDerivation, base, bytestring, db, extensible-exceptions }: mkDerivation { @@ -1537,8 +1557,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.1"; - sha256 = "01k71scq4p7iw52m47f24xj21w0dsibhp4kyyl62g69h3iciyhm0"; + version = "0.8.1.1"; + sha256 = "02q0i2p892adpmi7p4hh8666qzrpi76bxwljf575hiaz018yixlb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1547,7 +1567,6 @@ self: { hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec process split strict temporary transformers ]; - jailbreak = true; homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; @@ -1560,15 +1579,14 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2"; - sha256 = "12idyzr560m921f4d83m3x2y2gcx9g8dvjbdh8rfjbsc7hqi60rb"; + version = "0.2.0.1"; + sha256 = "190wny2ggqahsiv5ar23pndf3ngparb5mrrjp7his5crp6xvk66m"; isLibrary = true; isExecutable = true; buildDepends = [ base BlogLiterately containers diagrams-builder diagrams-lib diagrams-rasterific directory filepath JuicyPixels pandoc safe ]; - jailbreak = true; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2308,6 +2326,7 @@ self: { array base colour data-default-class lens mtl old-locale operational time vector ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2325,6 +2344,7 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2346,6 +2366,7 @@ self: { diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -4015,8 +4036,8 @@ self: { }: mkDerivation { pname = "Ebnf2ps"; - version = "1.0.12"; - sha256 = "1rd0pxj2bfx06z1p0sy8kdhyfg1y51gn1bhr71j33czls6m9ry8c"; + version = "1.0.13"; + sha256 = "1ymfj2n23n1j37p5nw8xwhfccx4xc6wyf3372dr9gxv232jk8znz"; isLibrary = false; isExecutable = true; buildDepends = [ array base containers directory old-time unix ]; @@ -4904,6 +4925,7 @@ self: { template-haskell text transformers trifecta unordered-containers vector ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; @@ -8147,15 +8169,14 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.2.1"; - sha256 = "1lfmkyv5c11b0kglf2456ng0r0j78rfwzims8l0a65lff7bkahbv"; + version = "0.2.2"; + sha256 = "0b6jljwn8dq2szhz3k9axfphv3yi0zq7rhligvlwa5p8hr49wblx"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers directory filepath libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; - jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack"; license = stdenv.lib.licenses.bsd3; @@ -8884,13 +8905,16 @@ self: { mkDerivation { pname = "JSONb"; version = "1.0.8"; + revision = "1"; sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7"; + editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base bytestring bytestring-nums bytestring-trie containers utf8-string ]; + jailbreak = true; homepage = "http://github.com/solidsnack/JSONb/"; description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; @@ -10375,6 +10399,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MonadStack" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "MonadStack"; + version = "0.1.0.3"; + sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz"; + buildDepends = [ base mtl ]; + homepage = "https://github.com/bhurt/MonadStack"; + description = "Generalizing lift to monad stacks"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "Monadius" = callPackage ({ mkDerivation, array, base, directory, GLUT, OpenGL }: mkDerivation { @@ -11515,8 +11551,8 @@ self: { }: mkDerivation { pname = "OrderedBits"; - version = "0.0.0.1"; - sha256 = "1q272m1rjsgbp3w4jx36r84b3n29j1ggpqqxjyyhlkidm7w4h6lm"; + version = "0.0.0.2"; + sha256 = "10scfjvng05vsx4clvzkfq128vf1qwwvc0zikkzx4b96pjxf80i2"; buildDepends = [ base bits primitive QuickCheck vector vector-algorithms ]; @@ -11524,8 +11560,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; + homepage = "https://github.com/choener/OrderedBits"; description = "Efficient ordered (by popcount) enumeration of bits"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12043,8 +12078,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.6.0.0"; - sha256 = "13j9jqf09fj93slizb99wpn3d0c3zxj8ld5vl894dif7vw7hjmz9"; + version = "0.6.1.0"; + sha256 = "1annz4pkz66jxcwzgq3b897vigf8b23aprv0vx1xyly9bbccdpcn"; buildDepends = [ aeson base binary bits cereal deepseq OrderedBits primitive QuickCheck vector vector-binary-instances vector-th-unbox @@ -12053,8 +12088,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12370,8 +12404,8 @@ self: { }: mkDerivation { pname = "Quickson"; - version = "0.1.1"; - sha256 = "0v2h8446gb86z2yvhqrhbkyj8yj0s9d33gbig6752lfjn31zxrcy"; + version = "0.2"; + sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg"; buildDepends = [ aeson attoparsec base bytestring either text ]; homepage = "https://github.com/ssadler/quickson"; description = "Quick JSON extractions with Aeson"; @@ -14162,8 +14196,8 @@ self: { }: mkDerivation { pname = "StrappedTemplates"; - version = "0.2.0.0"; - sha256 = "0l2zdn3brrlsii9j14gfg7nfjvwswqgsnm7l4hcy51a6k0s3pnn7"; + version = "0.2.0.2"; + sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h"; buildDepends = [ base blaze-builder bytestring containers filemanip filepath mtl parsec text transformers @@ -15029,6 +15063,7 @@ self: { homepage = "https://github.com/yokto/Updater"; description = "Monadic FRP library based on stm"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "UrlDisp" = callPackage @@ -15185,8 +15220,8 @@ self: { ({ mkDerivation, base, hspec, parsec, process }: mkDerivation { pname = "ViennaRNAParser"; - version = "1.2.4"; - sha256 = "0gjn6sb7njd1mp211f3vk7ishc0fawl2npaq4np81pls7i24va8g"; + version = "1.2.5"; + sha256 = "0kc3b49g52dh0a4q8v5ir7pwa0x8s6rclmqjhkj95v1070ag4w0f"; buildDepends = [ base parsec process ]; testDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; @@ -16719,6 +16754,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-box" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-box"; + version = "0.0.0.0"; + sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base ]; + testDepends = [ base ]; + homepage = "http://github.com/drwebb/acme-box"; + description = "A full featured empty project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-cadre" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17113,6 +17163,7 @@ self: { homepage = "https://github.com/ion1/acme-zero-one"; description = "The absorbing element of package dependencies"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "action-permutations" = callPackage @@ -17216,8 +17267,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.2.2"; - sha256 = "032ch6gjg88zfiwid4f1f7rms86z4x7jfmq496cgr50ycx9gsjxf"; + version = "4.2.3"; + sha256 = "0w9nd8llzcjb91x1d3mh5482pavbx1jpn8w2ahm6ydjwvijjd9r5"; buildDepends = [ array base comonad containers data-reify erf free nats reflection transformers @@ -17501,8 +17552,8 @@ self: { }: mkDerivation { pname = "aeson-better-errors"; - version = "0.8.0"; - sha256 = "1synbykzdkrkdys9xl0y9yarbi7ya0ij62smambi9ndz474ngb95"; + version = "0.9.0"; + sha256 = "00b9mjf636pfgg50961y86qbkpix19x5pvbzlha0mr0icqqaan76"; buildDepends = [ aeson base bytestring dlist mtl scientific text transformers transformers-compat unordered-containers vector void @@ -18012,8 +18063,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.1.1"; - sha256 = "1sxrd9qip3vwq0sxbbm1f5fa5g41xj0raszzv2agag80qyph3ayj"; + version = "4.2"; + sha256 = "0pg1wqssqqdjd0cafimsy8ibmxfyjk16w10ibkj13a6ggzfn75j1"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -18060,8 +18111,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "4.0.3"; - sha256 = "1c5xzp0n67fg799cdf6aqc7sxbv3dy6nkiilyc5hlr8bg3r20bpd"; + version = "4.2"; + sha256 = "15aqq8mmjybi7kkrfsmablf7ymi328p9y6nsr8pc7sv144fadaf0"; buildDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -18311,8 +18362,8 @@ self: { ({ mkDerivation, base, uglymemo, vector }: mkDerivation { pname = "align"; - version = "0.1.1.0"; - sha256 = "02rgg0haaj9c4xlk351kz6l2lqa9mdrm9rjgxbh5hm43shriiffw"; + version = "0.1.1.1"; + sha256 = "1a9a7vmv4sh0aps3cbx2i02i1n9k62pzcahs7swflw0r1b4gzdzv"; buildDepends = [ base uglymemo vector ]; description = "Sequence alignment algorithms"; license = stdenv.lib.licenses.bsd3; @@ -18617,7 +18668,9 @@ self: { mkDerivation { pname = "alternative-io"; version = "0.0.1"; + revision = "1"; sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch"; + editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6"; buildDepends = [ base lifted-base monad-control transformers transformers-base ]; @@ -18685,6 +18738,7 @@ self: { homepage = "https://github.com/dbp/amazon-emailer-client-snap"; description = "Client library for amazon-emailer daemon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazon-products" = callPackage @@ -19418,6 +19472,7 @@ self: { homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anansi" = callPackage @@ -19518,6 +19573,7 @@ self: { homepage = "https://github.com/passy/android-lint-summary"; description = "A pretty printer for Android Lint errors"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "angel" = callPackage @@ -20159,6 +20215,7 @@ self: { homepage = "https://github.com/philopon/apiary"; description = "purescript compiler for apiary web framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apiary-session" = callPackage @@ -20964,8 +21021,8 @@ self: { }: mkDerivation { pname = "arx"; - version = "0.2.0"; - sha256 = "04af1a8b3njhv4gbn799p1dwryjdq3z54cws796iskm9628ds3yq"; + version = "0.2.1"; + sha256 = "0w29sdzhc54jjl7d0f3irq2s0kisd66amf0li0h9x7r00j72lvwx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21563,8 +21620,8 @@ self: { }: mkDerivation { pname = "atom-basic"; - version = "0.2.1"; - sha256 = "1i3qjjn15h6n642b8prahd99fb9la2j4f0ci110bs8jydmacs36m"; + version = "0.2.2"; + sha256 = "1n9illmrkrd1gr3imjvclzny8kjx7d0mak9yvyc129gfb9ap52cd"; buildDepends = [ base base64-bytestring bytestring network network-uri old-locale text time @@ -23203,8 +23260,8 @@ self: { }: mkDerivation { pname = "banwords"; - version = "0.2.0.0"; - sha256 = "18k39zgc5n9bxabv0wkiay9h3phx75mfr4kqpcp1hlpikn4h6wxx"; + version = "0.2.0.1"; + sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn"; buildDepends = [ attoparsec base bytestring data-default text vector ]; @@ -23212,7 +23269,6 @@ self: { attoparsec base HUnit test-framework test-framework-hunit text vector ]; - jailbreak = true; homepage = "https://github.com/fanjam/banwords"; description = "Generalized word blacklister"; license = stdenv.lib.licenses.mit; @@ -23567,17 +23623,19 @@ self: { }) {}; "base91" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, text }: + ({ mkDerivation, base, bytestring, mono-traversable, QuickCheck + , text + }: mkDerivation { pname = "base91"; - version = "0.2.0"; - sha256 = "10pa2gz9kwp0a4h7kzgnhbf2v897lpq5n5v927adlav9kqc1i41y"; + version = "2.1.0"; + sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn"; isLibrary = true; isExecutable = true; - buildDepends = [ base bytestring text ]; - testDepends = [ base bytestring QuickCheck text ]; + buildDepends = [ base bytestring mono-traversable text ]; + testDepends = [ base bytestring mono-traversable QuickCheck text ]; homepage = "https://github.com/ajg/base91"; - description = "A Base91 Encoder & Decoder"; + description = "A Generic Base91 Encoder & Decoder"; license = stdenv.lib.licenses.mit; }) {}; @@ -26285,6 +26343,7 @@ self: { homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blas" = callPackage @@ -27073,8 +27132,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "1.0.5"; - sha256 = "1vk2d8c0nvfk28a9l5d6vnxk48lha2xsp64bd7c1p3x8lygxj88f"; + version = "1.0.6"; + sha256 = "0i1q6pv7d7vy9agb6yzj0mi8hq8154wv17qhwkf4jd87k07xv76v"; buildDepends = [ base bifunctors binary bytes cereal comonad hashable hashable-extras prelude-extras profunctors transformers @@ -27459,19 +27518,20 @@ self: { "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, HUnit, mtl, tasty, tasty-hunit, tasty-quickcheck - , tasty-th, text, unordered-containers, vector + , deepseq, HUnit, mtl, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, unordered-containers, vector }: mkDerivation { pname = "buffer-builder"; - version = "0.2.2.2"; - sha256 = "1mqia6rjnz5as8qv780yhxn7iyw2bxh5fx2d83x7assr6vn2489w"; + version = "0.2.4.0"; + sha256 = "1krhzcd6jwfi2rclkzrvmlzr8mz1kcll481w890yi64vb65j5cn2"; buildDepends = [ base bytestring mtl text unordered-containers vector ]; testDepends = [ - aeson attoparsec base bytestring criterion deepseq HUnit tasty - tasty-hunit tasty-quickcheck tasty-th text vector + aeson attoparsec base bytestring criterion deepseq HUnit + quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th + text vector ]; homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; @@ -30402,8 +30462,8 @@ self: { }: mkDerivation { pname = "cef"; - version = "0.1.1"; - sha256 = "045sh0mfpwjpr3vc7bax89hv7aq29ak0xqhmyldj2p8allcfrv24"; + version = "0.1.2"; + sha256 = "0f5qj5xhmlys09i4vis3ricz0ym2hmdn53kgcb1qk23y0m4s94ci"; buildDepends = [ base bytestring text time ]; testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/picussecurity/haskell-cef.git"; @@ -30596,7 +30656,9 @@ self: { mkDerivation { pname = "cf"; version = "0.4.1"; + revision = "1"; sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx"; + editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692"; buildDepends = [ base ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -31820,8 +31882,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.5.9"; - sha256 = "0rrxql03bdkpna0i8giz1yyq7cr829gchnijlci243aldh8jwwkb"; + version = "0.5.10"; + sha256 = "02zv08mkx228fxx1hdraaqmiv1mfq6rgsr3gflh0awyf6x5g6jzn"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31847,8 +31909,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.8"; - sha256 = "1cb48q96sx2zr35brc6cywv76wj3vsk24yy5j64k16j1743gh45k"; + version = "0.5.9"; + sha256 = "1kh40vy5sqxpb2akzwyc7k7z251lg3h3a12qj2vq4vkgwx5xcqkh"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31934,8 +31996,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.7.1"; - sha256 = "1p1lmy07hfzj4wb7f68y03zvih2i8skb2sca9pqj64d6yszqmll8"; + version = "0.5.8"; + sha256 = "08qplvnal8jjqy8rkivgn53n8qpzk232dslqxypx6ky6fks3bc0w"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -32088,6 +32150,7 @@ self: { ]; buildTools = [ hsx2hs ]; extraLibraries = [ openssl ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -38112,7 +38175,7 @@ self: { ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline - , html, HTTP, HUnit, mmap, mtl, network, old-locale, old-time + , html, HTTP, HUnit, mmap, mtl, network, network-uri, old-time , parsec, process, QuickCheck, random, regex-applicative , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time @@ -38121,14 +38184,14 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.10.0"; - sha256 = "0dkby6bqv8dnv6zbvhz9yrablqkzi2szfsmrhmjk1934gczxpcsj"; + version = "2.10.1"; + sha256 = "157faxxzziaj79ln1qqvrii1vnafyknfbnmgl4y5krw06ys6bvzi"; isLibrary = true; isExecutable = true; buildDepends = [ array attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist dataenc directory filepath - hashable haskeline html HTTP mmap mtl network old-locale old-time + hashable haskeline html HTTP mmap mtl network network-uri old-time parsec process random regex-applicative regex-compat-tdfa tar terminfo text time transformers transformers-compat unix unix-compat utf8-string vector zip-archive zlib @@ -38142,7 +38205,6 @@ self: { ]; extraLibraries = [ curl ]; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; - jailbreak = true; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs @@ -38967,6 +39029,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-flagset" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-flagset"; + version = "1.0.0.0"; + sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2"; + buildDepends = [ base ]; + description = "An efficient data type for sets of flags"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-fresh" = callPackage ({ mkDerivation, base, free, transformers }: mkDerivation { @@ -41385,6 +41458,7 @@ self: { optparse-applicative pango split statestack transformers unix vector ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41404,9 +41478,11 @@ self: { diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-contrib" = callPackage @@ -41478,8 +41554,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.3.0.4"; - sha256 = "19dv368clrpjv2s0wd2ha61v80hlx4bkmy7qr9bgasaj3xxx3yqn"; + version = "0.3.0.5"; + sha256 = "00118bnxkgfg4s4h825bl9v1mdb8cfv27l6licmx8z0dch3all9k"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -41505,15 +41581,12 @@ self: { }: mkDerivation { pname = "diagrams-hsqml"; - version = "0.0.0.2"; - revision = "1"; - sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng"; - editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490"; + version = "0.1.0.0"; + sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax"; buildDepends = [ base colour containers diagrams-core diagrams-lib hsqml lens text transformers ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; @@ -41534,6 +41607,7 @@ self: { diagrams-lib lens mtl NumInstances optparse-applicative split statestack static-canvas text ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41594,8 +41668,8 @@ self: { }: mkDerivation { pname = "diagrams-pgf"; - version = "0.1.0.1"; - sha256 = "0q19qb1cxgkhg9z24kxgy80swbfc1bnrkzmv40kz997rlfz7qaiz"; + version = "0.1.0.2"; + sha256 = "1lwwr143nlvpxpkdvsbq4z4bs7qhbx636p6hi6w448xmbniq90rj"; buildDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -41621,6 +41695,7 @@ self: { filepath hashable lens monoid-extras mtl semigroups split statestack ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41656,6 +41731,7 @@ self: { diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl optparse-applicative Rasterific split unix ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -41689,18 +41765,20 @@ self: { ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl - , old-time, optparse-applicative, process, split, text, time + , old-time, optparse-applicative, process, semigroups, split, text + , time }: mkDerivation { pname = "diagrams-svg"; - version = "1.3.1.2"; - sha256 = "1kz70v0nccswd4df3240gy6liln4hi165zn8rm6f3palkxcfw3m3"; + version = "1.3.1.3"; + sha256 = "0migb5vjlslbxlmbqxl0qdrpsi0ghbiq86rjna57g804r149n7ni"; buildDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg - monoid-extras mtl old-time optparse-applicative process split text - time + monoid-extras mtl old-time optparse-applicative process semigroups + split text time ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41988,6 +42066,7 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; + jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -42375,18 +42454,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_2_1" = callPackage - ({ mkDerivation, base, filepath, python, time, unix, which }: + "directory_1_2_3_0" = callPackage + ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.2.1"; - sha256 = "0ikhkmgzmpxvgl9w1piv168sbwkrvn0l2xdx9zb4sw75ci1ymb1y"; + version = "1.2.3.0"; + sha256 = "1511nw0hgy6sg82xfimg8rbbf43vcqn6gw076m96b9zcy1dzijln"; buildDepends = [ base filepath time unix ]; - testDepends = [ base python which ]; + testDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) { python = null; which = null;}; + }) {}; "directory-layout" = callPackage ({ mkDerivation, base, bytestring, command-qq, containers @@ -43320,18 +43398,23 @@ self: { "docker" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , lens, network-uri, pipes, pipes-bytestring, pipes-http - , pipes-text, text, wreq + , http-types, lens, lens-aeson, network-uri, pipes + , pipes-bytestring, pipes-http, pipes-text, process, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, text, wreq }: mkDerivation { pname = "docker"; - version = "0.1.0.1"; - sha256 = "0jp7jsacxxzfbz0sdmzwwl9nj8xyfg889zxsw4mg87jxasmll3g2"; + version = "0.2.0.2"; + sha256 = "0iv36j8ixjbxlwbpw426lj5z39kwd3mrpb5qqw7c2nxkfp2dr0gi"; buildDepends = [ - aeson base bytestring containers data-default lens network-uri - pipes pipes-bytestring pipes-http pipes-text text wreq + aeson base bytestring containers data-default lens lens-aeson + network-uri pipes pipes-bytestring pipes-http pipes-text text wreq + ]; + testDepends = [ + aeson base bytestring containers data-default http-types lens + lens-aeson pipes pipes-bytestring pipes-http pipes-text process + QuickCheck tasty tasty-hunit tasty-quickcheck text wreq ]; - jailbreak = true; homepage = "https://github.com/denibertovic/docker-hs"; description = "Haskell wrapper for Docker Remote API"; license = stdenv.lib.licenses.bsd3; @@ -43341,27 +43424,28 @@ self: { "dockercook" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , conduit, conduit-combinators, conduit-extra, cryptohash - , directory, filepath, hashable, hslogger, HTF, monad-logger, mtl - , optparse-applicative, persistent-sqlite, persistent-template + , directory, filepath, hashable, hslogger, HTF, lens, monad-logger + , mtl, optparse-applicative, persistent-sqlite, persistent-template , process, regex-compat, resourcet, retry, stm, streaming-commons , system-filepath, temporary, text, time, transformers, unix - , unordered-containers, vector + , unordered-containers, vector, wreq }: mkDerivation { pname = "dockercook"; - version = "0.4.0.0"; - sha256 = "1v74zcbk53daxlqgr5b8d900dvyj8kizmz7cwka18a2rz8zi0vbw"; + version = "0.4.3.0"; + sha256 = "0gsaw0qbbd3a017w82hwvmrv0ygxki2c8ls3b6hfc38a17ja68vc"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base base16-bytestring bytestring conduit conduit-combinators conduit-extra cryptohash directory filepath - hashable hslogger monad-logger mtl optparse-applicative + hashable hslogger lens monad-logger mtl optparse-applicative persistent-sqlite persistent-template process regex-compat resourcet retry stm streaming-commons system-filepath temporary - text time transformers unix unordered-containers vector + text time transformers unix unordered-containers vector wreq ]; testDepends = [ base HTF text vector ]; + jailbreak = true; homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; @@ -43404,8 +43488,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.10.0"; - sha256 = "161k9brapz6hbwl3naar07kpfsgqp4b52i5nfsbxsqa2a9al40kb"; + version = "0.10.1"; + sha256 = "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -43761,6 +43845,7 @@ self: { aeson base bytestring data-default-class http-client http-types reflection scientific text transformers ]; + jailbreak = true; homepage = "https://github.com/philopon/dozens-hs"; description = "dozens api library"; license = stdenv.lib.licenses.mit; @@ -44994,15 +45079,19 @@ self: { }) {}; "edit-distance" = callPackage - ({ mkDerivation, array, base, containers, random }: + ({ mkDerivation, array, base, containers, QuickCheck, random + , test-framework, test-framework-quickcheck2 + }: mkDerivation { pname = "edit-distance"; - version = "0.2.1.3"; - sha256 = "1insr7a1yazilqrx5f3pnkcr1fsvn4iaisw18rhayc0bnndfbcm0"; - isLibrary = true; - isExecutable = true; + version = "0.2.2.1"; + sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y"; buildDepends = [ array base containers random ]; - homepage = "http://github.com/batterseapower/edit-distance"; + testDepends = [ + array base containers QuickCheck random test-framework + test-framework-quickcheck2 + ]; + homepage = "http://github.com/phadej/edit-distance"; description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45189,10 +45278,9 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "effin"; - version = "0.2.1.3"; - sha256 = "0iv3va8lhfikk9mssg6sx2yzvdq6yh53gnv53gl9dwll8pnj8fhh"; + version = "0.3.0.1"; + sha256 = "0rckxjdkw5p4yy1kizj1z8kp7sxfxxhh9s7714jsn9in7lc4lsif"; buildDepends = [ base mtl ]; - jailbreak = true; homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; license = stdenv.lib.licenses.bsd3; @@ -45857,8 +45945,8 @@ self: { }: mkDerivation { pname = "elocrypt"; - version = "0.4.0"; - sha256 = "0n19364jzifnb08pxzlsb05hpqz327zsfz138g0py3zy38wibszx"; + version = "0.4.1"; + sha256 = "1hssxqhm962hr41mvjnrs4h74121nmvlbww0g9nyk10mx71rcbcg"; isLibrary = true; isExecutable = true; buildDepends = [ base MonadRandom random ]; @@ -46839,7 +46927,9 @@ self: { mkDerivation { pname = "ersatz"; version = "0.3"; + revision = "3"; sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr"; + editedCabalFile = "aafa6482bcf20d998dfc122b780b0378ec05187235252f4715e98bac02fc5b6c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -46847,6 +46937,7 @@ self: { process temporary transformers unordered-containers ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -47033,15 +47124,17 @@ self: { }) {}; "ether" = callPackage - ({ mkDerivation, base, mtl, newtype-generics, QuickCheck, tasty - , tasty-quickcheck, template-haskell, transformers + ({ mkDerivation, base, mmorph, monad-control, mtl, newtype-generics + , QuickCheck, tasty, tasty-quickcheck, template-haskell + , transformers, transformers-base, transformers-lift }: mkDerivation { pname = "ether"; - version = "0.2.1.0"; - sha256 = "1iwi3whaxnpwfdghw1rli9dxqh1c28hhxkdvl4wslj0vc014h3di"; + version = "0.3.0.0"; + sha256 = "1k8g01ypck0w6sp6f3w3asdakzjg6k8m1sz58c2r5iz3z1v9b04m"; buildDepends = [ - base mtl newtype-generics template-haskell transformers + base mmorph monad-control mtl newtype-generics template-haskell + transformers transformers-base transformers-lift ]; testDepends = [ base mtl QuickCheck tasty tasty-quickcheck transformers @@ -47176,6 +47269,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "event" = callPackage + ({ mkDerivation, base, containers, semigroups, transformers }: + mkDerivation { + pname = "event"; + version = "0.1.1"; + sha256 = "191d72dbaddxl2ql2860145iwfsrx2jrbcsylfq7028vmzzxqqm6"; + buildDepends = [ base containers semigroups transformers ]; + description = "Monoidal, monadic and first-class events"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "event-driven" = callPackage ({ mkDerivation, base, monads-tf, yjtools }: mkDerivation { @@ -48166,7 +48270,9 @@ self: { mkDerivation { pname = "fast-logger"; version = "2.4.0"; + revision = "3"; sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc"; + editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b"; buildDepends = [ array auto-update base bytestring bytestring-builder directory filepath text @@ -48214,8 +48320,8 @@ self: { ({ mkDerivation, base, bytestring, tagsoup, text, text-icu }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.6"; - sha256 = "0d1h57flg9iq4psfpwcqq91giljqcjz9lhd7nhdrk08pzdla09iq"; + version = "1.0.7"; + sha256 = "089karddj08z0lfr83r2x070j67i2s0aq2s1qi5i66vw335y91d8"; buildDepends = [ base bytestring tagsoup text text-icu ]; homepage = "https://github.com/vshabanov/fast-tagsoup"; description = "Fast parser for tagsoup package"; @@ -48942,16 +49048,18 @@ self: { }) {}; "ffmpeg-light" = callPackage - ({ mkDerivation, base, ffmpeg, JuicyPixels, libavcodec, libavformat - , libswscale, mtl, transformers, vector + ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels + , libavcodec, libavformat, libswscale, mtl, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; - version = "0.8.1"; - sha256 = "08hydkqpk72s5bnc7h133jdz0x5msbxf7r1149hb2pqaqffid569"; + version = "0.8.2"; + sha256 = "13pkdsjsw1h6gscpp2jwly1w81jj3rpb27ssa0w7gi2qhjcg1inw"; isLibrary = true; isExecutable = true; - buildDepends = [ base JuicyPixels mtl transformers vector ]; + buildDepends = [ + base either exceptions JuicyPixels mtl transformers vector + ]; pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ]; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; @@ -49027,6 +49135,7 @@ self: { testDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-extras-decompositions" = callPackage @@ -49428,26 +49537,26 @@ self: { ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath , hspec, mmorph, monad-control, mtl, regex-posix, semigroups - , streaming-commons, system-filepath, text, time, transformers - , transformers-base, unix, unix-compat + , streaming-commons, text, time, transformers, transformers-base + , unix, unix-compat }: mkDerivation { pname = "find-conduit"; - version = "0.4.3"; - sha256 = "05s1whyqmv1nxcbrrfhfn8lcqb2cwyz1wa2im8b976i14qgw65lm"; + version = "0.4.4"; + sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base conduit conduit-combinators conduit-extra either exceptions filepath mmorph monad-control mtl regex-posix semigroups - streaming-commons system-filepath text time transformers - transformers-base unix unix-compat + streaming-commons text time transformers transformers-base unix + unix-compat ]; testDepends = [ attoparsec base conduit conduit-combinators directory doctest either exceptions filepath hspec mmorph monad-control mtl - regex-posix semigroups streaming-commons system-filepath text time - transformers transformers-base unix-compat + regex-posix semigroups streaming-commons text time transformers + transformers-base unix-compat ]; description = "A file-finding conduit that allows user control over traversals"; license = stdenv.lib.licenses.mit; @@ -50472,8 +50581,8 @@ self: { }: mkDerivation { pname = "folds"; - version = "0.6.2"; - sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa"; + version = "0.6.3"; + sha256 = "1p8vr71vqzn0h4j5rz3wh7fsvsaaig52ds7sx8r2c8klbdf91zd4"; buildDepends = [ base comonad contravariant lens pointed profunctors reflection semigroupoids tagged transformers vector @@ -50482,7 +50591,6 @@ self: { base bytestring deepseq directory doctest filepath mtl semigroups ]; configureFlags = [ "-f-test-hlint" ]; - jailbreak = true; homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; @@ -50774,10 +50882,8 @@ self: { }: mkDerivation { pname = "formatting"; - version = "6.2.0"; - revision = "1"; - sha256 = "13w2322djffajqdy48lwfngcrbh5pc9ivhy1w5zgxcjqc0amlv5v"; - editedCabalFile = "299d43483dfe38a5e95061fb943cb63fa252d7fd38212c42e9bb022f49407a89"; + version = "6.2.2"; + sha256 = "04ilp8zkzkab3x4v5kczpa58k5jr67yg9fq4prj7xrj81kixgp2g"; buildDepends = [ base clock old-locale scientific text text-format time ]; @@ -51144,6 +51250,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "free-http" = callPackage + ({ mkDerivation, base, bytestring, free, http-client, http-types + , mtl, QuickCheck, text, time, transformers + }: + mkDerivation { + pname = "free-http"; + version = "0.1.1.1"; + sha256 = "1gifjrz7bmrcyv6pc6gl55vw0vmnzjzjhvslwvj8p8c8xbv2fxrh"; + buildDepends = [ + base bytestring free http-client http-types mtl QuickCheck text + time transformers + ]; + homepage = "https://github.com/aaronlevin/free-http"; + description = "An HTTP Client based on Free Monads"; + license = stdenv.lib.licenses.mit; + }) {}; + "free-operational" = callPackage ({ mkDerivation, base, comonad-transformers, free, kan-extensions , mtl, transformers @@ -51442,6 +51565,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "frpnow" = callPackage + ({ mkDerivation, base, containers, mtl, transformers }: + mkDerivation { + pname = "frpnow"; + version = "0.11"; + sha256 = "0lvlgn1bv9flhs9x3i5zf1zd6l7nd4i3asscc0nmqmpnidcmlkcn"; + buildDepends = [ base containers mtl transformers ]; + homepage = "https://github.com/atzeus/FRPNow"; + description = "Principled practical FRP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "frpnow-gloss" = callPackage + ({ mkDerivation, base, containers, frpnow, gloss, mtl, transformers + }: + mkDerivation { + pname = "frpnow-gloss"; + version = "0.12"; + sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i"; + buildDepends = [ base containers frpnow gloss mtl transformers ]; + homepage = "https://github.com/atzeus/FRPNow"; + description = "Program awesome stuff with Gloss and frpnow!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "frpnow-gtk" = callPackage + ({ mkDerivation, base, containers, frpnow, glib, gtk, mtl + , transformers + }: + mkDerivation { + pname = "frpnow-gtk"; + version = "0.11"; + sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c"; + buildDepends = [ + base containers frpnow glib gtk mtl transformers + ]; + homepage = "https://github.com/atzeus/FRPNow"; + description = "Program GUIs with GTK and frpnow!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frquotes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -52086,6 +52250,7 @@ self: { homepage = "http://github.com/marcusbuffett/game-of-life"; description = "Conway's Game of Life"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-probability" = callPackage @@ -52419,6 +52584,7 @@ self: { extraLibraries = [ genders ]; description = "Bindings to libgenders"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) { genders = null;}; "general-prelude" = callPackage @@ -52483,7 +52649,9 @@ self: { mkDerivation { pname = "generic-aeson"; version = "0.2.0.7"; + revision = "1"; sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz"; + editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -52950,6 +53118,7 @@ self: { base bytestring directory doctest filepath hlint QuickCheck template-haskell ]; + jailbreak = true; homepage = "https://github.com/domdere/hs-geojson"; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; @@ -53960,8 +54129,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150617"; - sha256 = "0m4dbzjmjyjpxbplykil1k64mj2lq5xf2yz7dy406248cscc8drd"; + version = "5.20150710"; + sha256 = "0q7q8ikgv3dhvs3vad04z1bfa6l92v97jrh0n4zqc0c44wx9a3wp"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -56640,8 +56809,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.13.8.1"; - sha256 = "1p1s67swsiq8kr1l07zpghmyzww882kgzz38z41ykwzwj471zqjp"; + version = "0.13.9"; + sha256 = "1mdz3s03y69713cr3grn8gawimykk8rs1f9vgch8a8q04ivhkq0j"; buildDepends = [ array base bytestring cairo containers gio glib mtl pango text ]; @@ -56933,8 +57102,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.13.8"; - sha256 = "18z1drng10l3z2arn2lrwsdaxx8q9yrdvdhzixya1vhs8za3m4pk"; + version = "0.13.9"; + sha256 = "1zmcvp295sknc2h529nprclw11lnwp79dniyyg573wc99bdzijvr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -58762,8 +58931,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.7.1.0"; - sha256 = "11lv7p8c4vka2rf47f1fhyvfax7rjb1i1i12mlrikj16vvsrixh2"; + version = "4.7.2.0"; + sha256 = "0krj7kaikdbxiqkcd5c3pyhp3zchgy74dzx336f8x1ywlja4802r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -58782,12 +58951,25 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; }) {}; + "hakyll-R" = callPackage + ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process + }: + mkDerivation { + pname = "hakyll-R"; + version = "0.1.0.3"; + sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3"; + buildDepends = [ base directory filepath hakyll pandoc process ]; + jailbreak = true; + description = "A package allowing to write Hakyll blog posts in Rmd"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hakyll-agda" = callPackage ({ mkDerivation, Agda, base, containers, directory, filepath , hakyll, mtl, pandoc, transformers, xhtml @@ -62812,8 +62994,8 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11"; - sha256 = "0gydwh9q76wk2qimy9i1ba6ii6a977nih534iz6rgqfhrkcck8mz"; + version = "3000.11.1"; + sha256 = "07rz03n0v9nflzid0vx5qh5hc7fmlq9c9kkk35slljv7lwmxw0qh"; buildDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -63191,8 +63373,8 @@ self: { }: mkDerivation { pname = "hcltest"; - version = "0.3.6"; - sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd"; + version = "0.3.7"; + sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd"; buildDepends = [ base bytestring directory dlist either filepath free lens mmorph monad-control mtl optparse-applicative process random-shuffle split @@ -63847,20 +64029,18 @@ self: { "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, containers, directory, directory-tree, dlist, errors + , bytestring, containers, directory, directory-tree, dlist, either , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl , process, random, text, time, transformers, unordered-containers , vector, xmlhtml }: mkDerivation { pname = "heist"; - version = "0.14.1"; - revision = "4"; - sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; - editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876"; + version = "0.14.1.1"; + sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring - containers directory directory-tree dlist errors filepath hashable + containers directory directory-tree dlist either filepath hashable map-syntax MonadCatchIO-transformers mtl process random text time transformers unordered-containers vector xmlhtml ]; @@ -65246,8 +65426,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.2.1.0"; - sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p"; + version = "0.3.0.0"; + sha256 = "0lghf21l3s4fmwnp3dsndzxqhamgppczzydkvnqlmx1x9jk5g1b6"; buildDepends = [ base bytestring cereal data-default leveldb-haskell lifted-base monad-control mtl resourcet transformers transformers-base @@ -65256,7 +65436,6 @@ self: { base bytestring cereal hspec leveldb-haskell lifted-base monad-control mtl process resourcet transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; @@ -66057,14 +66236,13 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.2.0.2"; - sha256 = "1jf5cd77m1jvdlsblx9c3l5z9gdnkw0lii0z3zpzpcr275sxff0h"; + version = "0.2.0.3"; + sha256 = "13n0fzhd2fmy7k5iafmg3cxd2lmpsfvvbg1a0q793wz5f3glw0l3"; buildDepends = [ aeson base text unordered-containers vector ]; testDepends = [ aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; @@ -66079,8 +66257,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.6.0.0"; - sha256 = "01v2nb77bp94jx9va757b2iimvvi9p73aqw7izyrqp1li4gd6yq2"; + version = "0.6.0.1"; + sha256 = "1m7fg179khkmyhnhqa32gbaf2dgg27i4n36fafqm60pyc5kzhz69"; buildDepends = [ aeson base bytestring file-embed hashable hjsonpointer http-client http-types regexpr scientific text unordered-containers vector @@ -66161,29 +66339,27 @@ self: { ({ mkDerivation, base, base-compat, cmdargs, containers, csv , directory, filepath, haskeline, hledger-lib, HUnit, mtl , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , regexpr, safe, shakespeare, shakespeare-text, split, tabular - , terminfo, test-framework, test-framework-hunit, text, time - , transformers, utf8-string, wizards + , safe, shakespeare, split, tabular, terminfo, test-framework + , test-framework-hunit, text, time, transformers + , unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "0.25.1"; - sha256 = "1z3qpa8p6z7lil67ikimfzvlppsaz3yn58ljc5mkqv3cz6rss9q3"; + version = "0.26"; + sha256 = "1gixj6i99rqbn6ziwpni2scgv9sdd3yvxj6d3i1ivirmsx2rd3bm"; isLibrary = true; isExecutable = true; buildDepends = [ base base-compat cmdargs containers csv directory filepath haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa regexpr safe shakespeare - shakespeare-text split tabular terminfo text time utf8-string - wizards + pretty-show process regex-tdfa safe shakespeare split tabular + terminfo text time unordered-containers utf8-string wizards ]; testDepends = [ base base-compat cmdargs containers csv directory filepath haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa regexpr safe shakespeare - shakespeare-text split tabular test-framework test-framework-hunit - text time transformers wizards + pretty-show process regex-tdfa safe shakespeare split tabular + test-framework test-framework-hunit text time transformers wizards ]; homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; @@ -66220,6 +66396,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base hledger-lib time ]; + jailbreak = true; homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; @@ -66245,8 +66422,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.6"; - sha256 = "1w8f69ssr7g50w4mikfakznrw7y0lqcjr78ad5bwz37ppi4fhdvj"; + version = "0.1.1.7"; + sha256 = "1gi7v5xsx1hv4lljlx19v4rwvnh7raglxzh4mgyiwlnwqybc2cr4"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; @@ -66257,25 +66434,24 @@ self: { "hledger-lib" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, Decimal, directory, filepath, HUnit - , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , regexpr, safe, split, test-framework, test-framework-hunit, time - , transformers, utf8-string + , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe + , split, test-framework, test-framework-hunit, time, transformers + , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "0.25.1"; - sha256 = "1p8khkpwiqxhm9ycg4vcgqsggrxzlp55b34ckhsdrfzjdphxq60i"; + version = "0.26"; + sha256 = "0cm5d65kfxha6280q9iibrj4a0p5g6srfl28x1f8vay41xjg80nh"; buildDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec - pretty-show regex-tdfa regexpr safe split time transformers - utf8-string + pretty-show regex-tdfa safe split time transformers utf8-string ]; testDepends = [ array base base-compat blaze-markup cmdargs containers csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec pretty-show - regex-tdfa regexpr safe split test-framework test-framework-hunit - time transformers + regex-tdfa safe split test-framework test-framework-hunit time + transformers ]; homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; @@ -66306,24 +66482,24 @@ self: { ({ mkDerivation, base, base-compat, blaze-html, blaze-markup , bytestring, clientsession, cmdargs, conduit-extra, data-default , directory, filepath, hjsmin, hledger, hledger-lib, hspec - , http-client, http-conduit, HUnit, json, network-conduit, parsec - , regexpr, safe, shakespeare, template-haskell, text, time - , transformers, wai, wai-extra, wai-handler-launch, warp, yaml - , yesod, yesod-core, yesod-form, yesod-static, yesod-test + , http-client, http-conduit, HUnit, json, parsec, safe, shakespeare + , template-haskell, text, time, transformers, wai, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "0.25.1"; - sha256 = "07al1vlrh5v71zzghn5q5krdygqa63icbg33n0hlvc42mghc6rsk"; + version = "0.26"; + sha256 = "019r4jy0kss62ya883rgzkc6lkp14f0dfkdfiahpl4587fcvpxsi"; isLibrary = true; isExecutable = true; buildDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json - network-conduit parsec regexpr safe shakespeare template-haskell - text time transformers wai wai-extra wai-handler-launch warp yaml - yesod yesod-core yesod-form yesod-static + hledger hledger-lib http-client http-conduit HUnit json parsec safe + shakespeare template-haskell text time transformers wai wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static ]; testDepends = [ base base-compat hspec yesod yesod-test ]; homepage = "http://hledger.org"; @@ -66392,13 +66568,13 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.3.0"; - sha256 = "10mrvpiwmcaijckrcg45zw2zb17fgx43rm4qfi32glvgkakd2zqf"; + version = "0.1.4.0"; + sha256 = "062qsg5mr0qsa5ah1d0xx7njkpn4j4g6x4sv3skgvgc9855gywr6"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; homepage = "https://github.com/jakubfijalkowski/hlibsass"; - description = "Low-level bindings to libsass"; + description = "Low-level bindings to Libsass"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) { sass = null;}; @@ -66601,8 +66777,8 @@ self: { ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.4"; - sha256 = "08rrvn833psl0fic1zvhgv2ymgj16cdrfwv003fiapphnqxcpj9a"; + version = "0.4.1"; + sha256 = "113gi92xdck75zrllpncrnm72fj8wd2wcbf237jflkpbqcmzf8zq"; buildDepends = [ base binary hmatrix storable-complex ]; pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; @@ -66852,14 +67028,14 @@ self: { }: mkDerivation { pname = "hmm-hmatrix"; - version = "0.0"; - sha256 = "0gcjasj6115gwjh2m680wrg3fmm8zchk6isb2wmlyfvib27963jm"; + version = "0.0.1"; + sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h"; buildDepends = [ array base containers explicit-exception hmatrix lazy-csv non-empty random semigroups transformers utility-ht ]; jailbreak = true; - homepage = "http://code.haskell.org/~thielema/hmm-hmatrix"; + homepage = "http://hub.darcs.net/thielema/hmm-hmatrix"; description = "Hidden Markov Models using HMatrix primitives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67010,6 +67186,7 @@ self: { homepage = "http://github.com/jwiegley/hnix"; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnn" = callPackage @@ -67432,12 +67609,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "honk"; - version = "1.2.0.0"; - sha256 = "0aql3rqhx7jj1k0csx5rhb5kqsf1r28rvr7rl9axzkc9imz53wvx"; + version = "1.3.0.0"; + sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf"; buildDepends = [ base ]; - homepage = "http://lfairy.github.io/honk/"; + homepage = "https://lambda.xyz/honk/"; description = "Cross-platform interface to the PC speaker"; - license = "unknown"; + license = stdenv.lib.licenses.asl20; }) {}; "hoobuddy" = callPackage @@ -68222,8 +68399,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.5.1"; - sha256 = "1bbmwan9la5agys1jw95z1immy36pgk93n5x90vsm674dwcj5hrk"; + version = "0.5.2"; + sha256 = "12671fsydxxkdpk47nmzm9qc5vlss6802bypx690z8c982s4vbr1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69332,18 +69509,20 @@ self: { }) { xenctrl = null;}; "hsass" = callPackage - ({ mkDerivation, base, data-default-class, filepath, hlibsass - , hspec, hspec-discover, monad-loops, mtl, temporary + ({ mkDerivation, base, bytestring, data-default-class, filepath + , hlibsass, hspec, hspec-discover, monad-loops, temporary + , transformers }: mkDerivation { pname = "hsass"; - version = "0.2.0"; - sha256 = "0s7p1mv8vwlpgrvnalsfkynd8ps1ndla2yssaq6v650f0vx36jsf"; + version = "0.3.0"; + sha256 = "15x5f8zcikg1bh10sk5b2gqjfldgp4jdgwhl2k20i6h8mxjkpmdf"; buildDepends = [ - base data-default-class filepath hlibsass monad-loops mtl + base bytestring data-default-class filepath hlibsass monad-loops + transformers ]; testDepends = [ - base data-default-class hspec hspec-discover temporary + base bytestring data-default-class hspec hspec-discover temporary ]; homepage = "https://github.com/jakubfijalkowski/hsass"; description = "Integrating Sass into Haskell applications"; @@ -70766,7 +70945,6 @@ self: { base containers http-types HUnit network-uri rdf4h test-framework test-framework-hunit text wai warp ]; - jailbreak = true; homepage = "https://github.com/robstewart57/hsparql"; description = "A SPARQL query generator and DSL, and a client to query a SPARQL server"; license = stdenv.lib.licenses.bsd3; @@ -71094,6 +71272,7 @@ self: { homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-test-framework" = callPackage @@ -71864,6 +72043,7 @@ self: { jailbreak = true; description = "Command-line tar archive utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htiled" = callPackage @@ -72228,8 +72408,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.15"; - sha256 = "0k3ag3ia76s9dyhafaprspbsrbzpl5amyw7cnxv6l76v778ksrrf"; + version = "0.4.16"; + sha256 = "1ghz498h3c0n1wfkxgkh9zd8l6yik650505hihnayp4wcykc1p82"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -72794,8 +72974,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "1.0.1"; - sha256 = "1iw1k3xs79xfzwgykpbyvfsdns4ljfmvf1v98jjklimrzsmlsgz3"; + version = "1.0.2"; + sha256 = "0wkzphzxzzvqm947l759vxnl6g60nrx7jygyxdlxfgxi51fd7gap"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74143,8 +74323,8 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.3.3"; - sha256 = "033841498nnlczypd87xjwlxcka9w5cj7881qpb94xd0dwllagnc"; + version = "0.3.3.1"; + sha256 = "1ns0vz80byssmi39mgdkprpwy26szbmfqqzs1lb6amqf7nx4i14l"; buildDepends = [ approximate base binary bits bytes cereal cereal-vector comonad deepseq distributive generic-deriving hashable hashable-extras lens @@ -74721,8 +74901,8 @@ self: { }: mkDerivation { pname = "ig"; - version = "0.2.2"; - sha256 = "0qg9786sih7bcmdvmih5qg8p0j8r7vh78cp5yaw2f9rldica9a4k"; + version = "0.3"; + sha256 = "1sg1dbwjvhixy7qgchg6a2nh76jyp3qlwancj3fcn7c87fmhxdqg"; buildDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -75798,8 +75978,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.4.2"; - sha256 = "1s38ncb59zr8295k3vr52cmirb9kw2dfpfjbb8hh5c27z1vcmmrz"; + version = "0.5.4.3"; + sha256 = "03b15dz0bm26bv9jkpjdgmqii3fw1ifj6zwmysibir50jxlbx9pk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76591,7 +76771,9 @@ self: { mkDerivation { pname = "iproute"; version = "1.5.0"; + revision = "1"; sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3"; + editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8"; buildDepends = [ appar base byteorder containers network ]; testDepends = [ appar base byteorder containers doctest hspec network QuickCheck @@ -76757,9 +76939,9 @@ self: { mkDerivation { pname = "irc-core"; version = "1.1.0.1"; - revision = "2"; + revision = "3"; sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257"; - editedCabalFile = "dd561722689f1891016d9ea0ce11ef7752853160fc8da43625f803839f55059c"; + editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77500,7 +77682,8 @@ self: { "jack" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list - , explicit-exception, jack2, midi, non-negative, transformers, unix + , explicit-exception, libjack2, midi, non-negative, transformers + , unix }: mkDerivation { pname = "jack"; @@ -77512,25 +77695,25 @@ self: { array base bytestring enumset event-list explicit-exception midi non-negative transformers unix ]; - pkgconfigDepends = [ jack2 ]; + pkgconfigDepends = [ libjack2 ]; homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - }) { jack2 = null;}; + }) { inherit (pkgs) libjack2;}; "jack-bindings" = callPackage - ({ mkDerivation, base, c2hs, jack2, mtl }: + ({ mkDerivation, base, c2hs, libjack2, mtl }: mkDerivation { pname = "jack-bindings"; version = "0.1.1"; sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm"; buildDepends = [ base mtl ]; buildTools = [ c2hs ]; - pkgconfigDepends = [ jack2 ]; + pkgconfigDepends = [ libjack2 ]; description = "DEPRECATED Bindings to the JACK Audio Connection Kit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { jack2 = null;}; + }) { inherit (pkgs) libjack2;}; "jackminimix" = callPackage ({ mkDerivation, base, hosc }: @@ -77636,8 +77819,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5"; - sha256 = "1rjmwxp078mq47b879ylfz4g2p9irgh4jrrg1vknwham46nj8hzn"; + version = "0.5.0.1"; + sha256 = "1qfa90hi0kcylfw3p4m2qx5n4ni14426ssffj63hixqrqcnz60gx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78103,21 +78286,18 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell - , text, transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, hslogger, lens, template-haskell, text + , transformers }: mkDerivation { pname = "jsaddle"; version = "0.2.0.5"; sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1"; - buildDepends = [ - base lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; + buildDepends = [ base lens template-haskell text transformers ]; testDepends = [ - base glib gtk3 hslogger lens template-haskell text transformers - webkitgtk3 webkitgtk3-javascriptcore + base hslogger lens template-haskell text transformers ]; + jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; }) {}; @@ -78199,6 +78379,7 @@ self: { buildDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; + jailbreak = true; homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; @@ -78226,6 +78407,7 @@ self: { hashable hflags lens mtl pretty process QuickCheck scientific smallcheck text uniplate unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -78446,7 +78628,9 @@ self: { mkDerivation { pname = "json-schema"; version = "0.7.3.7"; + revision = "1"; sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5"; + editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -78901,6 +79085,7 @@ self: { homepage = "https://github.com/ku-fpg/kansas-comet/"; description = "A JavaScript push mechanism based on the comet idiom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-lava" = callPackage @@ -79381,6 +79566,7 @@ self: { homepage = "http://keera.co.uk/projects/keera-posture"; description = "Get notifications when your sitting posture is inappropriate"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keiretsu" = callPackage @@ -81238,6 +81424,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python" = callPackage @@ -81880,13 +82067,13 @@ self: { , hslogger, jsaddle, leksah-server, lens, ltk, monad-loops, mtl , network, network-uri, old-time, parsec, pretty, pretty-show , QuickCheck, regex-base, regex-tdfa, regex-tdfa-text, shakespeare - , strict, text, time, transformers, unix, utf8-string, vado, vcsgui - , vcswrapper, webkitgtk3, webkitgtk3-javascriptcore + , stm, strict, text, time, transformers, unix, utf8-string, vado + , vcsgui, vcswrapper, webkitgtk3, webkitgtk3-javascriptcore }: mkDerivation { pname = "leksah"; - version = "0.15.0.6"; - sha256 = "0hr0d4cl0gh58svpk9dji00rsypkplndd5q5av4bx2v34bx0v0rh"; + version = "0.15.1.0"; + sha256 = "0skvn5n69ir63q91jaj5qdhk8cxvic61g9ar5wck0gwpzdjcfl6w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81895,13 +82082,13 @@ self: { ghcjs-codemirror ghcjs-dom gio glib gtk3 gtksourceview3 hamlet haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl network network-uri old-time parsec pretty pretty-show QuickCheck - regex-base regex-tdfa regex-tdfa-text shakespeare strict text time - transformers unix utf8-string vado vcsgui vcswrapper webkitgtk3 - webkitgtk3-javascriptcore + regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text + time transformers unix utf8-string vado vcsgui vcswrapper + webkitgtk3 webkitgtk3-javascriptcore ]; testDepends = [ base Cabal containers glib gtk3 gtksourceview3 hslogger - leksah-server ltk monad-loops QuickCheck text transformers + leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; homepage = "http://www.leksah.org"; @@ -81971,8 +82158,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.11.1"; - sha256 = "1f3xyz9y6510nbskc15brjdg226qpwgjnzddc29kg0g79x5wwcpi"; + version = "4.12"; + sha256 = "195fhzw8z15zrbav7mdzia052g7sfy7zm5banjkk3azsb9mjvvan"; buildDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -82202,8 +82389,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.2.4"; - sha256 = "1iv3lk4jjp7yvqhfnqxsg8rgkbwzjhmnny6rrqk3njir76b378ra"; + version = "0.1.2.6"; + sha256 = "0pn4x75l04qs95h9ca5chvxbivnb29h4d8415n4r2b1gmx4apn0w"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -82614,8 +82801,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.4"; - sha256 = "0j4rjwcp85cwfzvqvmxkxrvldfhz6k8ws3qjf29lzr0yrk1vfbjm"; + version = "1.5"; + sha256 = "0pyync48lr2silvm3cdmn11zmv355hcmmaj6rm7lb365mqv444i1"; buildDepends = [ array base containers monads-tf process union-find ]; @@ -82860,6 +83047,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "libravatar" = callPackage + ({ mkDerivation, base, bytestring, crypto-api, dns, network-uri + , pureMD5, random, SHA, url, utf8-string + }: + mkDerivation { + pname = "libravatar"; + version = "0.1.0.1"; + sha256 = "00rdnhxwp1h4ax3cwlmqa6digzl1b8br5ajg7k0dsydb9ik171x5"; + buildDepends = [ + base bytestring crypto-api dns network-uri pureMD5 random SHA url + utf8-string + ]; + homepage = "http://rel4tion.org/projects/libravatar/"; + description = "Use Libravatar, the decentralized avatar delivery service"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2 , syb, time @@ -83320,8 +83524,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.19"; - sha256 = "1i5wbp6dbmdmys6scqyn0iiz4qhsj6m4v2ipicqx7nrl490vbivf"; + version = "1.19.1.2"; + sha256 = "1bxzy4735xc0zdxmwrspmjcn4p61kjwzxi8agjfx7w1dsyah2if3"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -83443,8 +83647,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.6.0.0"; - sha256 = "0lprqpdrimrkdd2jmvbp9lpjnknr7a9bpiwh0rcx1jp5f777xfys"; + version = "0.7.0"; + sha256 = "13sfwkjg94q47lfxw5zddi8xpf4az07g88yq5pvgnh3vs5xggwip"; buildDepends = [ base containers ghc-prim mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; @@ -83455,20 +83659,20 @@ self: { "linearscan-hoopl" = callPackage ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl , hspec, hspec-expectations, lens-family-core, linearscan - , QuickCheck, tardis, transformers + , QuickCheck, transformers }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.6.0.0"; - sha256 = "0sag9590df05fs46fv846hqwwiab85i9dsx4xn4y9w4islxi8hkb"; + version = "0.7.0"; + sha256 = "1zvzgcj5yln6g3mqljgcyjpjj2visiigd7qwl70l1zclz5zcfynv"; buildDepends = [ - base containers free hoopl linearscan QuickCheck tardis - transformers + base containers free hoopl linearscan QuickCheck transformers ]; testDepends = [ base containers deepseq fuzzcheck hoopl hspec hspec-expectations - lens-family-core linearscan QuickCheck tardis transformers + lens-family-core linearscan QuickCheck transformers ]; + jailbreak = true; homepage = "http://github.com/jwiegley/linearscan-hoopl"; description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; @@ -85066,6 +85270,7 @@ self: { version = "0.1.1.0"; sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52"; buildDepends = [ base effin ]; + jailbreak = true; homepage = "https://github.com/konn/loop-effin"; description = "control-monad-loop port for effin"; license = stdenv.lib.licenses.bsd3; @@ -85424,6 +85629,7 @@ self: { ]; description = "Helpers for Haskell integration with Lua"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lub" = callPackage @@ -85477,8 +85683,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.4"; - sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12"; + version = "0.5.0.0"; + sha256 = "1p7ipdy0nmqfg1b038a1b5nd3xh2779d2gnw4h683mm5jcbf0mvj"; buildDepends = [ base blaze-builder lucid text transformers ]; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; @@ -85778,7 +85984,9 @@ self: { mkDerivation { pname = "machinecell"; version = "2.0.1"; + revision = "1"; sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd"; + editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d"; buildDepends = [ arrows base free mtl profunctors semigroups ]; testDepends = [ arrows base hspec mtl profunctors QuickCheck semigroups @@ -90426,6 +90634,7 @@ self: { homepage = "https://github.com/SumAll/moonshine"; description = "A web service framework for Haskell, similar in purpose to dropwizard"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morfette" = callPackage @@ -92126,6 +92335,7 @@ self: { homepage = "https://github.com/fractalcat/nagios-plugin-ekg"; description = "Monitor ekg metrics via Nagios"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -92365,15 +92575,15 @@ self: { "nationstates" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client - , http-client-tls, http-types, multiset, split, transformers, xml + , http-client-tls, http-types, multiset, transformers, xml }: mkDerivation { pname = "nationstates"; - version = "0.1.0.1"; - sha256 = "0hnn4b94aj29j07jbhb7m7nn7l3wpkkcv76ngn1a5dnamagrwdpd"; + version = "0.1.0.2"; + sha256 = "0h01dxf8f2h18cx6ag67370l492jvyqh15ijipxzr1gwmkmnymrl"; buildDepends = [ base bytestring clock containers http-client http-client-tls - http-types multiset split transformers xml + http-types multiset transformers xml ]; homepage = "https://github.com/lfairy/nationstates"; description = "NationStates API client"; @@ -94303,6 +94513,7 @@ self: { ]; description = "Generate nix expressions from npm packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nixos-types" = callPackage @@ -95424,10 +95635,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "old-version"; - version = "1.3.2"; - sha256 = "0mh8xkcwx7p0vrg8gqza019k4faw7zw703mrin8ii85igq9sg70i"; + version = "1.4.2"; + sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3"; buildDepends = [ base ]; - jailbreak = true; description = "Basic versioning library"; license = "unknown"; }) {}; @@ -95452,6 +95662,7 @@ self: { jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -96166,6 +96377,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "operational-class" = callPackage + ({ mkDerivation, base, operational, transformers }: + mkDerivation { + pname = "operational-class"; + version = "0.3.0.0"; + sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b"; + buildDepends = [ base operational transformers ]; + homepage = "https://github.com/srijs/haskell-operational-class"; + description = "MonadProgram typeclass for the operational package"; + license = stdenv.lib.licenses.mit; + }) {}; + "opml" = callPackage ({ mkDerivation, base, directory, xml }: mkDerivation { @@ -96579,6 +96802,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "orgmode" = callPackage + ({ mkDerivation, base, containers, hspec, HStringTemplate, network + , network-uri, parsec, QuickCheck, random, regex-posix, syb, text + }: + mkDerivation { + pname = "orgmode"; + version = "0.1.0.0"; + sha256 = "084dzafa8pm2hs346zk3x3agzzcxay7ca9r40s6sh61vfc6hbwg0"; + buildDepends = [ + base containers HStringTemplate parsec regex-posix syb text + ]; + testDepends = [ + base containers hspec HStringTemplate network network-uri parsec + QuickCheck random regex-posix syb text + ]; + jailbreak = true; + description = "Org Mode library for haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orgmode-parse" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, old-locale, tasty, tasty-hunit, text @@ -97082,8 +97325,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.15.0.4"; - sha256 = "1mq7vdcxa7ia0s0l22ysqxpjsib4wvphh4849asswswgywscaq2n"; + version = "1.15.0.5"; + sha256 = "0js3k6kvq506yssx5d4wwx9hsd0pm81k8g0rpd7wi2aixibs2jj2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97141,8 +97384,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.2.1"; - sha256 = "1hr2jfbzanpqbkvsfcbzvlfsnzba11hdrmvc3j63fwqk931qi2jm"; + version = "0.1.2.2"; + sha256 = "1ynxg9d3ssq9bby073j40913z11xap6gpf8hkjl0h0ll3mx89vb9"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -97188,6 +97431,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-placetable" = callPackage + ({ mkDerivation, base, explicit-exception, pandoc-types + , spreadsheet + }: + mkDerivation { + pname = "pandoc-placetable"; + version = "0.1.1"; + sha256 = "196x22f76mvd072yzj6vcynrp459zmlg84l42rwx4syhnvn1ca8d"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base explicit-exception pandoc-types spreadsheet + ]; + homepage = "https://github.com/mb21/pandoc-placetable"; + description = "Pandoc filter to include CSV files"; + license = "GPL"; + }) {}; + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , deepseq-generics, ghc-prim, syb @@ -99299,6 +99560,7 @@ self: { homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service and library for creating/consuming temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pg-harness-client" = callPackage @@ -99330,6 +99592,7 @@ self: { homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgdl" = callPackage @@ -99701,10 +99964,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "picosat"; - version = "0.1.2"; - sha256 = "0x43fbhlinqflrvv548bxjrslnnsprklqig6iv9l8q9xv83scrvg"; + version = "0.1.3"; + sha256 = "1ljgarjvhw7qi06bjykgbd17s27h73gdj21rpi5x4ddv9fb68k9p"; buildDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sdiehl/haskell-picosat"; description = "Bindings to the PicoSAT solver"; license = stdenv.lib.licenses.mit; @@ -101808,6 +102070,7 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple" = callPackage @@ -101985,6 +102248,7 @@ self: { ]; description = "SMTP server library to receive emails from within Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmark" = callPackage @@ -103010,6 +103274,7 @@ self: { jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "processor-creative-kit" = callPackage @@ -103439,8 +103704,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.5.0"; - sha256 = "120pamm3rg2iahbl23y90wbcwdhgjvvsfzlkhi61c97xfybvb08c"; + version = "2.6.0"; + sha256 = "1q9l5bp7sg9lciz8c5qzxmwnfb7b195f8zgdcvzfcx50i3hpxxad"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104206,10 +104471,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.7.0.0"; - revision = "1"; - sha256 = "02kb8xk2c3lzm8bdph7q93chgdpjz00mhk76kpr1hjfwr6kniw91"; - editedCabalFile = "0ec2a8e9a05aab3ca9b407ea66b8501f2bf067f7dfa9e408ff200819e63ff31f"; + version = "0.7.1.0"; + sha256 = "1hnrqs1dkcrwa1xrnrikcymm65inxfh9jznfb2xqczd9vyn8j518"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104229,6 +104492,7 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) nodejs;}; "push-notify" = callPackage @@ -104719,6 +104983,7 @@ self: { jailbreak = true; description = "Quenya verb conjugator"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "querystring-pickle" = callPackage @@ -105112,6 +105377,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quiver-csv" = callPackage + ({ mkDerivation, base, bytestring, data-cell, quiver + , quiver-bytestring + }: + mkDerivation { + pname = "quiver-csv"; + version = "0.0.0.1"; + sha256 = "0s5m6qhpir5i1n3ifrcr4if4ysk52cwi9pxm354mdw1859h5lmx9"; + buildDepends = [ + base bytestring data-cell quiver quiver-bytestring + ]; + homepage = "https://github.com/zadarnowski/quiver-csv"; + description = "Quiver combinators for cellular CSV data processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quoridor-hs" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network @@ -105277,6 +105559,7 @@ self: { sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; + jailbreak = true; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -105608,8 +105891,8 @@ self: { }: mkDerivation { pname = "range"; - version = "0.1.1.0"; - sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2"; + version = "0.1.1.1"; + sha256 = "05xcy4r97yyqr72cqpr5rq514zygbwa2hfnhilvgzrh3cmk61n0p"; buildDepends = [ base parsec ]; testDepends = [ base Cabal QuickCheck random test-framework @@ -105877,25 +106160,28 @@ self: { }) {}; "rdf4h" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hashable - , HTTP, HUnit, hxt, knob, network, network-uri, parsec, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, unordered-containers + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , directory, fgl, hashable, HTTP, HUnit, hxt, knob, network + , network-uri, parsec, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , text-binary, unordered-containers }: mkDerivation { pname = "rdf4h"; - version = "1.3.0"; - sha256 = "0d6jqhfiy1zlvbf04n7q8qmq2ql0vrd0lpfaxsmqwwnz5ip297jp"; + version = "1.3.1"; + sha256 = "0mcswyjlvhnv4rvapanfmxf2brsp5b9r1ps22n3rlhpa3mfw72rc"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring containers directory hashable HTTP hxt network - network-uri parsec text unordered-containers + base binary bytestring containers deepseq directory fgl hashable + HTTP hxt network network-uri parsec text text-binary + unordered-containers ]; testDepends = [ - base bytestring containers hashable HTTP HUnit hxt knob network - network-uri parsec QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text unordered-containers + base bytestring containers deepseq fgl hashable HTTP HUnit hxt knob + network network-uri parsec QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers ]; homepage = "https://github.com/robstewart57/rdf4h"; description = "A library for RDF processing in Haskell"; @@ -106787,8 +107073,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "1.5.2.1"; - sha256 = "1pynmkhdxq5vxbjs7rxiv3mg8avidxg4cnghanp75846s4s6ggg5"; + version = "2"; + sha256 = "1hlrji6wyqr892a78px7wilhywyiqdfdmnr7zp4c641qks4rw6gf"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -106862,6 +107148,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex-dom-contrib" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, containers + , data-default, ghcjs-base, ghcjs-dom, http-types, lens, mtl + , readable, reflex, reflex-dom, string-conv, text, time + }: + mkDerivation { + pname = "reflex-dom-contrib"; + version = "0.1"; + sha256 = "1xqw1i5wldfamjyav7fbw3001hdnbj4x3phlr216ybw3ndxrjklc"; + buildDepends = [ + aeson base bifunctors bytestring containers data-default ghcjs-base + ghcjs-dom http-types lens mtl readable reflex reflex-dom + string-conv text time + ]; + jailbreak = true; + homepage = "https://github.com/reflex-frp/reflex-dom-contrib"; + description = "A playground for experimenting with infrastructure and common code for reflex applications"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) { ghcjs-base = null;}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { @@ -107414,6 +107721,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regress" = callPackage + ({ mkDerivation, ad, base, vector }: + mkDerivation { + pname = "regress"; + version = "0.1.1"; + sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj"; + buildDepends = [ ad base vector ]; + homepage = "https://github.com/alpmestan/regress"; + description = "Linear and logistic regression through automatic differentiation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regular" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -108318,8 +108637,8 @@ self: { }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.0.1"; - sha256 = "1a045adxq1n2xjff9ccw6nfb87867w54pihmbybxcwfnkr6ymq26"; + version = "0.3.0.2"; + sha256 = "1d64hg2nwhqzm720w25xgb4wv2akg0kv3iwwh2ivc57zp525xpcq"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -108546,7 +108865,9 @@ self: { mkDerivation { pname = "rest-gen"; version = "0.17.1.1"; + revision = "1"; sha256 = "0gr5wv0gb2niq3i7ggzrr5g9hs3fwxss5hivw5ircrbp9s1xm7bl"; + editedCabalFile = "9d5c13bbf90373aed094821bd2005822fccd5949e0c88a2a63870d90f7c76ee4"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -110038,15 +110359,16 @@ self: { }) {}; "rubberband" = callPackage - ({ mkDerivation, base, rubberband, vector }: + ({ mkDerivation, base, c2hs, rubberband, vector }: mkDerivation { pname = "rubberband"; - version = "0.1.0.1"; - sha256 = "03dhmk4sad20xjic8li1bmwfxril9j6fffcwkf575pd51ds7kghf"; + version = "0.1.0.2"; + sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm"; buildDepends = [ base vector ]; + testDepends = [ base ]; + buildTools = [ c2hs ]; extraLibraries = [ rubberband ]; pkgconfigDepends = [ rubberband ]; - jailbreak = true; homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; @@ -111493,6 +111815,7 @@ self: { homepage = "https://github.com/echaozh/scottish"; description = "scotty with batteries included"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty" = callPackage @@ -111504,8 +111827,8 @@ self: { }: mkDerivation { pname = "scotty"; - version = "0.10.1"; - sha256 = "0rz7m12pqyrw1ihvg7lhciy5lvn1g5mmdrbcyc5z32icqys3qi8v"; + version = "0.10.2"; + sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class http-types monad-control mtl nats network @@ -111609,6 +111932,7 @@ self: { homepage = "https://github.com/scotty-web/scotty-hastache"; description = "Easy Mustache templating support for Scotty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-session" = callPackage @@ -111628,6 +111952,7 @@ self: { homepage = "https://github.com/agrafix/scotty-session"; description = "Adding session functionality to scotty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-tls" = callPackage @@ -111640,6 +111965,7 @@ self: { homepage = "https://github.com/dmjio/scotty-tls.git"; description = "TLS for Scotty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scp-streams" = callPackage @@ -112741,8 +113067,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.3"; - sha256 = "0mqiigf6bxrcnjgizv9kw23xf55ck453z2hz68pzqqbjzs34iqb4"; + version = "0.4.3.1"; + sha256 = "1lbnd4mmn7q0bb091il18g1y8ixsi81s64q8lpfpm5sq4dsn1x6l"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -112762,8 +113088,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.3"; - sha256 = "0pcdslar68yfviacrvyc6rb9d972m1irz4k7wd1xxnm5y60v0wyl"; + version = "0.4.3.1"; + sha256 = "017y41z82smy848y6a73232rlidiimdxawb048lnrs9z53ai46cn"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -112779,8 +113105,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.3"; - sha256 = "0baqrhhhfmyx0389abp503mhh8fjv18i3qhmdsvn46blb4c0cnkx"; + version = "0.4.3.1"; + sha256 = "15b6aww76bw87zps3n3sv5zl4q1h9l9ds72r9g8kn0r53r3vw6ig"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -112803,8 +113129,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.3"; - sha256 = "13rnn2z9bxrcrxqkndhnbkmsp27907lscsl4vrryxx37i94bf1qj"; + version = "0.4.3.1"; + sha256 = "0kzk4089xnr22gw929babknc9rnjq3wp1rk9fq881l49z8pvvl4r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112821,18 +113147,19 @@ self: { "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text - , transformers, unordered-containers, wai, warp + , transformers, unordered-containers, vector, wai, warp + , xss-sanitize }: mkDerivation { pname = "servant-ede"; - version = "0.4.0.1"; - sha256 = "1yxqjd6dk5bhh6qwjshm1fcizsm1vd5nk8sdbfdasgsfw6ynlgfp"; + version = "0.5"; + sha256 = "0lq9kd96lzkyx35n46q0yxk44lirpnh9gv4wji8i8qjqf18fkg6c"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring ede either filepath http-media http-types semigroups servant servant-server text transformers - unordered-containers wai warp + unordered-containers vector wai warp xss-sanitize ]; homepage = "http://github.com/alpmestan/servant-ede"; description = "Combinators for rendering EDE templates in servant web applications"; @@ -112847,8 +113174,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.3"; - sha256 = "0p57731ji84mikvymi458x27i4nk66046xmra6lrvc2fxs5gspmh"; + version = "0.4.3.1"; + sha256 = "1ypsdpmp8rx6qcwvbw5scc0y41c1jnpn96wxy6wcik1rkc2zjxfq"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -112869,8 +113196,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.3"; - sha256 = "1rslqlg6p7indrcalvq85knwgsi4wdznz5cbblq1i5j4297yc1gj"; + version = "0.4.3.1"; + sha256 = "13ngnbpip7nps3c8i2r9220i9i9kgf5s5w8s0wjkhb25xfbmnwwx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112889,8 +113216,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.3"; - sha256 = "0js3f23iwgr2wi54pv37hhsln1x6vmfd5mnsxnzdmppzvb9f19wk"; + version = "0.4.3.1"; + sha256 = "1pgvd3khap4gnnpsi2rrp64rz0182xyy9bqglsvg7f7nfmyprgpq"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -112986,8 +113313,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.3"; - sha256 = "0xi5g3xqn4fl57fbhw2avm26g7k8zmd1c215yw5ria9dbjrvlqha"; + version = "0.4.3.1"; + sha256 = "1qdsv7zr9byjrm7yir8alm1zv0ckb81r6akwdvqfa88a581yz7jx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113117,6 +113444,7 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-frontend-wai" = callPackage @@ -113717,7 +114045,9 @@ self: { mkDerivation { pname = "shakespeare"; version = "2.0.5"; + revision = "1"; sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh"; + editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc"; buildDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process template-haskell text time @@ -115352,6 +115682,7 @@ self: { ]; description = "a tool to access the OSX keychain"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skell" = callPackage @@ -115438,8 +115769,8 @@ self: { }: mkDerivation { pname = "slack-api"; - version = "0.4"; - sha256 = "1xwpcvk906v2w995gsk8g41ml46w1r8h1gybsspkx6s6z6whhik5"; + version = "0.5"; + sha256 = "1jjm7qzb1s2z8c7ikwsvz2bp7f3dx3qcqw7kcas42xp0ziwnl50m"; buildDepends = [ aeson base bytestring containers errors HsOpenSSL io-streams lens lens-aeson monad-loops mtl network network-uri openssl-streams text @@ -115789,12 +116120,11 @@ self: { ({ mkDerivation, aeson, base, linear, vector }: mkDerivation { pname = "smoothie"; - version = "0.3.2"; - sha256 = "0al17y15k7y04dwz5v2bsq003lxzhkhqlbdmbljdr1z17yszcjp6"; + version = "0.3.3.2"; + sha256 = "0jkcy45rxq14ma11h4dakv8ixwzynlml02yd3nmncmlm8vzpah8n"; buildDepends = [ aeson base linear vector ]; - jailbreak = true; homepage = "https://github.com/phaazon/smoothie"; - description = "Smooth curves via several splines and polynomials"; + description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115878,6 +116208,7 @@ self: { homepage = "https://github.com/avieth/smtp-mail-ng"; description = "An SMTP client EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp2mta" = callPackage @@ -115914,6 +116245,7 @@ self: { homepage = "https://github.com/enzoh/smtps-gmail"; description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snake-game" = callPackage @@ -115955,6 +116287,7 @@ self: { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-accept" = callPackage @@ -116001,6 +116334,7 @@ self: { homepage = "https://github.com/dzhus/snap-auth-cli"; description = "Command-line tool to manage Snap AuthManager database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-blaze" = callPackage @@ -116081,6 +116415,7 @@ self: { homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-elm" = callPackage @@ -116115,6 +116450,7 @@ self: { homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-extras" = callPackage @@ -116291,6 +116627,7 @@ self: { homepage = "https://github.com/lukerandall/snap-web-routes"; description = "Type safe URLs for Snap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-acid-state" = callPackage @@ -116303,6 +116640,7 @@ self: { homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-actionlog" = callPackage @@ -116347,6 +116685,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-amqp"; description = "Snap framework snaplet for the AMQP library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-auth-acid" = callPackage @@ -116386,6 +116725,7 @@ self: { homepage = "https://github.com/AtticHacker/snaplet-coffee"; description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-css-min" = callPackage @@ -116440,6 +116780,7 @@ self: { homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-hasql" = callPackage @@ -116457,6 +116798,7 @@ self: { homepage = "https://github.com/mikeplus64/snaplet-hasql"; description = "A Hasql snaplet"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-haxl" = callPackage @@ -116515,6 +116857,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-logger"; description = "Snap framework snaplet for the Logger API library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-i18n" = callPackage @@ -116555,6 +116898,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-influxdb"; description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-lss" = callPackage @@ -116590,6 +116934,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-mandrill"; description = "Snap framework snaplet for the Mandrill API library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-mongoDB" = callPackage @@ -116699,6 +117044,7 @@ self: { homepage = "https://github.com/soostone/snaplet-persistent"; description = "persistent snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-postgresql-simple" = callPackage @@ -116718,9 +117064,11 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-postmark" = callPackage @@ -116738,6 +117086,7 @@ self: { homepage = "https://github.com/LukeHoersten/snaplet-postmark"; description = "Postmark snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-purescript" = callPackage @@ -116773,6 +117122,7 @@ self: { homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-redis" = callPackage @@ -116790,6 +117140,7 @@ self: { homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-redson" = callPackage @@ -116869,6 +117220,7 @@ self: { homepage = "https://github.com/lukerandall/snaplet-sass"; description = "Sass integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-sedna" = callPackage @@ -116952,6 +117304,7 @@ self: { homepage = "https://github.com/LukeHoersten/snaplet-stripe"; description = "Stripe snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-tasks" = callPackage @@ -117358,6 +117711,7 @@ self: { homepage = "https://github.com/lpeterse/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) { sctp = null;}; "socketio" = callPackage @@ -117861,8 +118215,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; - version = "0.1.2.0"; - sha256 = "0mncj2053w1xsfrsx1472v85ia4spvshw18mp15xp3l6haxq7wxq"; + version = "0.2.0.0"; + sha256 = "0hxzkmyi90cbr7w8mjlp2azbkyp8gvjpv28c57lpvxw2xvyavgjq"; buildDepends = [ base transformers ]; testDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/phadej/spdx"; @@ -118115,6 +118469,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "splay" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "splay"; + version = "0.0.6"; + sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl"; + buildDepends = [ base ]; + description = "Generic splay-based sequence representation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "splaytree" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -118853,13 +119218,12 @@ self: { }) {}; "stable-memo" = callPackage - ({ mkDerivation, base, ghc-prim, hashtables, tagged }: + ({ mkDerivation, base, ghc-prim, hashtables }: mkDerivation { pname = "stable-memo"; - version = "0.3.0"; - sha256 = "0a218ilzx1bgwirfp6v6bzgwwkx8l60q1xnxq347xas750wjn8a8"; - buildDepends = [ base ghc-prim hashtables tagged ]; - jailbreak = true; + version = "0.3.1"; + sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx"; + buildDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; }) {}; @@ -119443,10 +119807,9 @@ self: { ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { pname = "static-canvas"; - version = "0.2.0.1"; - sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq"; + version = "0.2.0.2"; + sha256 = "1lphx10wljylsbjwlw5p7bsjh5gf2fj1sl09556y814r11a6rjff"; buildDepends = [ base double-conversion free mtl text ]; - jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -120392,12 +120755,11 @@ self: { }: mkDerivation { pname = "streams"; - version = "3.2"; - sha256 = "1pms4wiispnpzysq44fcvspdxmbwk47rfcpcyshnnhpw7c7qngni"; + version = "3.2.1"; + sha256 = "1xyrsb55dg7v3pris0hc0yqdlqaymxb6g286wrbc7h2lva5wrva4"; buildDepends = [ adjunctions base comonad distributive semigroupoids semigroups ]; - jailbreak = true; homepage = "http://github.com/ekmett/streams/issues"; description = "Various Haskell 2010 stream comonads"; license = stdenv.lib.licenses.bsd3; @@ -120979,6 +121341,7 @@ self: { homepage = "http://github.com/mikeizbicki/subhask"; description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "subnet" = callPackage @@ -122684,8 +123047,8 @@ self: { }: mkDerivation { pname = "tagged-transformer"; - version = "0.7.1"; - sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j"; + version = "0.8"; + sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7"; buildDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged @@ -122880,15 +123243,12 @@ self: { }) {}; "takahashi" = callPackage - ({ mkDerivation, base, mtl, reasonable-lens, reasonable-operational - }: + ({ mkDerivation, base, lens, monad-skeleton, mtl }: mkDerivation { pname = "takahashi"; - version = "0.2.0.2"; - revision = "1"; - sha256 = "0iwwmb0przjjgfz9xav4whgqh09dq4ndil29dmq2bp81wryay0l4"; - editedCabalFile = "907771d78ac3db503a9d832bae2dcc3a20d03a3a7698ff7769cb9e84703b27a1"; - buildDepends = [ base mtl reasonable-lens reasonable-operational ]; + version = "0.2.2.0"; + sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs"; + buildDepends = [ base lens monad-skeleton mtl ]; description = "create slide for presentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -124565,8 +124925,8 @@ self: { ({ mkDerivation, base, binary, text }: mkDerivation { pname = "text-binary"; - version = "0.2.0"; - sha256 = "09njl6afnj2yjqn3mg3ry4qsd5jjjh51malk6kn2zzihldb9z5b2"; + version = "0.2.1"; + sha256 = "00paqwnngd9l88zhah9wqg4wr41mrs30xm49w8xq337yxcvz48nz"; buildDepends = [ base binary text ]; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; @@ -124778,8 +125138,8 @@ self: { }: mkDerivation { pname = "text-regex-replace"; - version = "0.1.0.1"; - sha256 = "1xnpfj1890l2zqqhr6b95qpqacpssi8qzgqgnpdxml8wfzan8xwl"; + version = "0.1.1.0"; + sha256 = "0p8xjw6srlb23giqrb3qay1hd1jq3gd9im0v7fnr8yifc0ri6piz"; buildDepends = [ attoparsec base text text-icu ]; testDepends = [ base hspec QuickCheck smallcheck text text-icu ]; jailbreak = true; @@ -124850,10 +125210,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "2"; - revision = "1"; - sha256 = "1k9blq670jsph1jkrw01hf4k6ga8i3xy5nfs299xj17nni8hjci8"; - editedCabalFile = "e0610e22ef001feb5271583c1719c2ebdef23ac4179deaabba23a21d6c2ac7b0"; + version = "2.0.1"; + sha256 = "1k5lwkfg8vrrmhm0xir1shplygvh2xki2dw13z56xrkkm8ygv3cx"; buildDepends = [ base base-compat bifunctors binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups @@ -124936,6 +125294,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-zipper" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "text-zipper"; + version = "0.1.1"; + sha256 = "0g8w7kyvqmjx4psj0cicv4bxn1ngx0giqyz8fyfhdr6v8wd9r410"; + buildDepends = [ base text ]; + description = "A text editor zipper library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text1" = callPackage ({ mkDerivation, base, binary, directory, doctest, filepath, lens , QuickCheck, semigroups, template-haskell, text @@ -127127,6 +127496,7 @@ self: { adjunctions base base-compat bytes containers distributive keys linear reflection semigroups vector ]; + jailbreak = true; description = "Dense and sparse total maps"; license = stdenv.lib.licenses.mit; }) {}; @@ -127183,20 +127553,17 @@ self: { "tpdb" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable - , HaXml, hxt, mtl, parsec, pretty, time, wl-pprint-text + , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text }: mkDerivation { pname = "tpdb"; - version = "1.1.1"; - sha256 = "1wsjf7ds8xnfx4q3cjv5vwspyrvyq73439w9v4v3qrmmj5qcm7p9"; + version = "1.2.0"; + sha256 = "12l4a6p8jn03q71d3qi2zkv63k53brmha5hm6dwrp0sb8bv3qmb0"; buildDepends = [ - base containers filepath hashable HaXml hxt mtl parsec time - wl-pprint-text - ]; - testDepends = [ - base bytestring containers hashable HaXml hxt parsec pretty time + base containers filepath hashable HaXml hxt mtl parsec text time wl-pprint-text ]; + testDepends = [ base bytestring HaXml pretty ]; homepage = "https://github.com/jwaldmann/haskell-tpdb"; description = "Data Type for Rewriting Systems"; license = "GPL"; @@ -127448,6 +127815,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-lift" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-lift"; + version = "0.1.0.0"; + sha256 = "0fmd6v8a5r1x66v4cyb0adbajddm3mn1k43ryks01x1c3yw0p0sj"; + buildDepends = [ base transformers ]; + description = "Ad-hoc type classes for lifting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-runnable" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -127924,8 +128302,8 @@ self: { ({ mkDerivation, base, comonad, free, mtl, transformers }: mkDerivation { pname = "tubes"; - version = "0.2.2.1"; - sha256 = "1zl7rnkind38a4ixxwq9qqxllrqi6aig6jnamda3r4nw1xh3ysxw"; + version = "0.2.2.3"; + sha256 = "0qmg2w4sjm0q1h6ajkv3i576zsi2ndbacjsn5sibcwjbdpkpwmdr"; buildDepends = [ base comonad free mtl transformers ]; homepage = "https://github.com/gatlin/tubes"; description = "Effectful, iteratee-inspired stream processing based on a free monad"; @@ -129496,18 +129874,18 @@ self: { "uhttpc" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , cmdargs, deepseq, network + , deepseq, network, network-uri, optparse-applicative }: mkDerivation { pname = "uhttpc"; - version = "0.1.0.0"; - sha256 = "116x62yq51xb5z0ndvf0q42plw442lf275b0z2wyvcyl3m5mpmhd"; + version = "0.1.1.0"; + sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; isLibrary = true; isExecutable = true; buildDepends = [ - async base bytestring bytestring-lexing cmdargs deepseq network + async base bytestring bytestring-lexing deepseq network network-uri + optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/hvr/uhttpc"; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; @@ -132105,6 +132483,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector_0_11_0_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , random, template-haskell, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.11.0.0"; + sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa"; + buildDepends = [ base deepseq ghc-prim primitive ]; + testDepends = [ + base QuickCheck random template-haskell test-framework + test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, mwc-random , primitive, QuickCheck, vector @@ -133175,8 +133573,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.8.1"; - sha256 = "0ay8cjxk8lplcdg2l89m9dprf6z6pcypljdsiwb17hkyiv36myl9"; + version = "3.0.8.2"; + sha256 = "0j6yvwzw1mpamx0phplgang4gcjv25dhqvngfmzmh5fk76npmxr9"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -134409,6 +134807,7 @@ self: { homepage = "https://github.com/fpco/web-fpco"; description = "Wrappers for web frameworks to ease usage with the FP Complete environment"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -134473,7 +134872,9 @@ self: { mkDerivation { pname = "web-routes"; version = "0.27.9"; + revision = "2"; sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346"; + editedCabalFile = "542f5d20616359b0897018bbd347ce7f0dc948c4e031e8a5383ed85cb931406b"; buildDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -135442,6 +135843,7 @@ self: { ]; buildTools = [ c2hs ]; extraLibraries = [ wlc ]; + jailbreak = true; description = "Haskell bindings for the wlc library"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; @@ -136275,6 +136677,7 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-validation" = callPackage @@ -138006,8 +138409,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.10"; - sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz"; + version = "0.3.3"; + sha256 = "0apl8j5i8mbn1rqmv4wk5rhhh2zcpfqsh2q6d1sl798x96c72v8y"; buildDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -138141,6 +138544,7 @@ self: { homepage = "https://github.com/ony/yampa-glut"; description = "Connects Yampa and GLUT"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa2048" = callPackage @@ -138784,17 +139188,17 @@ self: { }) {}; "yesod-crud" = callPackage - ({ mkDerivation, base, classy-prelude, containers, monad-control - , persistent, random, stm, uuid, yesod-core, yesod-form - , yesod-persistent + ({ mkDerivation, base, classy-prelude, containers, MissingH + , monad-control, persistent, random, safe, stm, uuid, yesod-core + , yesod-form, yesod-persistent }: mkDerivation { pname = "yesod-crud"; - version = "0.1.1"; - sha256 = "06m24i27842pc599zrmj5nv0afx8ci07961gjagdsc02zhpx7896"; + version = "0.1.2"; + sha256 = "0krjhskrjgymgp0nclggnivy03hmlvfy8c9d9ks4s14jw82rnhf1"; buildDepends = [ - base classy-prelude containers monad-control persistent random stm - uuid yesod-core yesod-form yesod-persistent + base classy-prelude containers MissingH monad-control persistent + random safe stm uuid yesod-core yesod-form yesod-persistent ]; jailbreak = true; homepage = "https://github.com/league/yesod-crud"; @@ -139469,8 +139873,8 @@ self: { }: mkDerivation { pname = "yesod-sass"; - version = "0.1.0.0"; - sha256 = "0faizfb44i52yijakfnazx86fs78vi9gnbiw2w42rh4r8gncjbvx"; + version = "0.1.1.0"; + sha256 = "19l93rx70xbyllwddyq0c8326cfqyvx13hpvj71k9mbwkis16ccx"; buildDepends = [ base data-default hsass shakespeare template-haskell text yesod-core @@ -139562,8 +139966,8 @@ self: { }: mkDerivation { pname = "yesod-static-angular"; - version = "0.1.5"; - sha256 = "0ddw307vd1zaknxc74y1k0hwg872y651snk1g72jqhbigcixl3ck"; + version = "0.1.6"; + sha256 = "17dqk60076la64n4j6bndg9ya16q764j2cl07s2dlldw4z1g4sn1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -139575,7 +139979,7 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; - homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators"; + homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; diff --git a/pkgs/development/libraries/libkeyfinder/0.11.nix b/pkgs/development/libraries/libkeyfinder/0.11.nix new file mode 100644 index 000000000000..f0e75b340592 --- /dev/null +++ b/pkgs/development/libraries/libkeyfinder/0.11.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, boost, fftw, qt5 }: + +let version = "0.11"; in +stdenv.mkDerivation { + name = "libkeyfinder-${version}"; + + src = fetchFromGitHub { + sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9"; + rev = "v${version}"; + repo = "libKeyFinder"; + owner = "ibsh"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Musical key detection for digital audio (C++ library)"; + homepage = http://www.ibrahimshaath.co.uk/keyfinder/; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ fftw qt5.base ]; + propagatedBuildInputs = [ boost ]; + + patchPhase = '' + substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out" + ''; + + configurePhase = '' + qmake + ''; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/include/keyfinder + cp *.h $out/include/keyfinder + ''; +} diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index f0e75b340592..12c360b32637 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, boost, fftw, qt5 }: +{ stdenv, fetchFromGitHub, fftw, qt5 }: -let version = "0.11"; in +let version = "2.1"; in stdenv.mkDerivation { name = "libkeyfinder-${version}"; src = fetchFromGitHub { - sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9"; + sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7"; rev = "v${version}"; repo = "libKeyFinder"; owner = "ibsh"; @@ -21,10 +21,11 @@ stdenv.mkDerivation { }; buildInputs = [ fftw qt5.base ]; - propagatedBuildInputs = [ boost ]; - patchPhase = '' - substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out" + postPatch = '' + substituteInPlace LibKeyFinder.pro \ + --replace "/usr/local" "$out" \ + --replace "-stdlib=libc++" "" ''; configurePhase = '' @@ -35,6 +36,8 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/include/keyfinder - cp *.h $out/include/keyfinder + install -m644 *.h $out/include/keyfinder + mkdir -p $out/lib + cp -a lib*.so* $out/lib ''; } diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch new file mode 100644 index 000000000000..99b022c0e782 --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_requirements.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2014-03-20 22:27:14.000000000 +0100 ++++ b/setup.py 2015-07-10 21:18:30.156196111 +0200 +@@ -49,7 +49,7 @@ + scripts = ['scripts/poezio'], + data_files = [('share/man/man1/', ['data/poezio.1'])], + +- install_requires = ['sleekxmpp==1.2.4', ++ install_requires = ['sleekxmpp==1.2.5', + 'dnspython3>=1.11.1'], + extras_require = {'OTR plugin': 'python-potr>=1.0', + 'Screen autoaway plugin': 'pyinotify==0.9.4'} diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch new file mode 100644 index 000000000000..aa431dcc928f --- /dev/null +++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch @@ -0,0 +1,25 @@ +diff -ruN a/src/config.py b/src/config.py +--- a/src/config.py 2014-03-20 22:27:05.000000000 +0100 ++++ b/src/config.py 2015-07-10 21:24:37.583136078 +0200 +@@ -18,6 +18,7 @@ + + import os + import logging ++import stat + + from configparser import RawConfigParser, NoOptionError, NoSectionError + from os import environ, makedirs, path, remove +@@ -279,6 +280,13 @@ + copy2(default, options.filename) + elif path.isfile(other): + copy2(other, options.filename) ++ ++ # Inside the nixstore, the reference file is readonly, so is the copy. ++ # Make it writable by the user who just created it. ++ if os.path.exists(options.filename): ++ os.chmod(options.filename, ++ os.stat(options.filename).st_mode | stat.S_IWUSR) ++ + firstrun = True + + try: diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index dc166da3ae1d..bbe35fe96996 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-06-30"; + version = "2015-07-12"; src = fetchgit { url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"; - rev = "ea901a57054441907e9b127ad407a8554532f992"; - sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67"; + rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf"; + sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index acfe421ac105..0c31c558c47e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc1"; - modDirVersion = "4.2.0-rc1"; + version = "4.2-rc2"; + modDirVersion = "4.2.0-rc2"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0a9zr1jf2c110lvd7wi4jxxk2iw6san31yh8hwlahkkb8kh4wliw"; + sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w"; }; features.iwlwifi = true; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 2460c511850f..12cd864ca7c4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv, coreutils }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ python which groff gettext ] ++ stdenv.lib.optional (!stdenv.isDarwin) man_db - ++ [ bc ]; + ++ [ bc coreutils ]; postInstall = '' - sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" + sed -e "s|bc|${bc}/bin/bc|" \ + -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ + -i "$out/share/fish/functions/seq.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 28359bb555d0..397b38180ebc 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, groff }: -with stdenv.lib; -stdenv.mkDerivation rec { - +let version = "51"; in +stdenv.mkDerivation { name = "mksh-${version}"; - version = "R50d"; src = fetchurl { urls = [ - "http://www.mirbsd.org/MirOS/dist/mir/mksh/${name}.tgz" - "http://pub.allbsd.org/MirOS/dist/mir/mksh/${name}.tgz" + "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" + "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "10prcdffwziksq9sw96c1r09h4kg2zwznybrggzmjfa6l4k8h9m2"; + sha256 = "1pyscl3w4aw067a5hb8mczy3z545jz1dwx9n2b09k09xydgsmvlz"; }; buildInputs = [ groff ]; @@ -31,7 +29,8 @@ stdenv.mkDerivation rec { install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc ''; - meta = { + meta = with stdenv.lib; { + inherit version; description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = stdenv.lib.licenses.free; + license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index bf71f9397cb6..910fe332d25e 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,17 +2,17 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.8"; + version = "1.12"; namePrefix = ""; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "0190yz65hfdq69xws4h1izxz59by0b437d7z1l4cf5ixkv16j17p"; + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; + sha256 = "09b9j2mygv1dsrq424j535c92wvlbzpwgzcgg7x922dxrnsdsxpr"; }; buildInputs = [ pythonPackages.sphinx attr ]; - propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch ]; + propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml ]; doCheck = false; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 95b34ed8960c..a9f507ec7f18 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.1.1"; in +let version = "4.1.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1d01f2i5fnnhkp184kfv8b9l37v1dmvqwqr22k71x6k2ss7nkwmp"; + sha256 = "04ig3gbfq0zccyqrcrl21g1kp1snqxaflb0i09izp2l6l3361nv2"; }; buildInputs = [ diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index feeb505b4c54..fb289f640bb8 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-21-g8c75168"; in +let version = "0.5.9-27-g3beaa23"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "8c75168ed5005f70955dd4ade93dec6abf481852"; - sha256 = "10awwwmpm555wl1z07pz20cq1lsy37r36m0aamck9ri5vyq6fdzw"; + rev = "3beaa23d4d33b51a392b56f110c8773151ac19cc"; + sha256 = "0k6p57zynrs0ffnvrhbcnfkmvrj6ay2bxpj44ggm7bv327ckdzm7"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index eda86a4a97ff..70dbc65040d4 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tpm-luks-${version}"; - version = "0.9pre"; + version = "git-2015-07-11"; src = fetchgit { - url = "https://github.com/shpedoikal/tpm-luks/"; - rev = "3fa3ea4bbd34b5b02e9271e775a338fa49dc834f"; - sha256 = "37a56f05ad492d3128b07b3cb9dbf85ba8a0dd791329323fb398eb1026dfc89c"; + url = "https://github.com/momiji/tpm-luks"; + rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa"; + sha256 = "fdd451caddb4e51ede3f2406245e1ace57389596e85aa402c9f2606303707539"; }; buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ]; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix new file mode 100644 index 000000000000..155817441736 --- /dev/null +++ b/pkgs/tools/text/xurls/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "xurls-${version}"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = "xurls"; + rev = "v${version}"; + sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p src/github.com/mvdan + ln -s $(pwd) src/github.com/mvdan/xurls + export GOPATH=$(pwd) + cd cmd/xurls + go build -v + ''; + + installPhase = '' + mkdir -p $out/bin + mv xurls $out/bin + ''; + + meta = with stdenv.lib; { + description = "Extract urls from text"; + homepage = https://github.com/mvdan/xurls; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dff899dd7d1a..6771a220bc06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2225,6 +2225,8 @@ let inherit (perlPackages) IOTty; }; + motuclient = python27Packages.motuclient; + mpage = callPackage ../tools/text/mpage { }; mr = callPackage ../applications/version-management/mr { }; @@ -3126,6 +3128,8 @@ let torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tpmmanager = callPackage ../applications/misc/tpmmanager { }; + tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; tpm-tools = callPackage ../tools/security/tpm-tools { }; @@ -3494,6 +3498,8 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + xurls = callPackage ../tools/text/xurls {}; + xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvkbd = callPackage ../tools/X11/xvkbd { @@ -7043,6 +7049,7 @@ let libkate = callPackage ../development/libraries/libkate { }; + libkeyfinder_0_11 = callPackage ../development/libraries/libkeyfinder/0.11.nix { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; libksba = callPackage ../development/libraries/libksba { }; @@ -9025,6 +9032,8 @@ let seabios = callPackage ../applications/virtualization/seabios { }; + cbfstool = callPackage ../applications/virtualization/cbfstool { }; + pgpool92 = pgpool.override { postgresql = postgresql92; }; pgpool93 = pgpool.override { postgresql = postgresql93; }; pgpool94 = pgpool.override { postgresql = postgresql94; }; @@ -12077,6 +12086,8 @@ let mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; + notion = callPackage ../applications/window-managers/notion { }; + openshift = callPackage ../applications/networking/cluster/openshift { }; panamax_api = callPackage ../applications/networking/cluster/panamax/api { @@ -12301,6 +12312,8 @@ let plugin-torture = callPackage ../applications/audio/plugin-torture { }; + poezio = python3Packages.poezio; + pommed = callPackage ../os-specific/linux/pommed { inherit (xorg) libXpm; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 726c8e4d05d0..97b98605cc24 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1977,6 +1977,23 @@ let self = _self // overrides; _self = with self; { }; }; + CryptOpenSSLAES = buildPerlPackage rec { + name = "Crypt-OpenSSL-AES-0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TT/TTAR/${name}.tar.gz"; + sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + meta = with stdenv.lib; { + homepage = https://metacpan.org/release/Crypt-OpenSSL-AES; + description = "Perl wrapper around OpenSSL's AES library"; + license = with licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + }; + }; + CryptOpenSSLBignum = buildPerlPackage rec { name = "Crypt-OpenSSL-Bignum-0.04"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad4b71760229..666af29cc8e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2848,6 +2848,25 @@ let }; }; + dnspython3 = buildPythonPackage rec { + name = "dnspython3-${version}"; + version = "1.12.0"; + + disabled = (!isPy3k); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dnspython3/${name}.zip"; + sha256 = "138wxj702vx6zni9g2y8dbgbpin95v6hk23rh2kwfr3q4130jqz9"; + }; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = http://www.dnspython.org; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = licenses.free; + }; + }; + docker = buildPythonPackage rec { name = "docker-py-1.1.0"; @@ -3820,6 +3839,32 @@ let }; }; + motuclient = buildPythonPackage rec { + name = "motu-client-${version}"; + version = "1.0.8"; + + namePrefix = ""; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://gitlab.com/lsix/motu-client/repository/archive.tar.gz?ref=${name}"; + sha256 = "1d2hbws085hxf5hb1wsdlacy8skwn2sswr1b2xv18fbw5ckbqi8i"; + }; + + meta = { + homepage = https://gitlab.com/lsix/motu-client; + description = "CLI to query oceanographic data to Motu servers"; + longDescription = '' + Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers. + This is a refactored fork of the original release in order to simplify integration, + deployment and packaging. Upstream code can be found at + http://sourceforge.net/projects/cls-motu/ . + ''; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.lsix ]; + }; + }; + mwlib-ext = buildPythonPackage rec { version = "0.13.2"; name = "mwlib.ext-${version}"; @@ -7928,6 +7973,25 @@ let }; }; + sleekxmpp = buildPythonPackage rec { + name = "sleekxmpp-${version}"; + version = "1.2.5"; + + disabled = (!isPy3k); + + propagatedBuildInputs = with self ; [ dnspython3 pyasn1 ]; + + src = pkgs.fetchurl { + url = "https://github.com/fritzy/SleekXMPP/archive/${version}.tar.gz"; + sha256 = "1hqs2w5d7x532psfqipd2wl1mkmsaak83jvp1rh9rv406fzp9h67"; + }; + + meta = { + description = "XMPP library for Python"; + license = licenses.mit; + homepage = "http://sleekxmpp.com/"; + }; + }; netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; @@ -16583,5 +16647,31 @@ let }; }; + poezio = buildPythonPackage rec { + name = "poezio-${version}"; + version = "0.8.1"; + + namePrefix = ""; + disabled = (!isPy3k); + propagatedBuildInputs = with self ; [ dnspython3 sleekxmpp ]; + + patches = + let patch_base = ../development/python-modules/poezio ; + in [ "${patch_base}/make_default_config_writable.patch" + "${patch_base}/fix_requirements.patch" + ]; + + src = pkgs.fetchurl { + url = "http://dev.louiz.org/attachments/download/52/${name}.tar.xz"; + sha256 = "0n3phh3lc82609ssfvqvd4papvhykd1sf2bm88dggh2x4mypwjff"; + }; + + meta = { + description = "Free console XMPP client"; + homepage = http://poez.io; + license = licenses.mit; + maintainers = [ maintainers.lsix ]; + }; + }; }; in pythonPackages |