diff options
768 files changed, 21320 insertions, 15072 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e847c73a8898..7e7c24187120 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,7 +3,7 @@ ###### Things done -Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. +<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, diff --git a/doc/functions.xml b/doc/functions.xml index 4a9015602afc..52bdf13eba9b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -358,8 +358,8 @@ <para> <varname>pkgs.dockerTools</varname> is a set of functions for creating and manipulating Docker images according to the - <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#docker-image-specification-v100"> - Docker Image Specification v1.0.0 + <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120"> + Docker Image Specification v1.2.0 </link>. Docker itself is not used to perform any of the operations done by these functions. </para> @@ -493,8 +493,8 @@ <varname>config</varname> is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the - <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#container-runconfig-field-descriptions"> - Docker Image Specification v1.0.0 + <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> + Docker Image Specification v1.2.0 </link>. </para> </callout> diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 68894994392b..930bd2616156 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -827,7 +827,7 @@ the work to be licensed" under the terms of the LGPL (including for free). The LGPL licensing for GMP is a problem for the overall licensing of binary programs compiled with GHC because most distributions (and builds) of GHC use -static libraries. (Dynamic libraries are currently distributed only for OS X.) +static libraries. (Dynamic libraries are currently distributed only for macOS.) The LGPL licensing situation may be worse: even though [The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) is essentially a "free software" license (BSD3), according to diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3c9df2e6e821..c100c9d0c20a 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -340,7 +340,7 @@ other packages we like to have in the environment, all specified with `propagate Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`. ```nix -with import <nixpkgs>; +with import <nixpkgs> {}; with pkgs.python35Packages; buildPythonPackage rec { @@ -423,7 +423,7 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as -respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter +respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in @@ -469,7 +469,6 @@ sets are * `pkgs.python26Packages` * `pkgs.python27Packages` -* `pkgs.python33Packages` * `pkgs.python34Packages` * `pkgs.python35Packages` * `pkgs.python36Packages` @@ -546,6 +545,35 @@ All parameters from `mkDerivation` function are still supported. * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. * `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +##### Overriding Python packages + +The `buildPythonPackage` function has a `overridePythonAttrs` method that +can be used to override the package. In the following example we create an +environment where we have the `blaze` package using an older version of `pandas`. +We override first the Python interpreter and pass +`packageOverrides` which contains the overrides for packages in the package set. + +```nix +with import <nixpkgs> {}; + +(let + python = let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs(old: rec { + version = "0.19.1"; + name = "pandas-${version}"; + src = super.fetchPypi { + pname = "pandas"; + inherit version; + sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295"; + }; + }); + }; + in pkgs.python3.override {inherit packageOverrides;}; + +in python.withPackages(ps: [ps.blaze])).env +``` + #### `buildPythonApplication` function The `buildPythonApplication` function is practically the same as `buildPythonPackage`. @@ -622,7 +650,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt ```nix with import <nixpkgs> {}; -(python33.withPackages (ps: [ps.numpy ps.requests])).env +(python36.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options @@ -755,17 +783,17 @@ In the following example we rename the `pandas` package and build it. ```nix with import <nixpkgs> {}; -let +(let python = let packageOverrides = self: super: { - pandas = super.pandas.override {name="foo";}; + pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; in pkgs.python35.override {inherit packageOverrides;}; -in python.pkgs.pandas +in python.withPackages(ps: [ps.pandas])).env ``` -Using `nix-build` on this expression will build the package `pandas` -but with the new name `foo`. +Using `nix-build` on this expression will build an environment that contains the +package `pandas` but with the new name `foo`. All packages in the package set will use the renamed package. A typical use case is to switch to another version of a certain package. diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 4b48f7ffa1b9..647a30481e3e 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -82,7 +82,7 @@ versions available from various packages. </para> <para>Resulting derivations for both builders also have two helpful -attributes, <literal>env</literal> and <literal>wrapper</literal>. +attributes, <literal>env</literal> and <literal>wrappedRuby</literal>. The first one allows one to quickly drop into <command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an @@ -110,15 +110,10 @@ the needed dependencies. For example, to make a derivation in stdenv.mkDerivation { name = "my-script"; - - buildInputs = [ env.wrapper ]; - + buildInputs = [ env.wrappedRuby ]; script = ./my-script.rb; - buildCommand = '' - mkdir -p $out/bin install -D -m755 $script $out/bin/my-script - patchShebangs $out/bin/my-script ''; }]]> </programlisting> diff --git a/doc/overlays.xml b/doc/overlays.xml index f8f554bb5569..ad31b90299e7 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -8,59 +8,62 @@ overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to compose the set of all packages.</para> +<para>Nixpkgs can be configured with a list of overlays, which are +applied in order. This means that the order of the overlays can be significant +if multiple layers override the same package.</para> + <!--============================================================--> <section xml:id="sec-overlays-install"> -<title>Installing Overlays</title> +<title>Installing overlays</title> -<para>The set of overlays is looked for in the following places. The -first one present is considered, and all the rest are ignored: +<para>The list of overlays is determined as follows: <orderedlist> <listitem> + <para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given, + then that is used. This can be passed explicitly when importing nipxkgs, for example + <literal>import <nixpkgs> { overlays = [ overlay1 overlay2 ] }</literal>.</para> - <para>As an argument of the imported attribute set. When importing Nixpkgs, - the <varname>overlays</varname> attribute argument can be set to a list of - functions, which is described in <xref linkend="sec-overlays-layout"/>.</para> - + <para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, + is passed to the system Nixpkgs in this way. Note that this does not affect the overlays for + non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para> </listitem> <listitem> + <para>Otherwise, if the Nix path entry <literal><nixpkgs-overlays></literal> exists and is a + directory, then the result is the set of overlays found in that directory, ordered lexicographically.</para> - <para>In the directory pointed to by the Nix search path entry - <literal><nixpkgs-overlays></literal>.</para> + <para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to + set a value for <literal><nixpkgs-overlays>.</literal></para> </listitem> <listitem> - - <para>In the directory <filename>~/.config/nixpkgs/overlays/</filename>.</para> + <para>Otherwise, if <filename>~/.config/nixpkgs/overlays/</filename> exists and is a directory, then + the result is the set of overlays found in that directory, ordered lexicographically.</para> </listitem> </orderedlist> </para> -<para>For the second and third options, the directory should contain Nix expressions defining the -overlays. Each overlay can be a file, a directory containing a -<filename>default.nix</filename>, or a symlink to one of those. The expressions should follow -the syntax described in <xref linkend="sec-overlays-layout"/>.</para> +<para>For the second and third options, overlays are extracted from the given directory as files, +directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para> -<para>The order of the overlay layers can influence the recipe of packages if multiple layers override -the same recipe. In the case where overlays are loaded from a directory, they are loaded in -alphabetical order.</para> - -<para>To install an overlay using the last option, you can clone the overlay's repository and add -a symbolic link to it in <filename>~/.config/nixpkgs/overlays/</filename> directory.</para> +<para>The last option provides a convenient way to install an overlay from a repository, +by cloning the overlay's repository and adding a symbolic link to it in +<filename>~/.config/nixpkgs/overlays/</filename>.</para> </section> <!--============================================================--> -<section xml:id="sec-overlays-layout"> -<title>Overlays Layout</title> +<section xml:id="sec-overlays-definition"> +<title>Defining overlays</title> -<para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of -packages.</para> +<para>Overlays are Nix functions which accept two arguments, +conventionally called <varname>self</varname> and <varname>super</varname>, +and return a set of packages. For example, the following is a valid overlay.</para> <programlisting> self: super: @@ -75,25 +78,31 @@ self: super: } </programlisting> -<para>The first argument, usually named <varname>self</varname>, corresponds to the final package +<para>The first argument (<varname>self</varname>) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of <varname>rr</varname> in the example above come from <varname>self</varname>, as well as the overridden dependencies used in the <varname>boost</varname> override.</para> -<para>The second argument, usually named <varname>super</varname>, +<para>The second argument (<varname>super</varname>) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current -overlay nor any of the following overlays. This set should be used either +overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of <varname>boost</varname> in the above example, comes from <varname>super</varname>, as well as the <varname>callPackage</varname> function.</para> <para>The value returned by this function should be a set similar to -<filename>pkgs/top-level/all-packages.nix</filename>, which contains +<filename>pkgs/top-level/all-packages.nix</filename>, containing overridden and/or new packages.</para> +<para>Overlays are similar to other methods for customizing Nixpkgs, in particular +the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>. +Indeed, <literal>packageOverrides</literal> acts as an overlay with only the +<varname>super</varname> argument. It is therefore appropriate for basic use, +but overlays are more powerful and easier to distribute.</para> + </section> </chapter> diff --git a/lib/deprecated.nix b/lib/deprecated.nix index d4e78c39250c..8cdfab381baf 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -309,48 +309,6 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; - # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults - # - # This function is best explained by an example: - # - # {version ? "2.x"}: - # - # mkDerivation (mergeAttrsByVersion "package-name" version - # { # version specific settings - # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; - # "2.x" = { src = ..; }; - # } - # { // shared settings - # buildInputs = [ common build inputs ]; - # meta = { .. } - # } - # ) - # - # Please note that e.g. Eelco Dolstra usually prefers having one file for - # each version. On the other hand there are valuable additional design goals - # - readability - # - do it once only - # - try to avoid duplication - # - # Marc Weber and Michael Raskin sometimes prefer keeping older - # versions around for testing and regression tests - as long as its cheap to - # do so. - # - # Very often it just happens that the "shared" code is the bigger part. - # Then using this function might be appropriate. - # - # Be aware that its easy to cause recompilations in all versions when using - # this function - also if derivations get too complex splitting into multiple - # files is the way to go. - # - # See misc.nix -> versionedDerivation - # discussion: nixpkgs: pull/310 - mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } - base - (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) - ]; - # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } listToAttrs (map (n: nameValuePair n lib.concat) diff --git a/lib/licenses.nix b/lib/licenses.nix index 8dd1c210b7fa..552874325d41 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -546,12 +546,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "zlib License"; }; - zpt20 = spdx { # FIXME: why zpt* instead of zpl* + zpl20 = spdx { spdxId = "ZPL-2.0"; fullName = "Zope Public License 2.0"; }; - zpt21 = spdx { + zpl21 = spdx { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e5286fa995ef..0f4e6fe22619 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -94,6 +94,7 @@ campadrenalin = "Philip Horger <campadrenalin@gmail.com>"; canndrew = "Andrew Cann <shum@canndrew.org>"; carlsverre = "Carl Sverre <accounts@carlsverre.com>"; + casey = "Casey Rodarmor <casey@rodarmor.net>"; cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>"; cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>"; changlinli = "Changlin Li <mail@changlinli.com>"; @@ -215,6 +216,7 @@ gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; + glenns = "Glenn Searby <glenn.searby@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; @@ -291,6 +293,7 @@ khumba = "Bryan Gardiner <bog@khumba.net>"; KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>"; kierdavis = "Kier Davis <kierdavis@gmail.com>"; + kiloreux = "Kiloreux Emperex <kiloreux@gmail.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>"; konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>"; @@ -314,6 +317,7 @@ lihop = "Leroy Hopson <nixos@leroy.geek.nz>"; linquize = "Linquize <linquize@yahoo.com.hk>"; linus = "Linus Arver <linusarver@gmail.com>"; + lluchs = "Lukas Werling <lukas.werling@gmail.com>"; lnl7 = "Daiderd Jordan <daiderd@gmail.com>"; loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; @@ -377,6 +381,7 @@ MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; mounium = "Katona László <muoniurn@gmail.com>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; + mpcsh = "Mark Cohen <m@mpc.sh>"; mpscholten = "Marc Scholten <marc@mpscholten.de>"; mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; @@ -503,6 +508,7 @@ ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>"; ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>"; ryantm = "Ryan Mulligan <ryan@ryantm.com>"; + rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>"; rycee = "Robert Helgesson <robert@rycee.net>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>"; @@ -510,6 +516,7 @@ samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sargon = "Daniel Ehlers <danielehlers@mindeye.net>"; + sauyon = "Sauyon Lee <s@uyon.co>"; schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>"; schristo = "Scott Christopher <schristopher@konputa.com>"; @@ -631,6 +638,7 @@ zauberpony = "Elmar Athmer <elmar@athmer.org>"; zef = "Zef Hemel <zef@zef.me>"; zimbatm = "zimbatm <zimbatm@zimbatm.com>"; + Zimmi48 = "Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>"; zohl = "Al Zohali <zohl@fmap.me>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; zraexy = "David Mell <zraexy@gmail.com>"; diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 4a74e406b14c..b97f989d902c 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,7 +11,7 @@ a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of -block devices. If you're on OS X you can run <command>diskutil list</command> +block devices. If you're on macOS you can run <command>diskutil list</command> to see the list of devices; the device you'll use for the USB must be ejected before writing the image.</para> diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index 6be8bc780f13..d2b2d5b7965c 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -17,11 +17,16 @@ <refsynopsisdiv> <cmdsynopsis> <command>nixos-option</command> - <arg choice='plain'><replaceable>option.name</replaceable></arg> + <arg> + <option>-I</option> + <replaceable>path</replaceable> + </arg> + <arg><option>--verbose</option></arg> + <arg><option>--xml</option></arg> + <arg choice="plain"><replaceable>option.name</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> - <refsection><title>Description</title> <para>This command evaluates the configuration specified in @@ -33,6 +38,45 @@ attributes contained in the attribute set.</para> </refsection> +<refsection><title>Options</title> + +<para>This command accepts the following options:</para> + +<variablelist> + + <varlistentry> + <term><option>-I</option> <replaceable>path</replaceable></term> + <listitem> + <para> + This option is passed to the underlying + <command>nix-instantiate</command> invocation. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>--verbose</option></term> + <listitem> + <para> + This option enables verbose mode, which currently is just + the Bash <command>set</command> <option>-x</option> debug mode. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>--xml</option></term> + <listitem> + <para> + This option causes the output to be rendered as XML. + </para> + </listitem> + </varlistentry> + +</variablelist> + +</refsection> + <refsection><title>Environment</title> <variablelist> diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 77ee9052fe52..a32f9963d1c5 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -130,6 +130,30 @@ rmdir /var/lib/ipfs/.ipfs instead. Refer to the description of the options for more details. </para> </listitem> + <listitem> + <para> + <literal>tlsdate</literal> package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + </para> + </listitem> + <listitem> + <para> + <literal>wvdial</literal> package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + </para> + </listitem> + <listitem> + <para> + <literal>cc-wrapper</literal>'s setup-hook now exports a number of + environment variables corresponding to binutils binaries, + (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, + etc). This is done to prevent packages' build systems guessing, which is + harder to predict, especially when cross-compiling. However, some packages + have broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. + </para> + </listitem> </itemizedlist> <para>Other notable improvements:</para> @@ -163,6 +187,15 @@ rmdir /var/lib/ipfs/.ipfs have therefore been removed. </para> </listitem> + <listitem> + <para> + The <option>time.timeZone</option> option now allows the value + <literal>null</literal> in addition to timezone strings. This value + allows changing the timezone of a system imperatively using + <command>timedatectl set-timezone</command>. The default timezone + is still UTC. + </para> + </listitem> </itemizedlist> diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 56766ec9047f..9c91bf392251 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -39,6 +39,12 @@ with lib; let + extensions = { + qcow2 = "qcow2"; + vpc = "vhd"; + raw = "img"; + }; + # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix # TODO: factor out more cleanly @@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM ( mv $diskImage $out/nixos.img diskImage=$out/nixos.img '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2 - diskImage=$out/nixos.qcow2 + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}} + diskImage=$out/nixos.${extensions.${format}} ''} ${postVM} ''; diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cdfac71634d4..d76fb644d029 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -22,15 +22,26 @@ in { generated image. Glob patterns work. ''; }; + + sizeMB = mkOption { + type = types.int; + default = if config.ec2.hvm then 2048 else 8192; + description = "The size in MB of the image"; + }; + + format = mkOption { + type = types.enum [ "raw" "qcow2" "vpc" ]; + default = "qcow2"; + description = "The image format to output"; + }; }; config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { inherit lib config; - inherit (cfg) contents; + inherit (cfg) contents format; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; - diskSize = if config.ec2.hvm then 2048 else 8192; - format = "qcow2"; + diskSize = cfg.sizeMB; configFile = pkgs.writeText "configuration.nix" '' { @@ -41,5 +52,4 @@ in { } ''; }; - } diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 16c43a99ad56..97278238dcd5 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -28,7 +28,8 @@ let passwdArray = [ "files" ] ++ optional sssd "sss" ++ optionals ldap [ "ldap" ] - ++ optionals mymachines [ "mymachines" ]; + ++ optionals mymachines [ "mymachines" ] + ++ [ "systemd" ]; shadowArray = [ "files" ] ++ optional sssd "sss" diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index b12ef2fe861d..8b9c3570476a 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -224,7 +224,7 @@ in { # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; - systemd.packages = [ cfg.package ]; + systemd.packages = [ overriddenPackage ]; }) (mkIf hasZeroconf { diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index cf3cc2f22628..5d339eaea485 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -118,6 +118,9 @@ in "/share/themes" "/share/vim-plugins" "/share/vulkan" + "/share/kservices5" + "/share/kservicetypes5" + "/share/kxmlgui5" ]; system.path = pkgs.buildEnv { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 84d89510679c..859838182ed4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -214,7 +214,7 @@ plex = 193; grafana = 196; skydns = 197; - ripple-rest = 198; + # ripple-rest = 198; # unused, removed 2017-08-12 nix-serve = 199; tvheadend = 200; uwsgi = 201; @@ -335,7 +335,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - #ddclient = 30; # unused + ddclient = 30; davfs2 = 31; disnix = 33; osgi = 34; @@ -489,7 +489,7 @@ sabnzbd = 194; #grafana = 196; #unused #skydns = 197; #unused - #ripple-rest = 198; #unused + # ripple-rest = 198; # unused, removed 2017-08-12 #nix-serve = 199; #unused #tvheadend = 200; #unused uwsgi = 201; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7dea5cb9dad..1da1ea5ae115 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -105,7 +105,6 @@ ./programs/venus.nix ./programs/vim.nix ./programs/wireshark.nix - ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/zsh/oh-my-zsh.nix @@ -324,7 +323,6 @@ ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix - ./services/misc/ripple-rest.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix @@ -517,7 +515,6 @@ ./services/networking/teamspeak3.nix ./services/networking/tinc.nix ./services/networking/tftpd.nix - ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/toxvpn.nix ./services/networking/tvheadend.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 0a0838431da7..0ab210cc4c39 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -59,4 +59,10 @@ with lib; # the feature at runtime. Attempting to create a user namespace # with unshare will then fail with "no space left on device". boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0; + + # Raise ASLR entropy for 64bit & 32bit, respectively. + # + # Note: mmap_rnd_compat_bits may not exist on 64bit. + boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32; + boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16; } diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 8af55f38992f..addc9dcca87e 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -92,7 +92,7 @@ in ''); assertions = [ - { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent; + { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!"; } ]; diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix deleted file mode 100644 index 1ed929ed4afa..000000000000 --- a/nixos/modules/programs/wvdial.nix +++ /dev/null @@ -1,71 +0,0 @@ -# Global configuration for wvdial. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - configFile = '' - [Dialer Defaults] - PPPD PATH = ${pkgs.ppp}/sbin/pppd - ${config.environment.wvdial.dialerDefaults} - ''; - - cfg = config.environment.wvdial; - -in -{ - ###### interface - - options = { - - environment.wvdial = { - - dialerDefaults = mkOption { - default = ""; - type = types.str; - example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"''; - description = '' - Contents of the "Dialer Defaults" section of - <filename>/etc/wvdial.conf</filename>. - ''; - }; - - pppDefaults = mkOption { - default = '' - noipdefault - usepeerdns - defaultroute - persist - noauth - ''; - type = types.str; - description = "Default ppp settings for wvdial."; - }; - - }; - - }; - - ###### implementation - - config = mkIf (cfg.dialerDefaults != "") { - - environment = { - - etc = - [ - { source = pkgs.writeText "wvdial.conf" configFile; - target = "wvdial.conf"; - } - { source = pkgs.writeText "wvdial" cfg.pppDefaults; - target = "ppp/peers/wvdial"; - } - ]; - - }; - - }; - -} diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index dd88624f406c..9ffe9fdea2ce 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -68,9 +68,9 @@ let collectd = [{ enabled = false; - typesdb = "${pkgs.collectd}/share/collectd/types.db"; + typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; database = "collectd_db"; - port = 25826; + bind-address = ":25826"; }]; opentsdb = [{ @@ -149,7 +149,6 @@ in type = types.attrs; }; }; - }; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 9d6395ebd74c..dd66bac442c6 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -24,7 +24,7 @@ <para> Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under - <productname>OS X</productname>, a "Mac port" edition is + <productname>macOS</productname>, a "Mac port" edition is available, which uses Apple's native GUI frameworks. </para> @@ -84,7 +84,7 @@ <listitem> <para> Emacs 25 with the "Mac port" patches, providing a more - native look and feel under OS X. + native look and feel under macOS. </para> </listitem> </varlistentry> diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix index 9fbec2457371..95825705d9d7 100644 --- a/nixos/modules/services/logging/fluentd.nix +++ b/nixos/modules/services/logging/fluentd.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.fluentd; + + pluginArgs = concatStringsSep " " (map (x: "-p ${x}") cfg.plugins); in { ###### interface @@ -28,6 +30,15 @@ in { defaultText = "pkgs.fluentd"; description = "The fluentd package to use."; }; + + plugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of plugin paths to pass into fluentd. It will make plugins defined in ruby files + there available in your config. + ''; + }; }; }; @@ -39,7 +50,7 @@ in { description = "Fluentd Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}"; + ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config} ${pluginArgs}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 9f0fb11f0252..a0dc0d6d089d 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -11,9 +11,7 @@ let password_secret = ${cfg.passwordSecret} root_username = ${cfg.rootUsername} root_password_sha2 = ${cfg.rootPasswordSha2} - elasticsearch_cluster_name = ${cfg.elasticsearchClusterName} - elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled} - elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts} + elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts} message_journal_dir = ${cfg.messageJournalDir} mongodb_uri = ${cfg.mongodbUri} plugin_dir = /var/lib/graylog/plugins @@ -91,22 +89,10 @@ in ''; }; - elasticsearchClusterName = mkOption { - type = types.str; - example = "graylog"; - description = "This must be the same as for your Elasticsearch cluster"; - }; - - elasticsearchDiscoveryZenPingMulticastEnabled = mkOption { - type = types.bool; - default = false; - description = "Whether to use elasticsearch multicast discovery"; - }; - - elasticsearchDiscoveryZenPingUnicastHosts = mkOption { - type = types.str; - default = "127.0.0.1:9300"; - description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details"; + elasticsearchHosts = mkOption { + type = types.listOf types.str; + example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; + description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; }; messageJournalDir = mkOption { diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 94db0ac0eea5..01ae49d49090 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -213,8 +213,8 @@ let wakeupDefined = options.wakeup.isDefined; wakeupUCDefined = options.wakeupUnusedComponent.isDefined; finalValue = toString config.wakeup - + optionalString (!config.wakeupUnusedComponent) "?"; - in if wakeupDefined && wakeupUCDefined then finalValue else "-"; + + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?"; + in if wakeupDefined then finalValue else "-"; in [ config.name diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix deleted file mode 100644 index 49520f68a50a..000000000000 --- a/nixos/modules/services/misc/ripple-rest.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.rippleRest; - - configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON { - config_version = "2.0.3"; - debug = cfg.debug; - port = cfg.port; - host = cfg.host; - ssl_enabled = cfg.ssl.enable; - ssl = { - key_path = cfg.ssl.keyPath; - cert_path = cfg.ssl.certPath; - reject_unathorized = cfg.ssl.rejectUnathorized; - }; - db_path = cfg.dbPath; - max_transaction_fee = cfg.maxTransactionFee; - rippled_servers = cfg.rippleds; - }); - -in { - options.services.rippleRest = { - enable = mkEnableOption "ripple rest"; - - debug = mkEnableOption "debug for ripple-rest"; - - host = mkOption { - description = "Ripple rest host."; - default = "localhost"; - type = types.str; - }; - - port = mkOption { - description = "Ripple rest port."; - default = 5990; - type = types.int; - }; - - ssl = { - enable = mkEnableOption "ssl"; - - keyPath = mkOption { - description = "Path to the ripple rest key file."; - default = null; - type = types.nullOr types.path; - }; - - - certPath = mkOption { - description = "Path to the ripple rest cert file."; - default = null; - type = types.nullOr types.path; - }; - - rejectUnathorized = mkOption { - description = "Whether to reject unatohroized."; - default = true; - type = types.bool; - }; - }; - - dbPath = mkOption { - description = "Ripple rest database path."; - default = "${cfg.dataDir}/ripple-rest.db"; - type = types.path; - }; - - maxTransactionFee = mkOption { - description = "Ripple rest max transaction fee."; - default = 1000000; - type = types.int; - }; - - rippleds = mkOption { - description = "List of rippled servers."; - default = [ - "wss://s1.ripple.com:443" - ]; - type = types.listOf types.str; - }; - - dataDir = mkOption { - description = "Ripple rest data directory."; - default = "/var/lib/ripple-rest"; - type = types.path; - }; - }; - - config = mkIf (cfg.enable) { - systemd.services.ripple-rest = { - wantedBy = [ "multi-user.target"]; - after = ["network.target" ]; - environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules"; - serviceConfig = { - ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}"; - User = "ripple-rest"; - }; - }; - - users.extraUsers.postgres = { - name = "ripple-rest"; - uid = config.ids.uids.ripple-rest; - createHome = true; - home = cfg.dataDir; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix index 388e4d4ac01d..ce2e1cf2d74b 100644 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -57,8 +57,8 @@ in { AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ - -web.listen-address :${toString cfg.port} \ - -config.file ${cfg.configFile} \ + --web.listen-address :${toString cfg.port} \ + --config.file ${cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 2018bfa14a57..054057d52ab1 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -8,22 +8,21 @@ let motdFile = builtins.toFile "rsyncd-motd" cfg.motd; - moduleConfig = name: - let module = getAttr name cfg.modules; in - "[${name}]\n " + (toString ( - map - (key: "${key} = ${toString (getAttr key module)}\n") - (attrNames module) - )); - - cfgFile = builtins.toFile "rsyncd.conf" - '' + foreach = attrs: f: + concatStringsSep "\n" (mapAttrsToList f attrs); + + cfgFile = '' ${optionalString (cfg.motd != "") "motd file = ${motdFile}"} ${optionalString (cfg.address != "") "address = ${cfg.address}"} ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"} ${cfg.extraConfig} - ${toString (map moduleConfig (attrNames cfg.modules))} - ''; + ${foreach cfg.modules (name: module: '' + [${name}] + ${foreach module (k: v: + "${k} = ${v}" + )} + '')} + ''; in { @@ -84,6 +83,24 @@ in }; }; + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to run the daemon as. + By default the daemon runs as root. + ''; + }; + + group = mkOption { + type = types.str; + default = "root"; + description = '' + The group to run the daemon as. + By default the daemon runs as root. + ''; + }; + }; }; @@ -91,16 +108,17 @@ in config = mkIf cfg.enable { - environment.etc = singleton { - source = cfgFile; - target = "rsyncd.conf"; - }; + environment.etc."rsyncd.conf".text = cfgFile; systemd.services.rsyncd = { description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + restartTriggers = [ config.environment.etc."rsyncd.conf".source ]; + serviceConfig = { + ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + User = cfg.user; + Group = cfg.group; + }; }; - }; } diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 87c4f7a8ebcb..b3b4d0c915ac 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -243,7 +243,7 @@ in }; }; - security.pam.services.sambda = {}; + security.pam.services.samba = {}; }) ]; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index f4d0fc822dea..9ccdacb20e91 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -22,6 +22,7 @@ let ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} allow-point-to-point=${yesNo allowPointToPoint} + ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} [wide-area] enable-wide-area=${yesNo wideArea} @@ -166,6 +167,15 @@ in ''; }; + cacheEntriesMax = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + Number of resource records to be cached per interface. Use 0 to + disable caching. Avahi daemon defaults to 4096 if not set. + ''; + }; + }; }; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 28c96a9baefc..9e56545f746c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,17 +1,33 @@ { config, pkgs, lib, ... }: let - - inherit (lib) mkOption mkIf singleton; - inherit (pkgs) ddclient; - - stateDir = "/var/spool/ddclient"; - ddclientUser = "ddclient"; - ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}"; - ddclientPIDFile = "${stateDir}/ddclient.pid"; + cfg = config.services.ddclient; + boolToStr = bool: if bool then "yes" else "no"; + + configText = '' + # This file can be used as a template for configFile or is automatically generated by Nix options. + daemon=${toString cfg.interval} + cache=${cfg.homeDir}/ddclient.cache + pid=/run/ddclient/ddclient.pid + foreground=NO + use=${cfg.use} + login=${cfg.username} + password=${cfg.password} + protocol=${cfg.protocol} + ${let server = cfg.server; in + lib.optionalString (server != "") "server=${server}"} + ssl=${boolToStr cfg.ssl} + wildcard=YES + quiet=${boolToStr cfg.quiet} + verbose=${boolToStr cfg.verbose} + ${cfg.domain} + ${cfg.extraConfig} + ''; in +with lib; + { ###### interface @@ -28,6 +44,12 @@ in ''; }; + homeDir = mkOption { + default = "/var/lib/ddclient"; + type = str; + description = "Home directory for the daemon user."; + }; + domain = mkOption { default = ""; type = str; @@ -52,6 +74,12 @@ in ''; }; + interval = mkOption { + default = 600; + type = int; + description = "The interval at which to run the check and update."; + }; + configFile = mkOption { default = "/etc/ddclient.conf"; type = path; @@ -126,37 +154,24 @@ in config = mkIf config.services.ddclient.enable { - environment.systemPackages = [ ddclient ]; + users = { + extraGroups.ddclient.gid = config.ids.gids.ddclient; - users.extraUsers = singleton { - name = ddclientUser; - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - home = stateDir; + extraUsers.ddclient = { + uid = config.ids.uids.ddclient; + description = "ddclient daemon user"; + group = "ddclient"; + home = cfg.homeDir; + createHome = true; + }; }; environment.etc."ddclient.conf" = { - enable = config.services.ddclient.configFile == "/etc/ddclient.conf"; + enable = cfg.configFile == "/etc/ddclient.conf"; uid = config.ids.uids.ddclient; + gid = config.ids.gids.ddclient; mode = "0600"; - text = '' - # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=600 - cache=${stateDir}/ddclient.cache - pid=${ddclientPIDFile} - use=${config.services.ddclient.use} - login=${config.services.ddclient.username} - password=${config.services.ddclient.password} - protocol=${config.services.ddclient.protocol} - ${let server = config.services.ddclient.server; in - lib.optionalString (server != "") "server=${server}"} - ssl=${if config.services.ddclient.ssl then "yes" else "no"} - wildcard=YES - quiet=${if config.services.ddclient.quiet then "yes" else "no"} - verbose=${if config.services.ddclient.verbose then "yes" else "no"} - ${config.services.ddclient.domain} - ${config.services.ddclient.extraConfig} - ''; + text = configText; }; systemd.services.ddclient = { @@ -166,17 +181,14 @@ in restartTriggers = [ config.environment.etc."ddclient.conf".source ]; serviceConfig = { - # Uncomment this if too many problems occur: - # Type = "forking"; - User = ddclientUser; - Group = "nogroup"; #TODO get this to work - PermissionsStartOnly = "true"; - PIDFile = ddclientPIDFile; - ExecStartPre = '' - ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}" - ''; - ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}"; - #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this? + RuntimeDirectory = "ddclient"; + # we cannot run in forking mode as it swallows all the program output + Type = "simple"; + User = "ddclient"; + Group = "ddclient"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; + ProtectSystem = "full"; + PrivateTmp = true; }; }; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 077aeca457ea..ed658258c7f9 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -82,14 +82,13 @@ in }; resolverName = mkOption { - default = "dnscrypt.eu-nl"; + default = "random"; + example = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' The name of the DNSCrypt resolver to use, taken from - <filename>${resolverList}</filename>. The default - resolver is located in Holland, supports DNS security - extensions, and <emphasis>claims</emphasis> to not - keep logs. + <filename>${resolverList}</filename>. The default is to + pick a random non-logging resolver that supports DNSSEC. ''; }; diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 3a95b9c4ec94..c1a14931429a 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,12 +119,13 @@ in config = mkIf cfg.enable { - systemd.services.syncserver = { + systemd.services.syncserver = let + syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + in { after = [ "network.target" ]; description = "Firefox Sync Server"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ]; - environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + path = [ pkgs.coreutils syncServerEnv ]; preStart = '' if ! test -e ${cfg.privateConfig}; then umask u=rwx,g=x,o=x @@ -133,7 +134,7 @@ in echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}"; + serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; }; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 5451500b56f6..81915b5a2ef8 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -125,8 +125,8 @@ in description = '' Specifies the hashed password for the MQTT User. <option>hashedPassword</option> overrides <option>password</option>. - To generate hashed password install <literal>mkpasswd</literal> - package and run <literal>mkpasswd -m sha-512</literal>. + To generate hashed password install <literal>mosquitto</literal> + package and use <literal>mosquitto_passwd</literal>. ''; }; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 08ba2fdb1646..366bb2ed7a80 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -48,7 +48,7 @@ let # NAT from external ports to internal ports. ${concatMapStrings (fwd: '' iptables -w -t nat -A nixos-nat-pre \ - -i ${cfg.externalInterface} -p tcp \ + -i ${cfg.externalInterface} -p ${fwd.proto} \ --dport ${builtins.toString fwd.sourcePort} \ -j DNAT --to-destination ${fwd.destination} '') cfg.forwardPorts} @@ -133,12 +133,19 @@ in destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward tcp connection to destination ip:port"; + description = "Forward connection to destination ip:port"; + }; + + proto = mkOption { + type = types.str; + default = "tcp"; + example = "udp"; + description = "Protocol of forwarded connection"; }; }; }); default = []; - example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ]; + example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ]; description = '' List of forwarded ports from the external interface to @@ -151,38 +158,41 @@ in ###### implementation - config = mkIf config.networking.nat.enable { + config = mkMerge [ + { networking.firewall.extraCommands = mkBefore flushNat; } + (mkIf config.networking.nat.enable { - environment.systemPackages = [ pkgs.iptables ]; + environment.systemPackages = [ pkgs.iptables ]; - boot = { - kernelModules = [ "nf_nat_ftp" ]; - kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = mkOverride 99 true; - "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + boot = { + kernelModules = [ "nf_nat_ftp" ]; + kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = mkOverride 99 true; + "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + }; }; - }; - networking.firewall = mkIf config.networking.firewall.enable { - extraCommands = mkMerge [ (mkBefore flushNat) setupNat ]; - extraStopCommands = flushNat; - }; + networking.firewall = mkIf config.networking.firewall.enable { + extraCommands = setupNat; + extraStopCommands = flushNat; + }; - systemd.services = mkIf (!config.networking.firewall.enable) { nat = { - description = "Network Address Translation"; - wantedBy = [ "network.target" ]; - after = [ "network-pre.target" "systemd-modules-load.service" ]; - path = [ pkgs.iptables ]; - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + systemd.services = mkIf (!config.networking.firewall.enable) { nat = { + description = "Network Address Translation"; + wantedBy = [ "network.target" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; + path = [ pkgs.iptables ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; - script = flushNat + setupNat; + script = flushNat + setupNat; - postStop = flushNat; - }; }; - }; + postStop = flushNat; + }; }; + }) + ]; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ab161b7e772c..2b7086afe7e8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -12,6 +12,7 @@ let dns = if cfg.useDnsmasq then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" + else if config.services.unbound.enable then "unbound" else "default"; configFile = writeText "NetworkManager.conf" '' diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index b70e44ff5422..7a786b54ccbb 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -166,12 +166,12 @@ in path = [ data.package ]; serviceConfig = { Type = "simple"; - PIDFile = "/run/tinc.${network}.pid"; Restart = "always"; RestartSec = "3"; }; preStart = '' mkdir -p /etc/tinc/${network}/hosts + chown tinc.${network} /etc/tinc/${network}/hosts # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix deleted file mode 100644 index 757cce287607..000000000000 --- a/nixos/modules/services/networking/tlsdated.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - inherit (pkgs) coreutils tlsdate; - - cfg = config.services.tlsdated; -in - -{ - - ###### interface - - options = { - - services.tlsdated = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tlsdated daemon. - ''; - }; - - extraOptions = mkOption { - type = types.string; - default = ""; - description = '' - Additional command line arguments to pass to tlsdated. - ''; - }; - - sources = mkOption { - type = types.listOf (types.submodule { - options = { - host = mkOption { - type = types.string; - description = '' - Remote hostname. - ''; - }; - port = mkOption { - type = types.int; - description = '' - Remote port. - ''; - }; - proxy = mkOption { - type = types.nullOr types.string; - default = null; - description = '' - The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed: - - http://127.0.0.1:8118 - socks4a://127.0.0.1:9050 - socks5://127.0.0.1:9050 - - The proxy support should not leak DNS requests and is suitable for use with Tor. - ''; - }; - }; - }); - default = [ - { - host = "encrypted.google.com"; - port = 443; - proxy = null; - } - ]; - description = '' - You can list one or more sources to fetch time from. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - # Make tools such as tlsdate available in the system path - environment.systemPackages = [ tlsdate ]; - - systemd.services.tlsdated = { - description = "tlsdated daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we - # hard-code base-path to /tmp and use PrivateTmp. - ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" '' - base-path /tmp - - ${concatMapStrings (src: '' - source - host ${src.host} - port ${toString src.port} - proxy ${if src.proxy == null then "none" else src.proxy} - end - '') cfg.sources} - ''} ${cfg.extraOptions}"; - PrivateTmp = "yes"; - }; - }; - - }; - -} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index a8cff638d3b2..8e5f0bfc070d 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -3,7 +3,12 @@ with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; - cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; + cmd = '' + @${pkgs.jre}/bin/java java \ + ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ + ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ + -jar ${stateDir}/lib/ace.jar + ''; mountPoints = [ { what = "${pkgs.unifi}/dl"; @@ -58,6 +63,26 @@ in ''; }; + services.unifi.initialJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 1024; + description = '' + Set the initial heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + + services.unifi.maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = null; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. If this option isn't set, the + JVM will decide this value at runtime. + ''; + }; + }; config = mkIf cfg.enable { @@ -121,8 +146,8 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${cmd} start"; - ExecStop = "${cmd} stop"; + ExecStart = "${(removeSuffix "\n" cmd)} start"; + ExecStop = "${(removeSuffix "\n" cmd)} stop"; User = "unifi"; PermissionsStartOnly = true; UMask = "0077"; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index be832ea45d8f..4f54b45639f6 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -79,6 +79,16 @@ let description = "A list of commands called after shutting down the interface."; }; + table = mkOption { + default = "main"; + type = types.str; + description = ''The kernel routing table to add this interface's + associated routes to. Setting this is useful for e.g. policy routing + ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric + table IDs and table names (/etc/rt_tables) can be used. Defaults to + "main".''; + }; + peers = mkOption { default = []; description = "Peers linked to the interface."; @@ -207,9 +217,11 @@ let "${ipCommand} link set up dev ${name}" - (map (peer: (map (ip: - "${ipCommand} route replace ${ip} dev ${name}" - ) peer.allowedIPs)) values.peers) + (map (peer: + (map (allowedIP: + "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" + ) peer.allowedIPs) + ) values.peers) values.postSetup ]); diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 10596d6431d0..3f1450ebfbd7 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -46,8 +46,20 @@ let ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed ''} '' + + hiddenServices + cfg.extraConfig; + hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs: + let + hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts); + in + "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n" + ) cfg.hiddenServices); + + mkHiddenServicePort = hsport: let + trgt = optionalString (hsport.target != null) (" " + hsport.target); + in "HiddenServicePort ${toString hsport.virtualPort}${trgt}"; + torRcFile = pkgs.writeText "torrc" torRc; in { @@ -229,11 +241,11 @@ in default = null; example = "450 GBytes"; description = '' - Specify maximum bandwidth allowed during an accounting - period. This allows you to limit overall tor bandwidth - over some time period. See the - <literal>AccountingMax</literal> option by looking at the - tor manual (<literal>man tor</literal>) for more. + Specify maximum bandwidth allowed during an accounting period. This + allows you to limit overall tor bandwidth over some time period. + See the <literal>AccountingMax</literal> option by looking at the + tor manual <citerefentry><refentrytitle>tor</refentrytitle> + <manvolnum>1</manvolnum></citerefentry> for more. Note this limit applies individually to upload and download; if you specify <literal>"500 GBytes"</literal> @@ -247,10 +259,11 @@ in default = null; example = "month 1 1:00"; description = '' - Specify length of an accounting period. This allows you to - limit overall tor bandwidth over some time period. See the - <literal>AccountingStart</literal> option by looking at - the tor manual (<literal>man tor</literal>) for more. + Specify length of an accounting period. This allows you to limit + overall tor bandwidth over some time period. See the + <literal>AccountingStart</literal> option by looking at the tor + manual <citerefentry><refentrytitle>tor</refentrytitle> + <manvolnum>1</manvolnum></citerefentry> for more. ''; }; @@ -279,9 +292,10 @@ in type = types.str; example = "143"; description = '' - What port to advertise for Tor connections. This corresponds - to the <literal>ORPort</literal> section in the Tor manual; see - <literal>man tor</literal> for more details. + What port to advertise for Tor connections. This corresponds to the + <literal>ORPort</literal> section in the Tor manual; see + <citerefentry><refentrytitle>tor</refentrytitle> + <manvolnum>1</manvolnum></citerefentry> for more details. At a minimum, you should just specify the port for the relay to listen on; a common one like 143, 22, 80, or 443 @@ -314,6 +328,72 @@ in ''; }; }; + + hiddenServices = mkOption { + type = types.attrsOf (types.submodule ({ + options = { + hiddenServicePorts = mkOption { + type = types.listOf (types.submodule { + options = { + virtualPort = mkOption { + type = types.int; + example = 80; + description = "Virtual port."; + }; + target = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1:8080"; + description = '' + Target virtual Port shall be mapped to. + + You may override the target port, address, or both by + specifying a target of addr, port, addr:port, or + unix:path. (You can specify an IPv6 target as + [addr]:port. Unix paths may be quoted, and may use + standard C escapes.) + ''; + }; + }; + }); + example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ]; + description = '' + If target is <literal>null</literal> the virtual port is mapped + to the same port on 127.0.0.1 over TCP. You may use + <literal>target</literal> to overwrite this behaviour (see + description of target). + + This corresponds to the <literal>HiddenServicePort VIRTPORT + [TARGET]</literal> option by looking at the tor manual + <citerefentry><refentrytitle>tor</refentrytitle> + <manvolnum>1</manvolnum></citerefentry> for more information. + ''; + }; + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra configuration. Contents will be added in the current + hidden service context. + ''; + }; + }; + })); + default = {}; + example = { + "/var/lib/tor/webserver" = { + hiddenServicePorts = [ { virtualPort = 80; } ]; + }; + }; + description = '' + Configure hidden services. + + Please consult the tor manual + <citerefentry><refentrytitle>tor</refentrytitle> + <manvolnum>1</manvolnum></citerefentry> for a more detailed + explanation. (search for 'HIDDEN'). + ''; + }; }; }; diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index f8dd75ea2c46..3429397d2cc2 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -85,12 +85,18 @@ in }; systemd.services."container-getty@" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM") + ]; restartIfChanged = false; }; systemd.services."console-getty" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") + ]; serviceConfig.Restart = "always"; restartIfChanged = false; enable = mkDefault config.boot.isContainer; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index c1d7d4ea06d4..2344b9922d0b 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -6,7 +6,22 @@ let cfg = config.services.confluence; - pkg = pkgs.atlassian-confluence; + pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }); in @@ -76,6 +91,42 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this Confluence instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this Confluence instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + + + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 0ab94d95eee8..19b6a8d30851 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -6,7 +6,22 @@ let cfg = config.services.jira; - pkg = pkgs.atlassian-jira; + pkg = pkgs.atlassian-jira.override { + enableSSO = cfg.sso.enable; + crowdProperties = '' + application.name ${cfg.sso.applicationName} + application.password ${cfg.sso.applicationPassword} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + }; in @@ -82,6 +97,40 @@ in }; }; + sso = { + enable = mkEnableOption "SSO with Atlassian Crowd"; + + crowd = mkOption { + type = types.str; + example = "http://localhost:8095/crowd"; + description = "Crowd Base URL without trailing slash"; + }; + + applicationName = mkOption { + type = types.str; + example = "jira"; + description = "Exact name of this JIRA instance in Crowd"; + }; + + applicationPassword = mkOption { + type = types.str; + description = "Application password of this JIRA instance in Crowd"; + }; + + validationInterval = mkOption { + type = types.int; + default = 2; + example = 0; + description = '' + Set to 0, if you want authentication checks to occur on each + request. Otherwise set to the number of minutes between request + to validate if the user is logged in or out of the Crowd SSO + server. Setting this value to 1 or higher will increase the + performance of Crowd's integration. + ''; + }; + }; + jrePackage = let jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; in mkOption { diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml index a1d8a5b7556a..21342d4454fb 100644 --- a/nixos/modules/services/web-apps/piwik-doc.xml +++ b/nixos/modules/services/web-apps/piwik-doc.xml @@ -23,16 +23,24 @@ and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: + <programlisting> + # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - ALTER USER root IDENTIFIED VIA unix_socket; CREATE DATABASE piwik; - CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket; + CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket; + GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + + # For MySQL + INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; + CREATE DATABASE piwik; + CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket; GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; </programlisting> + Then fill in <literal>piwik</literal> as database user and database name, and leave the password field blank. - This works with MariaDB and MySQL. This authentication works by allowing only the <literal>piwik</literal> unix - user to authenticate as <literal>piwik</literal> database (without needing a password), but no other users. + This authentication works by allowing only the <literal>piwik</literal> unix user to authenticate as the + <literal>piwik</literal> database user (without needing a password), but no other users. For more information on passwordless login, see <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />. </para> diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 2310912d0fde..293fa77107e3 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -36,6 +36,11 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; + + ${optionalString (cfg.resolver.addresses != []) '' + resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"}; + ''} ${optionalString (cfg.recommendedOptimisation) '' # optimisation @@ -116,6 +121,7 @@ let http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; ${cfg.httpConfig} }''} @@ -123,16 +129,32 @@ let ''; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: - let - ssl = vhost.enableSSL || vhost.forceSSL; - defaultPort = if ssl then 443 else 80; - - listenString = { addr, port, ... }: - "listen ${addr}:${toString (if port != null then port else defaultPort)} " + let + ssl = with vhost; addSSL || onlySSL || enableSSL; + + defaultListen = with vhost; + if listen != [] then listen + else if onlySSL || enableSSL then + singleton { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } + else singleton { addr = "0.0.0.0"; port = 80; ssl = false; } + ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } + ++ optional addSSL { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional (enableIPv6 && addSSL) { addr = "[::]"; port = 443; ssl = true; }; + + hostListen = + if !vhost.forceSSL + then defaultListen + else filter (x: x.ssl) defaultListen; + + listenString = { addr, port, ssl, ... }: + "listen ${addr}:${toString port} " + optionalString ssl "ssl http2 " - + optionalString vhost.default "default_server" + + optionalString vhost.default "default_server " + ";"; + redirectListen = filter (x: !x.ssl) defaultListen; + redirectListenString = { addr, ... }: "listen ${addr}:80 ${optionalString vhost.default "default_server"};"; @@ -153,7 +175,7 @@ let in '' ${optionalString vhost.forceSSL '' server { - ${concatMapStringsSep "\n" redirectListenString vhost.listen} + ${concatMapStringsSep "\n" redirectListenString redirectListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; ${optionalString vhost.enableACME acmeLocation} @@ -164,7 +186,7 @@ let ''} server { - ${concatMapStringsSep "\n" listenString vhost.listen} + ${concatMapStringsSep "\n" listenString hostListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; ${optionalString vhost.enableACME acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} @@ -383,6 +405,32 @@ in description = "Path to DH parameters file."; }; + resolver = mkOption { + type = types.submodule { + options = { + addresses = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]''; + description = "List of resolvers to use"; + }; + valid = mkOption { + type = types.str; + default = ""; + example = "30s"; + description = '' + By default, nginx caches answers using the TTL value of a response. + An optional valid parameter allows overriding it + ''; + }; + }; + }; + description = '' + Configures name servers used to resolve names of upstream servers into addresses + ''; + default = {}; + }; + virtualHosts = mkOption { type = types.attrsOf (types.submodule (import ./vhost-options.nix { inherit config lib; @@ -393,6 +441,7 @@ in example = literalExample '' { "hydra.example.com" = { + addSSL = true; forceSSL = true; enableACME = true; locations."/" = { @@ -409,11 +458,40 @@ in config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test - assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ + warnings = + let + deprecatedSSL = name: config: optional config.enableSSL + '' + config.services.nginx.virtualHosts.<name>.enableSSL is deprecated, + use config.services.nginx.virtualHosts.<name>.onlySSL instead. + ''; + + in flatten (mapAttrsToList deprecatedSSL virtualHosts); + + assertions = + let + hostOrAliasIsNull = l: l.root == null || l.alias == null; + in [ { assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts); message = "Only one of nginx root or alias can be specified on a location."; } + + { + assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts); + message = '' + Options services.nginx.service.virtualHosts.<name>.addSSL and + services.nginx.virtualHosts.<name>.onlySSL are mutually esclusive + ''; + } + + { + assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts); + message = '' + Option services.nginx.virtualHosts.<name>.forceSSL requires + services.nginx.virtualHosts.<name>.addSSL set to true. + ''; + } ]; systemd.services.nginx = { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 60260512bc2f..362f8ee90524 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -27,25 +27,21 @@ with lib; }; listen = mkOption { - type = with types; listOf (submodule { - options = { - addr = mkOption { type = str; description = "IP address."; }; - port = mkOption { type = nullOr int; description = "Port number."; }; - }; - }); - default = - [ { addr = "0.0.0.0"; port = null; } ] - ++ optional config.networking.enableIPv6 - { addr = "[::]"; port = null; }; + type = with types; listOf (submodule { options = { + addr = mkOption { type = str; description = "IP address."; }; + port = mkOption { type = int; description = "Port number."; default = 80; }; + ssl = mkOption { type = bool; description = "Enable SSL."; default = false; }; + }; }); + default = []; example = [ - { addr = "195.154.1.1"; port = 443; } - { addr = "192.168.1.2"; port = 443; } + { addr = "195.154.1.1"; port = 443; ssl = true;} + { addr = "192.154.1.1"; port = 80; } ]; description = '' Listen addresses and ports for this virtual host. IPv6 addresses must be enclosed in square brackets. - Setting the port to <literal>null</literal> defaults - to 80 for http and 443 for https (i.e. when enableSSL is set). + Note: this option overrides <literal>addSSL</literal> + and <literal>onlySSL</literal>. ''; }; @@ -70,16 +66,39 @@ with lib; ''; }; + addSSL = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable HTTPS in addition to plain HTTP. This will set defaults for + <literal>listen</literal> to listen on all interfaces on the respective default + ports (80, 443). + ''; + }; + + onlySSL = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable HTTPS and reject plain HTTP connections. This will set + defaults for <literal>listen</literal> to listen on all interfaces on port 443. + ''; + }; + enableSSL = mkOption { type = types.bool; + visible = false; default = false; - description = "Whether to enable SSL (https) support."; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether to always redirect to https."; + description = '' + Whether to add a separate nginx server block that permanently redirects (301) + all plain HTTP traffic to HTTPS. This option needs <literal>addSSL</literal> + to be set to true. + ''; }; sslCertificate = mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c043884f8e0b..2434aa1654a6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -176,7 +176,7 @@ in { services.xserver.updateDbusEnvironment = true; - environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" + environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules" "${gnome3.glib_networking.out}/lib/gio/modules" "${gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index e25a8ae22823..43de746ab1f1 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -29,6 +29,7 @@ in extraPackages = mkOption { default = self: []; + defaultText = "self: []"; example = literalExample '' haskellPackages: [ haskellPackages.xmonad-contrib diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index e9897cc01b6a..67cb2264e3f3 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -141,6 +141,7 @@ in system.build = mkOption { internal = true; default = {}; + type = types.attrs; description = '' Attribute set of derivations used to setup the system. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 46761fdc0e92..d12d0a06f444 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,7 +593,7 @@ in services.logind.extraConfig = mkOption { default = ""; type = types.lines; - example = "HandleLidSwitch=ignore"; + example = "IdleAction=lock"; description = '' Extra config options for systemd-logind. See man logind.conf for available options. diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix new file mode 100644 index 000000000000..0f0141abfb16 --- /dev/null +++ b/nixos/modules/virtualisation/cloud-image.nix @@ -0,0 +1,44 @@ +# Usage: +# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.cloudImage + +{ config, lib, pkgs, ... }: + +with lib; + +{ + system.build.cloudImage = import ../../lib/make-disk-image.nix { + inherit pkgs lib config; + partitioned = true; + diskSize = 1 * 1024; + configFile = pkgs.writeText "configuration.nix" + '' + { config, lib, pkgs, ... }: + + with lib; + + { + imports = [ <nixpkgs/nixos/modules/virtualisation/cloud-image.nix> ]; + } + ''; + }; + + imports = [ ../profiles/qemu-guest.nix ]; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + boot = { + kernelParams = [ "console=ttyS0" ]; + loader.grub.device = "/dev/vda"; + loader.timeout = 0; + }; + + networking.hostName = mkDefault ""; + + services.openssh = { + enable = true; + permitRootLogin = "without-password"; + passwordAuthentication = mkDefault false; + }; + + services.cloud-init.enable = true; +} diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index b24ea0f33c9e..ade0ba531cfa 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -15,7 +15,7 @@ let ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' ${optionalString cfg.qemuOvmf '' - nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"] + nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"] ''} ${cfg.qemuVerbatimConfig} ''; @@ -102,9 +102,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; - [ libvirt netcat-openbsd ] - ++ optional cfg.enableKVM qemu_kvm; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ]; boot.kernelModules = [ "tun" ]; @@ -129,7 +127,6 @@ in { dnsmasq ebtables ] - ++ optional cfg.enableKVM qemu_kvm ++ optional vswitch.enable vswitch.package; preStart = '' @@ -155,34 +152,31 @@ in { # Copy generated qemu config to libvirt directory cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf - # libvirtd puts the full path of the emulator binary in the machine - # config file. But this path can unfortunately be garbage collected - # while still being used by the virtual machine. So update the - # emulator path on each startup to something valid (re-scan $PATH). - for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do - test -f "$file" || continue - # get (old) emulator path from config file - emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file") - # get a (definitely) working emulator path by re-scanning $PATH - new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) - # write back - "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file" - - # Also refresh the OVMF path. Files with no matches are ignored. - "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file" - done - ''; # */ + # stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs + mkdir -p /run/libvirt/nix-emulators + ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/ + ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"} + ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"} + + ${optionalString cfg.qemuOvmf '' + mkdir -p /run/libvirt/nix-ovmf + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/ + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/ + ''} + ''; serviceConfig = { Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone - Restart = "on-failure"; + Restart = "no"; }; + restartIfChanged = false; }; systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ coreutils libvirt gawk ]; + restartIfChanged = false; }; systemd.sockets.virtlogd = { @@ -194,6 +188,7 @@ in { systemd.services.virtlogd = { description = "Virtual machine log manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd"; + restartIfChanged = false; }; systemd.sockets.virtlockd = { @@ -205,6 +200,7 @@ in { systemd.services.virtlockd = { description = "Virtual machine lock manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd"; + restartIfChanged = false; }; }; } diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5239652d4075..c7656bc309c0 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -16,6 +16,7 @@ in virtualisation.xen.enable = mkOption { default = false; + type = types.bool; description = '' Setting this option enables the Xen hypervisor, a diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ecbd317cb9a4..26e689a7c92d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,8 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" ] }: let @@ -19,10 +20,16 @@ let else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else set; + allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { + supportedSystems = supportedSystems ++ limitedSupportedSystems; + nixpkgs = nixpkgsSrc; + })) [ "unstable" ]; + in rec { nixos = removeMaintainers (import ./release.nix { - inherit stableBranch supportedSystems; + inherit stableBranch; + supportedSystems = supportedSystems ++ limitedSupportedSystems; nixpkgs = nixpkgsSrc; }); @@ -38,8 +45,11 @@ in rec { maintainers = [ pkgs.lib.maintainers.eelco ]; }; constituents = - let all = x: map (system: x.${system}) supportedSystems; in - [ nixos.channel + let + all = x: map (system: x.${system}) + (supportedSystems ++ limitedSupportedSystems); + in [ + nixos.channel (all nixos.dummy) (all nixos.manual) @@ -106,8 +116,8 @@ in rec { (all nixos.tests.xfce) nixpkgs.tarball - (all nixpkgs.emacs) - (all nixpkgs.jdk) + (all allSupportedNixpkgs.emacs) + (all allSupportedNixpkgs.jdk) ]; }); diff --git a/nixos/release.nix b/nixos/release.nix index 0dbdadf97816..9604da5a4d70 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" ] }: with import ../lib; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 74e20bff8d81..a12b7645bc28 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -6,6 +6,20 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }: let unit = if withFirewall then "firewall" else "nat"; + + routerBase = + lib.mkMerge [ + { virtualisation.vlans = [ 2 1 ]; + networking.firewall.enable = withFirewall; + networking.firewall.allowPing = true; + networking.nat.internalIPs = [ "192.168.1.0/24" ]; + networking.nat.externalInterface = "eth1"; + } + (lib.optionalAttrs withConntrackHelpers { + networking.firewall.connectionTrackingModules = [ "ftp" ]; + networking.firewall.autoLoadConntrackHelpers = true; + }) + ]; in { name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") @@ -30,20 +44,16 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ]; router = - { config, pkgs, ... }: - lib.mkMerge [ - { virtualisation.vlans = [ 2 1 ]; - networking.firewall.enable = withFirewall; - networking.firewall.allowPing = true; - networking.nat.enable = true; - networking.nat.internalIPs = [ "192.168.1.0/24" ]; - networking.nat.externalInterface = "eth1"; - } - (lib.optionalAttrs withConntrackHelpers { - networking.firewall.connectionTrackingModules = [ "ftp" ]; - networking.firewall.autoLoadConntrackHelpers = true; - }) - ]; + { config, pkgs, ... }: lib.mkMerge [ + routerBase + { networking.nat.enable = true; } + ]; + + routerDummyNoNat = + { config, pkgs, ... }: lib.mkMerge [ + routerBase + { networking.nat.enable = false; } + ]; server = { config, pkgs, ... }: @@ -57,9 +67,13 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, }; testScript = - { nodes, ... }: - '' - startAll; + { nodes, ... }: let + routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel; + routerClosure = nodes.router.config.system.build.toplevel; + in '' + $client->start; + $router->start; + $server->start; # The router should have access to the server. $server->waitForUnit("network.target"); @@ -87,13 +101,18 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, $router->succeed("ping -c 1 client >&2"); # If we turn off NAT, the client shouldn't be able to reach the server. - $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre"); - $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post"); + $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"); $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); $client->fail("ping -c 1 server >&2"); # And make sure that reloading the NAT job works. - $router->succeed("systemctl restart ${unit}"); + $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1"); + # FIXME: this should not be necessary, but nat.service is not started because + # network.target is not triggered + # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) + ${lib.optionalString (!withFirewall) '' + $router->succeed("systemctl start nat.service"); + ''} $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); ''; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index c2beb5590ef7..7f7bc0f0b4fe 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -3,7 +3,7 @@ # generated virtual hosts config. import ./make-test.nix ({ pkgs, ...} : { - name = "jenkins"; + name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mbbx6spp ]; }; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f97544b5ea52..f3bd4c5915b0 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. nixpkgs.config.packageOverrides = superPkgs: { - fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs - (_attrs: rec { - version = "0.3.3"; - name = "fontconfig-penultimate-${version}"; - src = pkgs.fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; - }; - }); + fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { + version = "0.3.3"; + sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9"; + }; }; }; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index e8a26365361d..a44dbbd62ce6 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages + preBuild = "unset AR"; + installPhase = '' mkdir -p $out/bin cp freicoin-qt $out/bin diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index b653ce82a678..9efab9a8babb 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 311836702122..e6ed05dd27f1 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix index 1e5d19b044a5..88d432fd1637 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; }; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; installPhase = '' mkdir -p $out/include diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index ddd34f1bfeb9..efb69d4c481f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -8,8 +8,8 @@ in stdenv.mkDerivation rec { version = "8"; src = fetchurl { - url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; - sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; + url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; + sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ]; @@ -24,7 +24,6 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://home.gna.org/a2jmidid; description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index e6addd6c4fdf..c482e44e7aa4 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./icon-names.diff ]; buildInputs = with gst_all_1; [ - glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf + glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ] ++ optional pulseaudioSupport libpulseaudio; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"' - '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"' - '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"') + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0 + --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index af0d2bbd0e9c..c597e42eaa6d 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "2.0"; + version = "2.1.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas"; + sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch deleted file mode 100644 index 4c17846b99df..000000000000 --- a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt ---- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600 -+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600 -@@ -158,6 +158,10 @@ - include_directories(${TAGLIB_INCLUDE_DIRS}) - include_directories(${QJSON_INCLUDE_DIRS}) - include_directories(${GSTREAMER_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS}) -+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) - include_directories(${GLIB_INCLUDE_DIRS}) - include_directories(${GLIBCONFIG_INCLUDE_DIRS}) - include_directories(${LIBXML_INCLUDE_DIRS}) diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch deleted file mode 100644 index 2240debd0e4a..000000000000 --- a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 -From: Chocobozzz <florian.chocobo@gmail.com> -Date: Wed, 16 Jul 2014 15:57:25 +0200 -Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 - ---- - src/CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 650fa74..775b0a5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) - if(HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) - -- # Hack to get it to generate interfaces without namespaces - required -- # because otherwise org::freedesktop::UDisks and -- # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) -- - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES - dbus/org.freedesktop.MediaPlayer.player.xml -@@ -964,6 +959,10 @@ if(HAVE_DBUS) - - # DeviceKit DBUS interfaces - if(HAVE_DEVICEKIT) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml -+ PROPERTIES NO_NAMESPACE dbus/udisks) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml -+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES - dbus/org.freedesktop.UDisks.xml - dbus/udisks) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch new file mode 100644 index 000000000000..226536a13ba7 --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23070d9..83b6772 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" + optional_component(VISUALISATIONS ON "Visualisations") + + if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) +- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " +- "code must be compiled in") + elseif(CRYPTOPP_FOUND) + set(HAVE_CRYPTOPP ON) + set(HAVE_SPOTIFY_DOWNLOADER ON) +@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD) + endif(HAVE_BREAKPAD) + + if(HAVE_SPOTIFY_BLOB) +- add_subdirectory(ext/clementine-spotifyblob) + endif(HAVE_SPOTIFY_BLOB) + + if(HAVE_MOODBAR) diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch index d41720c90215..344fc31d70dc 100644 --- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch +++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch @@ -1,25 +1,13 @@ -From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 4 May 2015 19:59:38 -0500 -Subject: [PATCH] Runtime selection of Spotify blob - ---- - src/internet/spotifyservice.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp -index 543744e..d987a36 100644 ---- a/src/internet/spotifyservice.cpp -+++ b/src/internet/spotifyservice.cpp -@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) +diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp +index 88c7383..6e0893c 100644 +--- a/src/internet/spotify/spotifyservice.cpp ++++ b/src/internet/spotify/spotifyservice.cpp +@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent) system_blob_path_ = QCoreApplication::applicationDirPath() + - "/../PlugIns/clementine-spotifyblob"; + "/../PlugIns/clementine-spotifyblob"; #else - system_blob_path_ = QCoreApplication::applicationDirPath() + + system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") + - "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; + "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX; #endif --- -2.3.6 - diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index c6e587b88a37..5b0d285f82d9 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base -, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist -, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig -, sparsehash, config, makeWrapper, runCommand, gst_plugins }: +{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp +, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf +, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }: let withSpotify = config.clementine.spotify or false; @@ -10,31 +10,36 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - version = "1.2.3"; + version = "1.3.1"; exeName = "clementine"; src = fetchurl { - url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; - sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz; + sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq"; }; patches = [ - ./clementine-1.2.1-include-paths.patch - ./clementine-dbus-namespace.patch ./clementine-spotify-blob.patch + # Required so as to avoid adding libspotify as a build dependency (as it is + # unfree and thus would prevent us from having a free package). + ./clementine-spotify-blob-remove-from-build.patch ]; buildInputs = [ boost cmake + chromaprint fftw gettext glew - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gvfs + libechonest liblastfm + libpulseaudio + pcre pkgconfig protobuf qca2 @@ -71,7 +76,12 @@ let blob = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine - inherit patches src; + inherit src; + + patches = [ + ./clementine-spotify-blob.patch + ]; + buildInputs = buildInputs ++ [ libspotify ]; # Only build and install the Spotify blob preBuild = '' @@ -119,7 +129,7 @@ runCommand "clementine-${version}" mkdir -p $out/bin makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" mkdir -p $out/share for dir in applications icons kde4; do diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index babbcc51e402..4da2228c6c13 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -13,13 +13,11 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper pythonPackages.mpd2 ]; - buildPhase = '' - echo skipping build phase... - ''; + dontBuild = true; installPhase = '' DESTDIR=$out PREFIX=/ make install - wrapProgram $out/bin/clerk $out/bin/clerk \ + wrapProgram $out/bin/clerk \ --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}" ''; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index c9346248438b..633ba3832c2c 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ concatMap (a: a.deps) opts; + makeFlags = [ "LD=$(CC)" ]; + meta = with stdenv.lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 7a2e2a6da45b..c42d290c5993 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An LV2 sample based drum plugin"; - homepage = http://www.drumgizmo.org; + homepage = https://www.drumgizmo.org; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 4b357f0c590f..f9c9dc2faef0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 4633718b40c6..f37b44f92317 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { improv. We leave mice and menus, and dive into our own process of making sound. - Freewheeling runs under Mac OS X and Linux, and is open source + Freewheeling runs under macOS and Linux, and is open source software, released under the GNU GPL license. '' ; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index d7cdfcf0d081..33265e1b3e8f 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mixxx.org; + homepage = https://mixxx.org; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 88c95086c1a1..cca2e1730f3b 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.0.5"; + version = "3.1.3"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9"; + sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 02a97dde4e24..ba550580cba5 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes - makeWrapper gnome3.dconf + makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { wrapProgram "$f" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done ''; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 42fe3e34cd42..52b9a57c00b2 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8"; + sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 17f795ad68db..471f78f0c072 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9" - build = "171.4220116"; - sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b"; + version = "3.0.0.10"; # "Android Studio 3.0 Beta 2" + build = "171.4263559"; + sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 39fe8fcb77e6..ec8bef7deee6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6"; + sha256 = "1gdasqpmbyasd05p5920aw6bf8j58crs51gxjslsgbl1azi4yfh2"; name = "${name}.deb"; }; @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { $out/share/atom/resources/app/apm/bin/node find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; + + paxmark m $out/share/atom/atom + paxmark m $out/share/atom/resources/app/apm/bin/node ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b5c0d4653681..0fd05f934c7c 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -752,10 +752,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.14.tar"; - sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx"; + url = "https://elpa.gnu.org/packages/exwm-0.15.tar"; + sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg"; }; packageRequires = [ xelb ]; meta = { @@ -1446,10 +1446,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170731.tar"; - sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl"; + url = "https://elpa.gnu.org/packages/org-20170807.tar"; + sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8caa31c5dadb..ce7c1845d596 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -169,12 +169,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "20160420.512"; + version = "20170808.645"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -822,8 +822,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1095,8 +1095,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; - sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; + rev = "15ee28a9dcf025f30626313ebd376c0586013c8e"; + sha256 = "187j3ixxrxkbja8xy7xgxpsx0ngwmn55gw0rnvlpj2pyz8vl192q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1112,12 +1112,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20170421.428"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c"; - sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw"; + rev = "6aaf1e634414e7485b47ff94aac6c34588f2a371"; + sha256 = "1dmb4q1xgf5mk4riihk2mmn7k182y9j1amcr8m2dmdw0hrgvsfcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1487,12 +1487,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170614.218"; + version = "20170803.414"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; - sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; + rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57"; + sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1508,12 +1508,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170629.2153"; + version = "20170803.1852"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "24f2495ab209f8f00b7883285637e207b6f07201"; - sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; + rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f"; + sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1794,8 +1794,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077"; - sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p"; + rev = "0f9576791b86e0b315447e6823b3a7db131cd826"; + sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2894,12 +2894,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170610.2241"; + version = "20170804.2158"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "d6222c2959caaca5c4980038756097da8a51e505"; - sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; + rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5"; + sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2978,12 +2978,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170117.1905"; + version = "20170803.916"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "44903ab7c349ef225499d642f249b6dfef5c5161"; - sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp"; + rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1"; + sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3101,27 +3101,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "20140520.203"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -3207,16 +3186,16 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170728.942"; + version = "20170805.447"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; - rev = "c9786234bdc32237e6c304e6a7c917504370358d"; - sha256 = "0x9vmq9q3hkljv2dz57q97szsv60sbiyp6bbzp3272ykz6snpj76"; + rev = "ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef"; + sha256 = "11ha04cfs8pm3f23hy4v8cfkfzkhig2mapwyq4brjcrbrwpac9zp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; packageRequires = [ emacs packed ]; @@ -3625,12 +3604,12 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20151025.2311"; + version = "20170803.1005"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410"; - sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2"; + rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d"; + sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; @@ -4044,12 +4023,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170702.237"; + version = "20170804.1135"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; - sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; + rev = "0ed6408f18bf13840f6f57638f86c3b9dfe4a07a"; + sha256 = "0pjxjgk39n6spman4grqgw2r82idld7agmc4q2j4f2gp9a0k2bll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4090,8 +4069,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "71b71e64900d0637e17013781042e086e9bf56e7"; - sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; + rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; + sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4424,12 +4403,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170718.1307"; + version = "20170806.1329"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "06d54b58f2ea5c49507164d97e8837406484a274"; - sha256 = "0a4xhq5y4vclv91zq83vb8irsvf0xly09y3zxvddyliy4bn3f8hi"; + rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e"; + sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4693,16 +4672,16 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20170127.516"; + version = "20170809.444"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a"; - sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy"; + rev = "3957374b970901ebd4a48509e97a8f78307cf1a5"; + sha256 = "1psrrw1770v9bb3i8kgc2fjqm8r48fxfys13raww2pcl9fy2j199"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac"; - sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; + sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897"; name = "bbyac"; }; packageRequires = [ browse-kill-ring cl-lib ]; @@ -4777,12 +4756,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170714.709"; + version = "20170801.2308"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "6e489758708cf7797ab3619cfdccd7422615dcda"; - sha256 = "0cjc9c2sr081b9nfspballb032h2809n1w3533v3ci8pcq82vq96"; + rev = "f8357cb7516ff9d7f86c1e7306a74f812a72dcb4"; + sha256 = "09n0810r00nli0jg1z3rcw8hpybsa5jxrh0gcg9n12hz5vyy3a36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -5069,12 +5048,12 @@ binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; - version = "20170725.121"; + version = "20170802.416"; src = fetchFromGitHub { owner = "davep"; repo = "binclock.el"; - rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876"; - sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk"; + rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad"; + sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; @@ -5361,12 +5340,12 @@ bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bliss-theme"; - version = "20141115.2301"; + version = "20170808.607"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-bliss-theme"; - rev = "2c6922cb24118722819bea79a981f066039d34a3"; - sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr"; + rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf"; + sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme"; @@ -5632,12 +5611,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170709.1244"; + version = "20170802.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "d45fecf0aca62f977ceb3b725aa7b7625ae82f33"; - sha256 = "1ma40xnbxdpb49c9w1i65g2q1hl0b731c2vagqazxw21ng36mf71"; + rev = "d5c4e762fcfad605b95125d8422f0071494ddd91"; + sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5674,12 +5653,12 @@ boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boron-theme"; - version = "20150117.952"; + version = "20170808.608"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-boron-theme"; - rev = "ea5873139424d6ca013b915876daf0399432015b"; - sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb"; + rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a"; + sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme"; @@ -5695,12 +5674,12 @@ boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20170418.835"; + version = "20170802.417"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; - sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; + rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5"; + sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; @@ -5923,12 +5902,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "20170116.1117"; + version = "20170806.1446"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -6070,12 +6049,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170109.1220"; + version = "20170806.1436"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; - sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + rev = "df326e330ec6342648cc3c599155d7efc1eed5f9"; + sha256 = "1y7k1d18a2w8jgqkbmzgvr4ws3yyymgphsnq0dmb3bi4a5q21n4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6884,12 +6863,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170801.117"; + version = "20170807.607"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "486d9a6aa6aac64a9c53555ec69980be5f3ad366"; - sha256 = "03rc80v44slqh4r9fdyl95mljcx4gspn1bij4kc1wzrs5anf8dig"; + rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97"; + sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -7282,12 +7261,12 @@ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "20170626.1403"; + version = "20170806.919"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6"; - sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h"; + rev = "1267447a38648502627005bfad0a3aef3572ef7d"; + sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; @@ -7307,8 +7286,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "089803189dafa145564b37b2e9340da547ff7c0c"; - sha256 = "07xd2pkz30nf09jv7vqb29n1vd3wc70p7j42f0zz22dcvx3iw2g3"; + rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e"; + sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7342,12 +7321,54 @@ license = lib.licenses.free; }; }) {}; + cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "cfml-mode"; + version = "20170808.1635"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "5f97dd05d73d33975503d52daafb83af41b152ae"; + sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode"; + sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp"; + name = "cfml-mode"; + }; + packageRequires = [ cftag-mode emacs mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/cfml-mode"; + license = lib.licenses.free; + }; + }) {}; + cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cftag-mode"; + version = "20170808.1635"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "5f97dd05d73d33975503d52daafb83af41b152ae"; + sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode"; + sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c"; + name = "cftag-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cftag-mode"; + license = lib.licenses.free; + }; + }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12278"; + rev = "12293"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7431,8 +7452,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; - sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; + rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; + sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7490,12 +7511,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "20170707.757"; + version = "20170802.418"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491"; - sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx"; + rev = "e90445124f3f145a047779e42d070a3c5e150f70"; + sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -7658,12 +7679,12 @@ chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-conv"; - version = "20160218.1315"; + version = "20170807.1428"; src = fetchFromGitHub { owner = "gucong"; repo = "emacs-chinese-conv"; - rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb"; - sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1"; + rev = "b56815bbb163d642e97fa73093b5a7e87cc32574"; + sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv"; @@ -7725,8 +7746,8 @@ src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; - sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; @@ -7891,8 +7912,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "71f737d444da95c6175b513d500c56ae9711bbd0"; - sha256 = "0z2djw2y0rzpm256jqihv19hn9q8b7x2mga3h5r2gwzw803134y9"; + rev = "9c3b1863a9e80cce672762fbbfeee98842da2a49"; + sha256 = "0pn8hrwq5ahzj3gckhczs1q7nblsfhvg6vdd8c5y1ak4hhygp563"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8162,13 +8183,13 @@ pname = "clang-format"; version = "20170120.137"; src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "309673"; + url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; + rev = "310509"; sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; - sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; + sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7"; name = "clang-format"; }; packageRequires = [ cl-lib ]; @@ -8549,12 +8570,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170725.2307"; + version = "20170807.1610"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; - sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; + rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172"; + sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8574,8 +8595,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; - sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; + rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172"; + sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8780,12 +8801,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170730.546"; + version = "20170804.430"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "7747ab37dfd678c3349d13ab8bcb9e5cff93c637"; - sha256 = "1p9vn3jnk3j0l2xm818dijfh5wm8l6y4ir2xiq6pqxf9v3qrp2lv"; + rev = "69cfce070ee9e23f45736aec7c92c7ce7c86b479"; + sha256 = "05qh9pigc37446x4ivpsi5j1q22jyjnmky5ja72dajibfrdg3zjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8805,8 +8826,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "748c192f8b8181f3df39ab4f6a07f25a45211c8f"; - sha256 = "1l4xx4lbm9xlvkq80dij7sydh0vnaj97ad42qjll9afwp6galp2b"; + rev = "92d16be9e6578600a273b338d003eb8908e5ed4e"; + sha256 = "0qrji1wc2alj5x6saj1kz96x0m50qd4b6yhb1ks7fpdy977r4paa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9155,12 +9176,12 @@ colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colonoscopy-theme"; - version = "20141115.2301"; + version = "20170808.609"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-colonoscopy-theme"; - rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936"; - sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6"; + rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead"; + sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme"; @@ -9322,12 +9343,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170730.241"; + version = "20170807.1724"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "51c95e37f02bc075a3d0d7a795dc7083ab57128b"; - sha256 = "16jbf9h0x0vw1mly4x0zrqvzs6wg16jplgy43kcnr8sc1xbj16xy"; + rev = "12da490d95bf2e64b62a2db27b88af6e6c823d6e"; + sha256 = "1py4y6dgd2vygwyn5zcxfw0hbg4bsd4yi6dyas30649s868s3b3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10154,12 +10175,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170729.429"; + version = "20170804.1202"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "1ab4b8e582450a1b1780e69c823d63c4622b8a1e"; - sha256 = "0i64qm7y0c93ca3fsydinab9l4mgr1kd4m0l06871583w3brjirf"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -10374,8 +10395,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10542,8 +10563,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10626,8 +10647,8 @@ src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53"; - sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s"; + rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799"; + sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10919,8 +10940,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11418,12 +11439,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170626.632"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "11096b95d1119847e746e4aae36c9de6163e5472"; - sha256 = "0ykm3cm6yrwp4a1b5rjjg9wzdp37w2rnjg1cyg2q33k31p49ywrf"; + rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; + sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11960,8 +11981,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "d7842388a1872b165489624a1a68f536de97e28d"; - sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; + rev = "2d421507afead407f9daae694df254b160c4ff65"; + sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12002,8 +12023,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "c95ca9f21a3524718a83c3415bb7102a508154be"; - sha256 = "1d1hrd57k23gg5sbm49y17a1ly55d0d07if2sm467sa0b12zk45m"; + rev = "878cc63ece3d9721f36f15aeca74a270d496adf0"; + sha256 = "094gss26440gikiq7d9bh7rmdy4bhnwq1bjdy7d8rr8d282x6ivm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12082,12 +12103,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "20170626.252"; + version = "20170802.420"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; - sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + rev = "973f66781bb4ccc01434d30bbff833cbbbfe1605"; + sha256 = "0am97ls9z4awak4y78xhdyzbs93vwk5jks9c48lhjy7vq3vr21zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -12103,12 +12124,12 @@ dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-light-theme"; - version = "20170724.1403"; + version = "20170808.1440"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-light-theme"; - rev = "5f1d506a8047cf8790ab50baf08b539645af6299"; - sha256 = "1kadp8h97zz26d3br0y9bakwi90c7rwgjya9z46m0mx9jjlpx5yw"; + rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4"; + sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme"; @@ -12124,12 +12145,12 @@ dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-theme"; - version = "20140211.2045"; + version = "20170801.1233"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-theme"; - rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235"; - sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy"; + rev = "232ad1be5f3572dcbdf528f1655109aa355a6937"; + sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme"; @@ -12166,12 +12187,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170726.1140"; + version = "20170809.19"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "ac13c74b76aaf646af2bec9d01fe29f1725baac6"; - sha256 = "1k51pm10qkp2svbzlajswgsyghad8v91djir6iyfdjl54qjhk56y"; + rev = "57c66e4741505b1f1c8147d413064d05cabfa69e"; + sha256 = "07g5x1shx6l1wn12jna4qr7ikn1d0whmksvgc5g2rj7p7j021yv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12208,12 +12229,12 @@ dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-krystal-theme"; - version = "20141115.2301"; + version = "20170808.600"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-dark-krystal-theme"; - rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664"; - sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx"; + rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc"; + sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme"; @@ -12917,17 +12938,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "20160610.1739"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -13107,11 +13130,11 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20170427.732"; + version = "20170803.354"; src = fetchsvn { url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "97"; - sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg"; + rev = "99"; + sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; @@ -13403,8 +13426,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13420,12 +13443,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20170719.346"; + version = "20170806.1203"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13589,8 +13612,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13610,8 +13633,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13736,8 +13759,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13757,8 +13780,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13818,8 +13841,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13839,8 +13862,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13856,12 +13879,12 @@ dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-single"; - version = "20151230.1758"; + version = "20170804.544"; src = fetchFromGitHub { owner = "crocket"; repo = "dired-single"; - rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934"; - sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2"; + rev = "0dcc645de6397bf12c33229de67a503e4490c618"; + sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single"; @@ -13939,8 +13962,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14646,12 +14669,12 @@ dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dna-mode"; - version = "20130821.1105"; + version = "20170804.114"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "dna-mode-el"; - rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a"; - sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n"; + rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a"; + sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode"; @@ -14759,16 +14782,16 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170730.1527"; + version = "20170808.58"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; - sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; + rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c"; + sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; - sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; name = "docker-compose-mode"; }; packageRequires = [ dash emacs yaml-mode ]; @@ -14906,12 +14929,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170727.1321"; + version = "20170809.734"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "70e99c07e626774f52008cacb3f7fc18453d97ce"; - sha256 = "160m5f05l32372i9qj611zmkf6bj5f7vnjprrkkx29ldz7f5pc0i"; + rev = "1cc44b94bfe960de7c5fbae0bd18ef33433f4e00"; + sha256 = "1axcyfwxxq0c2kixkmzw2lfhfcq97bgfajgawikk58p0hahdhxs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15023,6 +15046,27 @@ license = lib.licenses.free; }; }) {}; + dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dotnet"; + version = "20170808.1423"; + src = fetchFromGitHub { + owner = "julienXX"; + repo = "dotnet.el"; + rev = "514d36ec1090f78c999a7d6614176f03a0065a9d"; + sha256 = "1cg5hmkay5zj7ax8dnwipy5vsx2vg3ragvqbzizv71qasyr5vyjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet"; + sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki"; + name = "dotnet"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dotnet"; + license = lib.licenses.free; + }; + }) {}; download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; @@ -15341,7 +15385,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1803635"; + rev = "1804597"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15840,12 +15884,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170730.2031"; + version = "20170807.501"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; - sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; + rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c"; + sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15921,22 +15965,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170520.130"; + version = "20170802.113"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83"; + sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -16447,12 +16491,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170725.1610"; + version = "20170802.238"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1884ac61c2d8045bbb96465df7e29b2c740c48ed"; - sha256 = "1c8h7vndcf4dwp5zlwsdnw3mkmxmjifn7m660pnpxj52s2da3801"; + rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915"; + sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16552,12 +16596,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170729.659"; + version = "20170804.343"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "b3508bc998cebd4946b591d61b0bb4d5a56ef704"; - sha256 = "0r6g8pzf94n3h56fz933hq8jxf7chpj3kbgykj3ffabxkjxfn2rg"; + rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac"; + sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16602,12 +16646,12 @@ eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eg"; - version = "20170730.849"; + version = "20170801.617"; src = fetchFromGitHub { owner = "davep"; repo = "eg.el"; - rev = "4d9fb8f2f4905c25aefd0759e89fa13cb994cdeb"; - sha256 = "1d4lcf48m8ac2rmszx7l0nkmfr28fv2g3flwwpmb4zjkhz2k1gw0"; + rev = "03177033ebaecd4e9888cad35951cf4c2addfc88"; + sha256 = "0jf5fvakq6qvd351ad7lsx8j1xd70ygr582abksp3pgd88sn0r2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; @@ -16726,12 +16770,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170725.1457"; + version = "20170803.629"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4f5f29d3516d687025ad9423dc98bcd202efed56"; - sha256 = "17243a77m7y4abiwscf885wmci1mkln4axay49f44cyfcj3fk2i2"; + rev = "f47f020336f5ee32bfe7d27c53f6ca10eee2bc16"; + sha256 = "0lpmg05yfza0c4bgj9gjgz3d48pnizvsjjdk3qdw6sz748k9k415"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16932,12 +16976,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170723.19"; + version = "20170729.1712"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "cc26f37e19ebc60ca75067115d3794cda88003c5"; - sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w"; + rev = "f598a7537710f929c6f7592d8c543768361ba0de"; + sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -17119,12 +17163,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170502.550"; + version = "20170804.2142"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; - sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; + sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -17607,12 +17651,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170729.338"; + version = "20170807.1924"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "e3fca6d8f5bc176de26d37fe9c1b3e129f79cab0"; - sha256 = "1p30k2bws9r3j4dmdxin1dz31d751wyikqgyqs9wzcddk0cfrm46"; + rev = "4d44a51603b4004192d62fe58beb12c029709d89"; + sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17908,12 +17952,12 @@ elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-buffer-group"; - version = "20160105.803"; + version = "20170808.1825"; src = fetchFromGitHub { owner = "jeffgran"; repo = "elscreen-buffer-group"; - rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e"; - sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz"; + rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06"; + sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group"; @@ -18013,12 +18057,12 @@ elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elvish-mode"; - version = "20170729.1702"; + version = "20170808.1511"; src = fetchFromGitHub { owner = "ALSchwalm"; repo = "elvish-mode"; - rev = "72ac8385c0dc923ce2385f1e8c4aee3f6ef99d1c"; - sha256 = "0daw0wgd7rpdp78dsacw8kr2kcrhqg4082wdbzl14lyimpmzm4fy"; + rev = "4511171f2d8ee01d8a7b76c64f552fe5258af79f"; + sha256 = "0h4b6r3qbvcr1hgs2fiv3csq3iw11n0ilsv7dafn427gbadf0krf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; @@ -18055,16 +18099,16 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170712.510"; + version = "20170805.449"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; - rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; - sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; + rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; + sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -18160,12 +18204,12 @@ emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170410.1218"; + version = "20170807.1901"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18185,8 +18229,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18206,8 +18250,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18223,12 +18267,12 @@ emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20170410.1218"; + version = "20170806.1551"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -18927,12 +18971,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170731.425"; + version = "20170808.1134"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "6f6978d41126803ee61f614c91e791e6b5a36e38"; - sha256 = "1acqi07n3yncv2mz2qm6c46b2381j1fjmmrrlcg3yb72inqr73y7"; + rev = "08e6b4d98d1afeb637f27432349b4833320808a4"; + sha256 = "0yr4bfp5shvm49qbr9k47ayglr7im65d0is770brjfbxcb68ry95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19568,8 +19612,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e25f673d520342bfe7cd479ef6b850a57f8ab1ea"; - sha256 = "11gx8rqgxxnadgb1hizv6rdj7s9ib9m7bg8rm0ncvgrmykfaq8wm"; + rev = "48e35d38d7625a10395b03edb4337668abaa4905"; + sha256 = "15cq0gzczvin8xkdxrfj37819gx7hzdrcn5hx41q39cn1qzswxm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19731,12 +19775,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170724.1307"; + version = "20170803.1433"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "28f06589e07a22b7a1a1b19f79472c0bafb5fc32"; - sha256 = "0413706dxmql9sl2rwi7y9pqdka73lnpqwn5cvl2y4r279hdppv3"; + rev = "2e00707f42276b59fff2a32c64703e9586b22ae6"; + sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19899,12 +19943,12 @@ eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "eshell-fixed-prompt"; - version = "20170108.1301"; + version = "20170804.635"; src = fetchFromGitHub { owner = "mallt"; repo = "eshell-fixed-prompt-mode"; - rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af"; - sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; + rev = "4351b214de6d4e8e45279930448e2f93b491848e"; + sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; @@ -20399,12 +20443,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20170731.943"; + version = "20170807.1433"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "e2c6506a4d333ceb99dc64c34944beb0b34431c8"; - sha256 = "1knphaw3sw20wjvyqs9a1ppx0r04xif756ixxb2ymakhb8g0ifbh"; + rev = "f64c117b62a3715c438bfd85851029c1b4a45748"; + sha256 = "1fqasd25hgif1q9j6rxqqwyrqg48ykb5g12w34jsm8zgg50n43n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -20546,12 +20590,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170726.912"; + version = "20170802.1333"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; - sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; + rev = "45712ad214b0ad2257814705d6baa3f9120574cd"; + sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20903,12 +20947,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170724.211"; + version = "20170808.404"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "879114abeaad8515937cb2a762d0438b6b7bb026"; - sha256 = "0zia2z0nvsxmplg1d6dy45dj5pkvak2wqn7dw10yb9bj0shfhjmv"; + rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f"; + sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21008,12 +21052,12 @@ evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-lion"; - version = "20170523.450"; + version = "20170801.2232"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-lion"; - rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4"; - sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1"; + rev = "6667fe9891350b00596a8a335a68261c1f5ab504"; + sha256 = "1j3xy7b0b0rf1zznqjgd9gw1369w75h7i0kgmwgngn8xg5w9jl9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; @@ -21281,12 +21325,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170724.752"; + version = "20170802.1428"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "fc21477b2ac12b570c8428808f334d467a617e86"; - sha256 = "0fqk11mq4l7q7c5dv8049pmsggh3cmy4fhhq7c6h36dij02fkf01"; + rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de"; + sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21411,8 +21455,8 @@ src = fetchFromGitHub { owner = "naclander"; repo = "evil-search-highlight-persist"; - rev = "6e04a8c075f5fd62526d222447048faab8bfa187"; - sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6"; + rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e"; + sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; @@ -21449,12 +21493,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170702.302"; + version = "20170806.1150"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c50372d152b123fbf7bc26b49504505a22e82635"; - sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; + rev = "e247d6980093633f04431967819bf10b0d23c59c"; + sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21579,8 +21623,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; - sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; + rev = "45712ad214b0ad2257814705d6baa3f9120574cd"; + sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21886,6 +21930,27 @@ license = lib.licenses.free; }; }) {}; + exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exotica-theme"; + version = "20170809.558"; + src = fetchFromGitHub { + owner = "jbharat"; + repo = "exotica-theme"; + rev = "fbb34138ec48d505ac64e8141590f87777d82c2b"; + sha256 = "03k6vj4ckgccfrl906v0fpwxvp5gzkcsd3iy8k7h11jdbyhlbb3m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; + sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs"; + name = "exotica-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/exotica-theme"; + license = lib.licenses.free; + }; + }) {}; expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-line"; @@ -22015,12 +22080,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170708.1735"; + version = "20170809.413"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; - sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; + rev = "6adaee93a4f84806cf197dae872f00039a3ca87e"; + sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22742,8 +22807,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; - sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; + rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a"; + sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; @@ -22986,12 +23051,12 @@ firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firecode-theme"; - version = "20141115.2302"; + version = "20170808.611"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-firecode-theme"; - rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626"; - sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm"; + rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4"; + sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme"; @@ -23114,8 +23179,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; - sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; + rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; + sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23156,8 +23221,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; - sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; + rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; + sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -23243,12 +23308,12 @@ flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-black-theme"; - version = "20141115.2230"; + version = "20170808.612"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-flatland-black-theme"; - rev = "75fc4f1815feb23563a60477c02d70326b45c59e"; - sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1"; + rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07"; + sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme"; @@ -23429,12 +23494,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20170725.127"; + version = "20170802.1500"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0"; - sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -23555,12 +23620,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170730.1740"; + version = "20170802.22"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "c451140ef785dd7853445121866f9ea45889255b"; - sha256 = "0vnpnv7kcbgdrpnqw9mb3qn5lzi4493k8b5jwwl6rz5hrl84yrx3"; + rev = "ed08ce36e5cc97cfabb84ccaba84a00db917f082"; + sha256 = "1r6lrxc8wv73fh4ybq83awci92ajrbgila8b86vxgvhvhl8jcj6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24231,8 +24296,8 @@ src = fetchFromGitHub { owner = "stardiviner"; repo = "flycheck-inline"; - rev = "d24e3772b0ac6e40306ff25cebd7c6add696d54c"; - sha256 = "0hgcgyjrbdqsgf54wa3j6mkq41nq28n2hyysdgfgnn4kd2jmri40"; + rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545"; + sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline"; @@ -24602,6 +24667,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "20170730.651"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c"; + sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -24714,8 +24800,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24924,8 +25010,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25487,12 +25573,12 @@ flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-solidity"; - version = "20160424.720"; + version = "20170804.2344"; src = fetchFromGitHub { owner = "kootenpv"; repo = "flymake-solidity"; - rev = "b9a9aa78b84b2358c24a73a84fcd3d133a0423f1"; - sha256 = "06ndpccsqrnfgxpgsywgq81ykkxchm2dp0q2617klbihwngfr8w4"; + rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8"; + sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity"; @@ -26359,22 +26445,22 @@ license = lib.licenses.free; }; }) {}; - frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20170129.120"; + version = "20170802.455"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; - sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661"; + sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; name = "frames-only-mode"; }; - packageRequires = [ emacs seq ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/frames-only-mode"; license = lib.licenses.free; @@ -26517,12 +26603,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170730.1659"; + version = "20170809.146"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "f521a27332898aecf5b2ee710d67e1bcca380641"; - sha256 = "07lbjdiqyazvylk4ddb9789kyrnlllhnf67c770lsaagxn69scks"; + rev = "6e21d45c29dd03e6e6ec5d43f95b7a81832c3ca9"; + sha256 = "0fzc9b87qlp5phr9gxylnfsi2749zgcs5aqabqdc3fpqqhb7hhy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26543,18 +26629,19 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: + fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170709.139"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "bfd830f6b4b4c01a64a287395ea62d8e671b0891"; - sha256 = "1xnh1qp8gmn6g9sm0l1sh8k9j9x3y0vns8h5wh1i22bs420rl1w3"; + version = "20170805.2030"; + src = fetchFromGitHub { + owner = "factor"; + repo = "factor"; + rev = "3faad21b3d02fe81a2c0fae13ed14ad6652accc1"; + sha256 = "14h2mwg0ny3mn7hjqgb9r5661ar2jwamz90v69bx0kz0lmr9drmz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; + sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z"; name = "fuel"; }; packageRequires = [ cl-lib emacs ]; @@ -26629,12 +26716,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "function-args"; - version = "20170303.515"; + version = "20170809.1011"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "a559041e5fed851c889bcfed7553a4dcd855ffae"; - sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk"; + rev = "00a73c8ca4e6fd1eb5ea84e6fc9b277694713ba5"; + sha256 = "1higgnmrpp307vl9zb4qd40dcch9mwqmln1wv6v0a2kvzhd8nd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26675,8 +26762,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "68037c3af786aad0a605847278393babd0095203"; - sha256 = "180hxfh1igkhfnwd5613gvnqk1rmsncfyi28yd0plqryi3495822"; + rev = "0a1ca0538cc8a72f6065140b893001d5ec9d04b3"; + sha256 = "0i4rm8zkfa0d3arfwvhwbzxkbflhccj5202rqmgmjvkg18skl5l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26938,12 +27025,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170620.2012"; + version = "20170801.551"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; - sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; + rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b"; + sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -27005,8 +27092,8 @@ src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; - sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; + rev = "dd08e3d83d070eb8d041d66217b4591a55729024"; + sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27316,12 +27403,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170728.849"; + version = "20170803.601"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "e85479bf048e06740331234a67c07bcdb3e294c4"; - sha256 = "1sh8cwaaxlg0ja59lg70hl1lyhl9i7bfkamq3qz7kl2913axnzw2"; + rev = "887ba91d724c656c35fed3eecd2e7d826553ff91"; + sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27337,12 +27424,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20170517.1445"; + version = "20170806.1323"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423"; - sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn"; + rev = "153c194718abc74a49078b056c87959a39b35627"; + sha256 = "08svh16jdiz3rirk2wba6gwf8m3hhrhazlyb7idn4y22zc0am254"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27358,12 +27445,12 @@ gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20170603.906"; + version = "20170809.130"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d"; - sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc"; + rev = "573e4a8001e9585d347a99323a1649c2055ae5ff"; + sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -27530,8 +27617,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -29124,8 +29211,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "6c8669edb20249cd5534c78cfb48e7cf0978dda3"; - sha256 = "096jmch5wqzal8qd6f72bsh0wi1fwlmjsis4n888942mq84vk8jw"; + rev = "77f7f28d314862754877bf19a8b032158522f7aa"; + sha256 = "0354zk5j5fgin66vc9m63ca272bfq3vlqj5v34xqz26lqs3fpdb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29391,12 +29478,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170629.1129"; + version = "20170801.942"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "fb0cb14954e799dfa69d1aaf56e863db48c2c296"; - sha256 = "076bdkswajjzxb1jhwq71rwz8pn9klxk68r2ldab3pk9wlih4adn"; + rev = "2cad15190b417804d82edb4981e7b3e62907c4ee"; + sha256 = "12zssdd23hm5l27lja8q8b78wzq8zwzx8sxpqaqsm53bq6w23jmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29412,12 +29499,12 @@ govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "govet"; - version = "20150428.1159"; + version = "20170808.1024"; src = fetchFromGitHub { owner = "meshelton"; repo = "govet"; - rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70"; - sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb"; + rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf"; + sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet"; @@ -29521,8 +29608,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; - sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; + rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7"; + sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29881,12 +29968,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170731.150"; + version = "20170808.1211"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; - sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; + rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7"; + sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29944,12 +30031,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170730.1820"; + version = "20170809.719"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "813a2165b993014d6a3d02abfd077d711f7372fe"; - sha256 = "1hwv7jqmigwnwdq50dlbi1i8ddq33qi40jhfynh8855kz0c2gqh9"; + rev = "061bad7cbb939540a559b412b1cf2df25b45cbff"; + sha256 = "0wrqjmdipg515idi385d2yk0vxsq5dkdd0qg743ia90kndcfbwda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30091,12 +30178,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170702.724"; + version = "20170803.703"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; - sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; + rev = "f85e1bc2666a9d668c808984757862c9aa93d269"; + sha256 = "00iggj2vnjf3sy276mq79ia86ll83p9g426miy3n6ig8pr333sz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30661,8 +30748,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d"; - sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n"; + rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785"; + sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30864,12 +30951,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170731.1225"; + version = "20170809.345"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; - sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; + rev = "35149d27981f0d617ee84d05f7e91ced22b43302"; + sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31032,12 +31119,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20170625.328"; + version = "20170807.1239"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -31074,12 +31161,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170801.157"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; - sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31473,12 +31560,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170727.1245"; + version = "20170806.2108"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; - sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; + rev = "35149d27981f0d617ee84d05f7e91ced22b43302"; + sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32583,6 +32670,27 @@ license = lib.licenses.free; }; }) {}; + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + melpaBuild { + pname = "helm-lastpass"; + version = "20170808.511"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "helm-lastpass"; + rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2"; + sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; + sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; + name = "helm-lastpass"; + }; + packageRequires = [ csv emacs helm-core ]; + meta = { + homepage = "https://melpa.org/#/helm-lastpass"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -32858,12 +32966,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170726.1718"; + version = "20170807.611"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "58690a15a06f7dc645175f1b34c9e099ac68f018"; - sha256 = "14z0ivi69ja9zd0qjpf98jp1x8skdp3a7w9yy2h9ffjhm2c7pgaf"; + rev = "0bba7cdced06a93eefc9b04d05fdbddf08ad377f"; + sha256 = "0r9l4q7h5zk8i5f5hac54pvlb0y0nyzqy996lv6r8y2a734angay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33366,8 +33474,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34516,12 +34624,12 @@ highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-parentheses"; - version = "20151107.2316"; + version = "20170809.1151"; src = fetchFromGitHub { owner = "tsdh"; repo = "highlight-parentheses.el"; - rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f"; - sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r"; + rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1"; + sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses"; @@ -34700,6 +34808,27 @@ license = lib.licenses.free; }; }) {}; + himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: + melpaBuild { + pname = "himp"; + version = "20170808.1022"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "himp"; + rev = "dcc116b2509a74a3fab41be1c095e1f6fffc7923"; + sha256 = "00s4bb19jq48bldlcharym4757mbj0z5rag086p7mfhxa3wazmrm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp"; + sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla"; + name = "himp"; + }; + packageRequires = [ emacs vimish-fold ]; + meta = { + homepage = "https://melpa.org/#/himp"; + license = lib.licenses.free; + }; + }) {}; hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; @@ -34707,8 +34836,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "0721221ede01d6a3468e562fd7ea0df114de34e2"; - sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08"; + rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b"; + sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35054,12 +35183,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170729.742"; + version = "20170807.1130"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "ace6725f72efd50556f52c359f7b1836b956fa2b"; - sha256 = "1r7vww10dvv843zgmg62wwv2b6fw8nx73lsqzj5j01pi3zxz74vm"; + rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e"; + sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35703,12 +35832,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170722.818"; + version = "20170803.1319"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "943636fe4a35298d9d234222bc4520dec9ef2305"; - sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; + rev = "ab67b29835ed550427b75e94784b63d98a00c0e0"; + sha256 = "0mlzgql5xrjgbk9f269jnf3kxvymlcwnlvak4dfk2gwvi56phjzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36093,22 +36222,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170719.119"; + version = "20170807.1445"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9"; - sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -36411,16 +36540,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170718.1033"; + version = "20170807.1445"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9"; - sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -36764,12 +36893,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "20160831.356"; + version = "20170805.1155"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -36996,8 +37125,8 @@ src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; - sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -37034,12 +37163,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170728.546"; + version = "20170803.418"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "565c0b984d19c62b7a85efd69ae195b592d62f7f"; - sha256 = "0rqc1n4z2w5i48ma29mrbb90350kxfgzk0vf8wdnksa78ja87yyn"; + rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a"; + sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -37076,12 +37205,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170728.1109"; + version = "20170808.1327"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "a64f1ffc81539d40df9e89802bbebf14a0d19f83"; - sha256 = "0cmh6mv319m4i2y89rl63z2k3634d4ldg18yy3aal44ljxrbdslq"; + rev = "ee843f08cf6f862b298728103c142ce56824dfc4"; + sha256 = "070yw07fcimblzy94pg1mvf7n5dv91wwq7kwyys4zkm92ypl874l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37126,12 +37255,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170730.119"; + version = "20170809.114"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "aaaeef6a4b1f41ebc3ab11ff28d6fa5938f762d4"; - sha256 = "19qjamjpm96wwv4ni2lbzwrb73d5xwfkrq6lvy32k6rav5r7lx1d"; + rev = "21d3e978652bcbb995954bf95e80c0ee4669701a"; + sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37272,10 +37401,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170730.2148"; + version = "20170807.2112"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0xg4cw8s5ildc7iyyvy6xxri3cy00g06b10022izlhbxy7crdgai"; + sha256 = "13l62fjq7g79s0ycj506fsvi16mmf1kqiqhbrj6f5n2j962k1qaf"; name = "info+.el"; }; recipeFile = fetchurl { @@ -37648,12 +37777,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170728.814"; + version = "20170807.2147"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "28271d50ca65c460cd0983cea13a2c4509b95583"; - sha256 = "0b73cwr68sdi5vc486952x0iv95hwyw79gymp91kyi558wxdssp3"; + rev = "453d6d64c88df8ada4d6b9e4004c392d219e3799"; + sha256 = "13wm0kz4ijl2smpw5ws5v97j19df5m9yw2iv4xgpcg4if9aby67y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38272,12 +38401,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170728.1036"; + version = "20170806.1231"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38293,12 +38422,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170801.157"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; - sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38402,8 +38531,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38507,8 +38636,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39236,12 +39365,12 @@ jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; - version = "20160216.2035"; + version = "20170808.1830"; src = fetchFromGitHub { owner = "jeffgran"; repo = "jg-quicknav"; - rev = "1b598ee3d691b68dc64f1727a959eab538893d07"; - sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4"; + rev = "c8d53e774d63e68a944092c08a026b57da741038"; + sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav"; @@ -39465,12 +39594,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20170627.1952"; + version = "20170808.527"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; - sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; + rev = "eb4744122724b24e492c2171fff438e3ee2045a8"; + sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -39591,12 +39720,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170721.602"; + version = "20170804.335"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc"; - sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy"; + rev = "91c745ad062d454834f646dcd16be6856a1db8b3"; + sha256 = "0qr2pd2zhhwl6jw8mqy25wnig9v9nicc7plan0ni4dlbhljrx3rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -40027,6 +40156,27 @@ license = lib.licenses.free; }; }) {}; + jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jump-tree"; + version = "20170809.708"; + src = fetchFromGitHub { + owner = "yangwen0228"; + repo = "jump-tree"; + rev = "ff010ee6acfa9bee2486dd7b3384c12a802b0191"; + sha256 = "1w7sncr5gdlyqk3bvm7zjif5yxp9sa6v82kk5zx04qdbsn9dn308"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; + sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj"; + name = "jump-tree"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/jump-tree"; + license = lib.licenses.free; + }; + }) {}; jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jumplist"; @@ -40153,6 +40303,48 @@ license = lib.licenses.free; }; }) {}; + kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope"; + version = "20170808.117"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope"; + sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp"; + name = "kaleidoscope"; + }; + packageRequires = [ s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope"; + license = lib.licenses.free; + }; + }) {}; + kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope-evil-state-flash"; + version = "20170728.320"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash"; + sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq"; + name = "kaleidoscope-evil-state-flash"; + }; + packageRequires = [ evil kaleidoscope s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope-evil-state-flash"; + license = lib.licenses.free; + }; + }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; version = "20170418.110"; @@ -40196,12 +40388,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170725.514"; + version = "20170802.1135"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "96619e8c330dcb5a0b45bde1fb2a6697729d3541"; - sha256 = "1i8jk2l703ikmkqb1lf6mvrldb05kfp6gnak26lpc9s7pb4m8mhn"; + rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3"; + sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -40599,8 +40791,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; - sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; + rev = "415de48695efd30163a015063873b03f4ca5b743"; + sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40704,8 +40896,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "22aa73f55b5943fb464c3335978bf9b38daa39e1"; - sha256 = "1imb37jmnybimyjl1j3fqja2yxjl8h7cn0pzkmchl6gv3yyw3w01"; + rev = "4b77edeaf193c1e7dd2078b9516ce2cd20fe99f9"; + sha256 = "0s1g1fkq0m68l7ly0i1jhf1jk7abpx0kiwgcv734gb4b2ddc625n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41015,12 +41207,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20161016.1827"; + version = "20170808.602"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a"; - sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7"; + rev = "3e8b63e89e294179e42a14a4a357c29a72669a22"; + sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -41202,12 +41394,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170418.1102"; + version = "20170801.1214"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "ff05ae82b1073759989616caf362c85575fdfc58"; - sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs"; + rev = "a2c94ff358db43a977d02032ba84ee1008579522"; + sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -41390,12 +41582,12 @@ lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lavender-theme"; - version = "20141115.2302"; + version = "20170808.613"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-lavender-theme"; - rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee"; - sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k"; + rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c"; + sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme"; @@ -42401,12 +42593,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170716.827"; + version = "20170805.1249"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "cee63ee3591eb0f498ace801f1543a4bc6b58514"; - sha256 = "1h6m8qixvl9mnj6lmkqwljvyv65c6yb683krxrrbs4nrsy41z6s3"; + rev = "c1a2903fbe4c7212960c886143105caceb3faff2"; + sha256 = "1xv5yid7hzja97lvsfycpw9ss2yd69dzvjp9a54xp79ydvxwcc0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42508,13 +42700,13 @@ pname = "llvm-mode"; version = "20150910.644"; src = fetchgit { - url = "http://llvm.org/git/llvm"; - rev = "ca05253041c3e241f3987b430771f5db8aa35806"; - sha256 = "03w7w70hj7nrhr0hsrxfbi8hrmxrbbhi2rzmzzk6pv1r9l7krjbd"; + url = "https://llvm.org/git/llvm"; + rev = "c85760a9a3e892fb31ee1fab1e16393c5bb1ff1e"; + sha256 = "0p7kja62xph1nmmpa4mbi3n8ipp5pjb8xvwbn6rfw3s2m8vmwjqg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; - sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; + sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb"; name = "llvm-mode"; }; packageRequires = []; @@ -42526,11 +42718,11 @@ lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; - version = "20170731.1219"; + version = "20170804.922"; src = fetchhg { url = "https://bitbucket.com/inigoserna/lms.el"; - rev = "5f20620f62a1"; - sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; @@ -43199,13 +43391,13 @@ version = "20170728.1240"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "d235680a72677f11925b912428ad1a57b664e3e8"; sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon"; - sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; name = "mac-pseudo-daemon"; }; packageRequires = [ cl-lib ]; @@ -43362,12 +43554,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170731.914"; + version = "20170803.828"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43516,12 +43708,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20170725.1850"; + version = "20170805.819"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "ea578e8adf1ba2f98934660bd9db01cfc074b334"; - sha256 = "06w281ir0iwlmcad26b2zkk08ympw190znsll9pdlcdvzyrsl5nl"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -43583,8 +43775,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43705,12 +43897,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170730.723"; + version = "20170809.657"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "4ebcc6890ed53d789869da85a0bcb33c2b210801"; - sha256 = "153pcx585hhinj10bsfa5hlzx6lr768dyrwsv3wm16wfli53p18v"; + rev = "5c3eed698fcbae53399e8c9d7d728943a516adb7"; + sha256 = "1jgc0w5mwy2pg51yhca4hdhrdqkv7k33pbj1151wgway2zil00yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43772,8 +43964,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mainline"; - rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f"; - sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5"; + rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16"; + sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line"; @@ -44259,12 +44451,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170731.1713"; + version = "20170803.1101"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "884a72d9b69db4974e06d4a9c265b8fd607f7e31"; - sha256 = "06hxl0bdc2pa3gzznczhxhrwzdk7p0abhsmg11yh1s6csw678qsm"; + rev = "40dbc48c0db151b687d3a549df29c60383261089"; + sha256 = "1jpc4yhiq6m8lyz0s26akbkd0ggnhky6i1c8711f1ci8rqm5ckha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44725,12 +44917,12 @@ mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbo70s-theme"; - version = "20141122.642"; + version = "20170808.615"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mbo70s-theme"; - rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2"; - sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z"; + rev = "bed3db8965708ed4e9482b224a9b084765c052f2"; + sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme"; @@ -44872,12 +45064,12 @@ mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; - version = "20141115.2302"; + version = "20170808.617"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mellow-theme"; - rev = "ab72898824af6452d0cefea16e49491e42b660d1"; - sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld"; + rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891"; + sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme"; @@ -45021,8 +45213,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; - sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -45267,12 +45459,12 @@ midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "midje-mode"; - version = "20150921.1750"; + version = "20170808.2103"; src = fetchFromGitHub { owner = "dnaumov"; repo = "midje-mode"; - rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b"; - sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg"; + rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f"; + sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode"; @@ -45742,12 +45934,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20170220.1548"; + version = "20170808.1814"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "631e7f12d1641cb40e650134f35f2680a1a310a1"; - sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb"; + rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f"; + sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -45767,8 +45959,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493"; - sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx"; + rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; + sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45914,8 +46106,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "70db2088c14884e9d93a1f987ee9bc2753ca5772"; - sha256 = "07zqv6rm97kaxh0ii6n88yva7h3r3n8k6sssiy8hw6mf8817x44p"; + rev = "7ee76939b9269c652f93065a8fcc7da24434a167"; + sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46679,12 +46871,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170722.823"; + version = "20170808.1745"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "a598b60c0f9a6a718ec712d6df5591d3cd7f23f3"; - sha256 = "1pf6d2idq8sljkp7haxxqknvja4cj44i88difzs5wvkmdd2pvlh0"; + rev = "316bd3a5916114e545d9ee26208cc82771cb7002"; + sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47054,12 +47246,12 @@ mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustard-theme"; - version = "20141115.2302"; + version = "20170808.619"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mustard-theme"; - rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c"; - sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf"; + rev = "3b15d992c79590d7ea2503004e2a863b57e274b5"; + sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme"; @@ -48138,12 +48330,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170729.1816"; + version = "20170805.1240"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "91fc75e8ceebf850bd2ec07522e744eef0b89098"; - sha256 = "0margf3d0zg6nk5lf7s7dgf7qhx664jhk27wlsjnysm79d6d98f7"; + rev = "26a20424a087b0de16004b1e0186060d08d6baac"; + sha256 = "1m6kxhy6cvcwcv9j9l8wgkgqy56yqmnqdlwr3hp22vbancvqfl16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -48201,12 +48393,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170520.553"; + version = "20170809.1128"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; + sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -48226,8 +48418,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a2778988f2b70a5f000202afa7213b553350c72e"; - sha256 = "1iiy8sfdqqd2jz8lcccf0lpwxqaa5ppa47maic2gy2m7qxgw7418"; + rev = "af765a8eab288eb638100e027b97a1d15e4e3026"; + sha256 = "1mnzaa2c87pg12hgn5lfz1nxnyd8a9lfbar7imwr4jxih54ibdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -48369,16 +48561,16 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170728.952"; + version = "20170805.450"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; - rev = "c1b3aa13f5311e1a7778f9cccd25680bbbf04c5f"; - sha256 = "0rd3cr63vgy1xbbszdi87p7g55ypnq59gjqkmzfc69z0fv05d2fv"; + rev = "d556a4cd3bfd3827c3d395ff6cd1e6086658589d"; + sha256 = "0ybkiwidrmrnmf7sgd8vdfh5nhdi02yfw330rqr7xw5vf0k9fsap"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -48394,8 +48586,8 @@ src = fetchFromGitHub { owner = "thomp"; repo = "noaa"; - rev = "1198eed7cf2960a5b91f8750a08c906c716b53ff"; - sha256 = "1dvck23akkn6jffc86ddf951ksvq1w2nygji6qk5vkidcx5f4rnd"; + rev = "a4ec583275450d718334238d2813579420229f65"; + sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa"; @@ -48579,8 +48771,8 @@ version = "20170720.301"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc"; - sha256 = "172027wirk7gc4siy3f9zccm01iqjlfx0nk3s8pq7qg20cx0aa39"; + rev = "0967e46475be71d39daf928c9370af20b416f102"; + sha256 = "045xazhax0svalzr4hiv7yd0373q1dfdgq9mdk6avx6xdpk2fqcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48825,12 +49017,12 @@ numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "numbers"; - version = "20170712.238"; + version = "20170802.434"; src = fetchFromGitHub { owner = "davep"; repo = "numbers.el"; - rev = "74be68b94143f042ce461b2a69202f515acaf20c"; - sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; + rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3"; + sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; @@ -49391,12 +49583,12 @@ ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-nim"; - version = "20160830.220"; + version = "20170809.1130"; src = fetchFromGitHub { owner = "lompik"; repo = "ob-nim"; - rev = "050b165817e62067b0d686d96e25bc12fb9c7d84"; - sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a"; + rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2"; + sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; @@ -49580,12 +49772,12 @@ ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: melpaBuild { pname = "ob-spice"; - version = "20160815.2249"; + version = "20170801.2222"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-spice"; - rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a"; - sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak"; + rev = "b296232e28f61366265084fafb2f47876d987069"; + sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; @@ -49727,12 +49919,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "20170325.802"; + version = "20170809.824"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb"; - sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -49895,12 +50087,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20170412.12"; + version = "20170803.222"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "cae4e8c9d0ff0c29e5fc32c8ac0cea539f8f6a13"; - sha256 = "1wni1xrv6kr001spdz66lza4xajx1w0v3mfbf28x17l4is2108rn"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -50021,12 +50213,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160912.1758"; + version = "20170806.2121"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "21f8356ce025a66125954ed372c8ace83bd279c4"; + sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -50189,12 +50381,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170721.946"; + version = "20170804.158"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad147956b936fd528d26ca88158a8af96ff5827a"; - sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm"; + rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e"; + sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50721,12 +50913,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170706.447"; + version = "20170809.633"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; - sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; + rev = "7a35d6043a1ffb5d2fff14bface51a57d4f7ab2b"; + sha256 = "0mcrlh3y3jqffn6d92gyi3c1nh4vn4b1xclmhh2dmbl4haypk40b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50809,8 +51001,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -51166,8 +51358,8 @@ src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; - sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; + rev = "2f645cf910b21d0ea63da58ad32f02cf8a6fb178"; + sha256 = "0qkdyfkk6xflhsb127208623qbhxcxcvagw0v8yksw2ypdaypd4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; @@ -51434,12 +51626,12 @@ org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-minor-mode"; - version = "20170616.516"; + version = "20170805.1152"; src = fetchFromGitHub { owner = "seanohalpin"; repo = "org-link-minor-mode"; - rev = "f7d986b4c63673e0e81ad87e9109237abc667893"; - sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj"; + rev = "7b92df60f3fee7f609d649d80ef243b45771ebea"; + sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode"; @@ -51500,8 +51692,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; - sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; + rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3"; + sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -51520,8 +51712,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; - sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; + rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3"; + sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51537,12 +51729,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170506.2244"; + version = "20170807.549"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0"; - sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z"; + rev = "8067e76eb1fb6a9c15229cc93015aba923120a19"; + sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -51684,12 +51876,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170607.442"; + version = "20170806.1924"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "fa4e86621a63033148f8fe295a11b4721ba17462"; - sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d"; + rev = "50430ababf73a2d090881a952e9770badaf7478b"; + sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -51737,8 +51929,8 @@ version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; - sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; + rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20"; + sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -51838,12 +52030,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170731.2333"; + version = "20170803.634"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -51863,8 +52055,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -51949,12 +52141,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170727.1633"; + version = "20170807.1014"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "1b14f7f833f158f03461fb12d41a8c9f6ad4bd6a"; - sha256 = "09jp7kfjkcaqlnnls80pzxgsga7fids7w495sd319sml36fa46m8"; + rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968"; + sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -51991,12 +52183,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170727.1217"; + version = "20170808.625"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "30be4111d465b6d8fbdc9785e8c49dc0ce16bab0"; - sha256 = "0zcv0np6hnq5jcblxxrvh99rd9zi7savpyhad29krqw7rhii1z71"; + rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8"; + sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52146,22 +52338,22 @@ license = lib.licenses.free; }; }) {}; - org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }: melpaBuild { pname = "org-super-agenda"; - version = "20170801.156"; + version = "20170805.1106"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "591ea418588a2ad0cd34146831d369b030cea188"; - sha256 = "06jk5xp5x01123lwxv4srhcirjg8cwffz35x0kfndl0lq43g3mzi"; + rev = "fd3b18dd2a4b0aa77d60e4b3af4288b62cae9517"; + sha256 = "0cr6jv58lj7483vwm75yc4nncjkw4723dizdysd6qypq5px65zr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra"; name = "org-super-agenda"; }; - packageRequires = [ dash emacs org s ]; + packageRequires = [ dash emacs ht org s ]; meta = { homepage = "https://melpa.org/#/org-super-agenda"; license = lib.licenses.free; @@ -52445,14 +52637,14 @@ pname = "org-wc"; version = "20170727.1911"; src = fetchFromGitHub { - owner = "dato"; + owner = "tesujimath"; repo = "org-wc"; rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc"; - sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; + sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl"; name = "org-wc"; }; packageRequires = []; @@ -52464,16 +52656,16 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20170730.50"; + version = "20170809.638"; src = fetchFromGitHub { owner = "tumashu"; - repo = "org-webpage"; - rev = "e9bb72c7bf75243553f786193e7c9535777559f0"; - sha256 = "0ak2210d9qx4zfgqzilxzla1rswwjgjnc15kh6drn6dfmj1krfnz"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; - sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage"; + sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm"; name = "org-webpage"; }; packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ]; @@ -52506,12 +52698,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170627.1750"; + version = "20170804.2043"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "026629da7517dad6ffd9e005299874cf2163958e"; - sha256 = "0dlrlm83i61zk6mvmfspcpakfjv5d7kfazk05f694ijfmqvmvfiw"; + rev = "bc398e6bb529b6b0022c24d570f4d65bbfd70d5b"; + sha256 = "0fkms3hci43rb4dv74rfglwjgqiw23ggxr2pc1zcr29q0fra7hdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52587,6 +52779,36 @@ license = lib.licenses.free; }; }) {}; + org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: + melpaBuild { + pname = "org2web"; + version = "20170809.411"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; + sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; + name = "org2web"; + }; + packageRequires = [ + cl-lib + dash + el2org + ht + htmlize + mustache + org + simple-httpd + ]; + meta = { + homepage = "https://melpa.org/#/org2web"; + license = lib.licenses.free; + }; + }) {}; organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; @@ -52971,13 +53193,13 @@ version = "20170721.2307"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "d235680a72677f11925b912428ad1a57b664e3e8"; sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon"; - sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; name = "osx-pseudo-daemon"; }; packageRequires = []; @@ -53049,6 +53271,27 @@ license = lib.licenses.free; }; }) {}; + outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outline-toc"; + version = "20170730.430"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "outline-toc.el"; + rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463"; + sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc"; + sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb"; + name = "outline-toc"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/outline-toc"; + license = lib.licenses.free; + }; + }) {}; outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outlined-elisp-mode"; @@ -53220,16 +53463,16 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20170108.1348"; + version = "20170805.505"; src = fetchFromGitHub { owner = "jkitchin"; - repo = "scimax"; - rev = "4470f452f4219a53947da4c3d4ade188f978ad73"; - sha256 = "1nz02plf1p73690z2czn95fpiy5hissq6xnhfj5gf3ykmyzn5wbc"; + repo = "ox-clip"; + rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e"; + sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; - sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip"; + sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv"; name = "ox-clip"; }; packageRequires = [ htmlize org ]; @@ -53581,8 +53824,8 @@ src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly"; @@ -53661,12 +53904,12 @@ ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-twiki"; - version = "20160306.915"; + version = "20170803.1339"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki"; @@ -53766,12 +54009,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170709.120"; + version = "20170807.1657"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63"; - sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7"; + rev = "421e03d4faabea31b9135f7e2d1fd3a8cb3649f8"; + sha256 = "1md21a3clabc1xcs94gqy671wpxsbjr009c5dv2sxrq6xrdg1isz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53787,12 +54030,12 @@ package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-plus"; - version = "20150319.1455"; + version = "20170802.2039"; src = fetchFromGitHub { owner = "zenspider"; repo = "package"; - rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"; - sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97"; + rev = "09338e859168b45f1eb7386da184c48d31473068"; + sha256 = "0wc21d33xlgnw8j5qiv4r1rp2wglk3qcqlr1xcs0rmb4i5cjwnrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+"; @@ -53850,16 +54093,16 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170314.1340"; + version = "20170805.449"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; - rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; - sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; + rev = "e8b20e287222dbf08ebc46e405412c3213102a7e"; + sha256 = "1a02s0ssci6fywk4k8kq5prwz5j4y1270v05qw9wwxa0fx083rn5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; packageRequires = [ dash emacs ]; @@ -54037,12 +54280,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170725.1345"; + version = "20170808.1219"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "017df884700a9db27dc486f7047da4bc7639ee6e"; - sha256 = "1b5gkmgqwibbavw3qfkgyaj1y3shr0nm3ksrl3ahhabylg3fj5as"; + rev = "33efb42525da0094a5338f6cae4013fddf550118"; + sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54392,12 +54635,12 @@ pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170711.516"; + version = "20170803.1301"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "2d7307b7483eaf6030497c83dea39207cf843638"; - sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q"; + rev = "6511193677d6113fec1171f476c0db3be242ee15"; + sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -54413,12 +54656,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20170728.26"; + version = "20170802.253"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "4dc3397caaa2fb3672cf7fbb2189927538c4642c"; - sha256 = "1gxkx73avmv2j19qaszjwy6kasggh40ahnmayfxsvgjxxzd5c46s"; + rev = "2bc78649614356eff88f8c826d08782f5f804378"; + sha256 = "19awdplirf1s4ajmcvw6b2wlkmrvx5v8i8m4b8glp4wchx27czgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -54999,12 +55242,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170721.718"; + version = "20170809.1007"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "804d9929ce354c60d91ab756735ffff8a6f30688"; - sha256 = "1qfv9zmqw3s3j94kprr4g73cq0b9cqw0bihbm1pbw6pybivdry09"; + rev = "a5dfc038e989af2a4b48265a07d26222c9d1212b"; + sha256 = "1zjws8yafh3zwnfm1jw92w6f5f1vdcbyj1h7v3i19ixf19h2af76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -55020,12 +55263,12 @@ peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peacock-theme"; - version = "20141115.2302"; + version = "20170808.620"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-peacock-theme"; - rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7"; - sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3"; + rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8"; + sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme"; @@ -55101,6 +55344,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170808.252"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; + sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -56672,12 +56935,12 @@ point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; - version = "20141225.2110"; + version = "20170808.958"; src = fetchFromGitHub { owner = "dgutov"; repo = "point-stack"; - rev = "86b37666882398f4db93f3aba0ebb7b7965032cd"; - sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp"; + rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2"; + sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack"; @@ -56754,12 +57017,12 @@ poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "poly-ruby"; - version = "20170710.220"; + version = "20170802.648"; src = fetchFromGitHub { owner = "knu"; repo = "poly-ruby.el"; - rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903"; - sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0"; + rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11"; + sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby"; @@ -56838,12 +57101,12 @@ pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pony-mode"; - version = "20151028.302"; + version = "20170807.822"; src = fetchFromGitHub { owner = "davidmiller"; repo = "pony-mode"; - rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7"; - sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr"; + rev = "760684d30b6c234d1b88c9a4673a808f36f7f341"; + sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode"; @@ -57359,12 +57622,12 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20150119.1241"; + version = "20170802.1753"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; - rev = "19bce980d41607bef8af4b1901343abfca0f0855"; - sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0"; + rev = "341d85f8ecdc8834956a0352ece542f45def88db"; + sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; @@ -58241,8 +58504,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "072431452a365450c607e9503f51786be44ecf7f"; - sha256 = "0yl003jbxd7k70a8ajs19256pq4g71fkx1nqg207mzvagmnp3iqp"; + rev = "35db2675b418ea105ef89f88fd1bf0257eb8a3ff"; + sha256 = "0xfrbz1xal8xkg1s9z5mlzqc6qvrjdy9i98g4crmwhvjvv58wff0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58258,12 +58521,12 @@ protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protocols"; - version = "20170327.758"; + version = "20170802.432"; src = fetchFromGitHub { owner = "davep"; repo = "protocols.el"; - rev = "1c93a48d4173635a7b742248797f424e7ce851e3"; - sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr"; + rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77"; + sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; @@ -58838,8 +59101,8 @@ src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "84133eefce0e52a861894815f0c414f1f276f6e1"; - sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg"; + rev = "916153516382e5546b59b46342c58ed76cf27faf"; + sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; @@ -58875,12 +59138,12 @@ pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: melpaBuild { pname = "pyenv-mode"; - version = "20160221.1123"; + version = "20170801.1648"; src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "560614d47e3b0331f5c0e136763be69ef052048d"; - sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j"; + rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; + sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -58959,12 +59222,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20170730.1512"; + version = "20170809.413"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; - sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59064,12 +59327,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; - version = "20170303.732"; + version = "20170808.346"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "2482c8efee8edab9f26ea278848d786323fcff9d"; - sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv"; + rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76"; + sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -59110,8 +59373,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "7d6114fe71f1e6ab4a7c19546f380a7cb216eac9"; - sha256 = "1dq3ihmqdh6nb1ybz29qrkgz1ka2jhv76izh5a1q0l19qgni8wqi"; + rev = "62dc3d2f5eb57a70088a9b9959b6eb139cca227c"; + sha256 = "1cjdn499i5cn6lindzgnmhp9370pg9fqjpvngkyry16xs57fmz4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59253,12 +59516,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170731.105"; + version = "20170803.405"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "1d4cdc44c4fa1a15b0b1c4bb1774d0fc20d48616"; - sha256 = "1xp4lzwc95qkam8b86pmz8y0zg3w579rvygh22y47g0dlblyxgsn"; + rev = "85978be547434adc9c673cb3cfb7e7cf8729d514"; + sha256 = "0diczpxf8ax6ci8j18ac92nslj7l6spl9a8fazdy1w9j9dmgc7s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -60282,12 +60545,12 @@ react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "react-snippets"; - version = "20160712.1521"; + version = "20170803.1550"; src = fetchFromGitHub { owner = "johnmastro"; repo = "react-snippets.el"; - rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709"; - sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; @@ -60387,12 +60650,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170712.334"; + version = "20170803.632"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88"; - sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6"; + rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3"; + sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60725,12 +60988,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20170719.754"; + version = "20170808.515"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "f5a1ad20cacba47193be6d40230519c28e3578fd"; - sha256 = "07i5xa87wdyv9v0ib2j3bk9gv2dc8ah7jgi2agicfn4lxygf710b"; + rev = "0b881a3f73cd6fafddfbd602a1abda5f8fc7ab98"; + sha256 = "0s4iakcpjiwvxjdcmn22yfsr0ya0h4xvpr713d0h9yjdbblx1m20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61142,10 +61405,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170731.2148"; + version = "20170801.1947"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0fj2kkvilgrz0ih08issdrq8wbswcxs8af1jv50zx7lfyjpix2s3"; + sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj"; name = "replace+.el"; }; recipeFile = fetchurl { @@ -61496,12 +61759,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20170105.2156"; + version = "20170804.545"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e"; - sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix"; + rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea"; + sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -61557,12 +61820,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170622.1135"; + version = "20170809.1107"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; - sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; + rev = "081685a8c624220ece68d6dca8d60016585b04ff"; + sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -61725,12 +61988,12 @@ riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "riscv-mode"; - version = "20161001.1838"; + version = "20170804.821"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "riscv-mode"; - rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570"; - sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4"; + rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749"; + sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode"; @@ -61746,12 +62009,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170710.711"; + version = "20170808.634"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd"; - sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -61981,8 +62244,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62043,8 +62306,8 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59459"; - sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; + rev = "59553"; + sha256 = "00lwwhwq1bzmkr97q22frmzwm4g1kddgiyzlmfwv16k0g3ihwydg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; @@ -62121,12 +62384,12 @@ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "20150713.752"; + version = "20170808.2046"; src = fetchFromGitHub { owner = "knu"; repo = "ruby-electric.el"; - rev = "35d04e90ef243c7090edf9aaad0142a5a77f0ebd"; - sha256 = "0ksbm6cbqz7dx6qyq8nlpbx41b153jaww4fwnfwbx9rz993wjjkg"; + rev = "d04313dbee42c0d1009558a7c9424e4ae8611908"; + sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; @@ -62394,12 +62657,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170728.1006"; + version = "20170805.952"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "09efc45dee786cb220c233426ddd82b26ad950eb"; - sha256 = "0rga8whnzhnz6a0n13bimrdjardzmn5h38d71gmvrs40kbs0350h"; + rev = "b10ad4177786a139623984c4855eb9de3864c697"; + sha256 = "1dxsw71yxqzpnsr2cy7ba3mmzsnjp8kw0la6d7wc67m704fxymz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62541,12 +62804,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20170218.1829"; + version = "20170806.2110"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499"; - sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15"; + rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36"; + sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -62797,8 +63060,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "a6e98831985be670148c527747b0e91330d0307b"; - sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk"; + rev = "9b0378836bd7af24fa67f93fa456c57cc3fdbbcb"; + sha256 = "19js3vyi52xz83419x1n1nrwqvqsa5p8rf33z99bdmy1rj4xrfgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62835,12 +63098,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170611.806"; + version = "20170802.432"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -63252,12 +63515,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20170501.2155"; + version = "20170801.2216"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f"; - sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif"; + rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219"; + sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -63438,12 +63701,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170722.434"; + version = "20170803.547"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "17884d02d8aaf2478590ea13542f2954d1dc203b"; - sha256 = "04wqrkpihrgrw244baama1aaj1ih80w0001hw3xnbl6xnxsyvm4z"; + rev = "9197838617211c71a965aa4b009249d231249902"; + sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -63731,12 +63994,12 @@ services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "services"; - version = "20170327.835"; + version = "20170802.430"; src = fetchFromGitHub { owner = "davep"; repo = "services.el"; - rev = "87d65bf9fd8b02101f751846c650fc518355d1ea"; - sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3"; + rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596"; + sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; @@ -64378,12 +64641,12 @@ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: melpaBuild { pname = "shr-tag-pre-highlight"; - version = "20170525.902"; + version = "20170801.2201"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "shr-tag-pre-highlight.el"; - rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; - sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + rev = "8b102c4c42180b5e9fa9dbc776fb28f12afb38a0"; + sha256 = "0z00k3rxz26dmn55mhrbv0p39xk3lwd66vmw0dm8m1lrkjxpsq8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; @@ -64441,12 +64704,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170714.1041"; + version = "20170805.1619"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; - sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64755,12 +65018,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20170603.1542"; + version = "20170803.540"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -64965,12 +65228,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170731.25"; + version = "20170807.711"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5858bd60b4adadf2a52825aef9a49021eba89477"; - sha256 = "1difrbzz0cfw48nabaglcqlpvsrd2zn24f6spfx0qh22rfhcz4qy"; + rev = "e9cdebc689bb7780d0c278bf63577103fffc4aeb"; + sha256 = "1yys57pn7bym8galpf1k88xc5gs70xsv5fd1bdpq5k93is135js1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65028,12 +65291,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170705.643"; + version = "20170804.1113"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; - sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; + rev = "84e5a99f5e8caf4d42076681b9befb1bf80493bb"; + sha256 = "1fw4biar85xy8as1smry8kzyfw0lbnbipzinbmpaliz2fljfnkqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65133,12 +65396,12 @@ slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-theme"; - version = "20141115.2302"; + version = "20170808.622"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-slime-theme"; - rev = "441288a5791d24e79ada2698888653ef3cf2ac6f"; - sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx"; + rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f"; + sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme"; @@ -65217,12 +65480,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170629.235"; + version = "20170802.413"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; - sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; + rev = "ebadbf5e3ffddee788f5ec09f759ed7eef6e1dae"; + sha256 = "1dn81r7dkj5pbl4adps7gcwn2yrxmap0ds6ninjzyr18m4lca7zb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -65951,13 +66214,13 @@ pname = "sml-modeline"; version = "20120110.1240"; src = fetchbzr { - url = "lp:~nxhtml/nxhtml/main"; + url = "https://code.launchpad.net/~nxhtml/nxhtml/main"; rev = "835"; sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3438977c0bf907b7a3480e6b88b277109c663385/recipes/sml-modeline"; - sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/sml-modeline"; + sha256 = "0fvdaby49q34sa83i3mgwyzaf1rflcary9pqi2gvbiibcwmkg82b"; name = "sml-modeline"; }; packageRequires = []; @@ -66284,12 +66547,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20170718.1048"; + version = "20170809.1220"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "4058f17c7ccd4eb192598ce493d2e2d2361ee2e0"; - sha256 = "0vk5d3l2s0dxdv6yjdnwbhs0cdq71kd3l949a8w0qaypad8hg11i"; + rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f"; + sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -67420,12 +67683,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170711.1433"; + version = "20170803.1039"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516"; - sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb"; + rev = "c6dc66b6678605f0df8eb61778b10ae21eb7caf5"; + sha256 = "05pdz6117m78zfvxi9mskw8svx4bs5k3bpv9nk9mzg9n0zw8algy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -67441,12 +67704,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170725.429"; + version = "20170801.2303"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "dbd8608551bc9e05280415b7b3937b1a151c7718"; - sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr"; + rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1"; + sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67716,8 +67979,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e"; - sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx"; + rev = "f248e80ec7ed418d23d47c8a6c147a8a42855d29"; + sha256 = "1icm94ri23m66p0lmg0sdqi04m3vfwd2jcngym9gcg8p5gqq8j2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -68187,12 +68450,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20170605.1710"; + version = "20170803.2052"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "57d49eafd53868d3c86b20fa51e1889e621872c0"; - sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -68250,12 +68513,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170730.306"; + version = "20170806.1414"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "1c8a6ca6e135e7228d45247adee75f721f20ef64"; - sha256 = "0ld6ivnkrhj3rdlr54sg90i4pdkgvyma9mhpr52ni6ab4053mpyj"; + rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2"; + sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68624,12 +68887,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170609.938"; + version = "20170804.1038"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69565,12 +69828,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20170611.1115"; + version = "20170804.1057"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "743614f372598597282efd29a18e624d5ef80bc1"; - sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf"; + rev = "01a2be2798850519873fe7abc59d715a978e6f20"; + sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -69817,12 +70080,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20170426.48"; + version = "20170805.251"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c"; - sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc"; + rev = "5e440c33a1d24762477863af5c9b7a896df4be1b"; + sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -70293,12 +70556,12 @@ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thinks"; - version = "20170607.144"; + version = "20170802.428"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; - sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; + rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36"; + sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; @@ -70360,8 +70623,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "ec2a252136cb864a9edb22ef895bd62ff29c53e1"; - sha256 = "1avsnlxmr12zbjfv82mg69031s64c1rff7yfbk12hzba93rndnlp"; + rev = "0a8c34ceedf0f9272fb6d3519596ddf90cffcac2"; + sha256 = "1bhcn79l52m5ad4z8sv9165vsib2rvmqcf1sdaisrk7nfqwvy8sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70415,22 +70678,22 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170729.2113"; + version = "20170806.2049"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "6ad865937b7615652004ceca2e59c8ecfd737a9b"; - sha256 = "1krl4h20sr2yk2napqap1b5lm88vzzdy5162i5rf7l53scjdc8vr"; + rev = "77e4fe848dd664ead1f6980a9a99d82e2bee75d7"; + sha256 = "18n0w02h6wvp5gxnsm7lcwdg68sxcqz9sx6xpkxlidyhixk2iap9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; name = "tide"; }; - packageRequires = [ cl-lib dash flycheck typescript-mode ]; + packageRequires = [ cl-lib dash flycheck s typescript-mode ]; meta = { homepage = "https://melpa.org/#/tide"; license = lib.licenses.free; @@ -71287,12 +71550,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170730.2052"; + version = "20170804.559"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "7a1af3d62e0b27e032b9c9219b97289c11b332ab"; - sha256 = "0sfq643pfdmfcidm8ji52fn987vf3zwk2v6drmw8p3qzjx2k1m7q"; + rev = "c9de81914e2688dc1c6a3b2bf70013a2a5ed0b63"; + sha256 = "1vlla25lk75s84ns2svxdnvwfwhwp6jigmsq5v4s7k9xq5py0df7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71392,12 +71655,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170729.834"; + version = "20170809.1104"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; - sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; + rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df"; + sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -71417,8 +71680,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; - sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; + rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df"; + sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71642,12 +71905,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170531.557"; + version = "20170803.331"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "1af437337abe17afc95de7070fd242165529f556"; - sha256 = "0jjlb4i1vp5390v9w0dg4cc0l46jrxqphvw6b3wn1zy511r9q1jm"; + rev = "3dd1684db5d085f1b668d19646a4051a3261f34e"; + sha256 = "1d7yc0iqmxxqlcsbbci4wcz49sbfj6pdvbr7d98dsjxrg6pgjzjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -71980,8 +72243,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; - sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; + rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; + sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -72654,12 +72917,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170425.331"; + version = "20170802.426"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5"; + sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -72675,12 +72938,12 @@ url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; - version = "20160404.1959"; + version = "20170804.1942"; src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; - rev = "817ac58f6fd2190f688619a91cdc28654b211df9"; - sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r"; + rev = "06db8270213b9e352d6c335b0663059a1353d05e"; + sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; @@ -72782,8 +73045,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; - sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; + rev = "5ca193128c10f6af877c174ec0a9029782f0ef50"; + sha256 = "1m8ccx4hnncwd5hhi46ghprk9cdljw0qlyy4ya05fgvxl7yz8b4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -73069,6 +73332,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "20170725.7"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "6f1b788a58d2b64ac0c4648039ecd40b3989a489"; + sha256 = "1xay9h16vr9pm1csfaqy71m9rsphh77r2rmk1sxpdasr5aa00vq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; @@ -73454,8 +73738,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; - sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; + rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; + sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -73784,12 +74068,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170225.2301"; + version = "20170804.1723"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "e9708b80a319af14266562d8bf920747e94f1cf8"; - sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj"; + rev = "cd76195b2bda28d247a79124334ffcc5124676cb"; + sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -73809,8 +74093,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570"; - sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza"; + rev = "3a3eab579361351b78a87bb5710d3bbfe351b993"; + sha256 = "1b72vpg53whq3h85ck3c9if8km2rlzf8bvxkkv0j6zm66rvph0j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -74074,12 +74358,12 @@ wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wavefront-obj-mode"; - version = "20150501.1116"; + version = "20170808.1016"; src = fetchFromGitHub { owner = "abend"; repo = "wavefront-obj-mode"; - rev = "75eedad052848e82cdd94064764956b906e6d6b2"; - sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy"; + rev = "34027915de6496460d8e68b5991dd24d47d54859"; + sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode"; @@ -74242,12 +74526,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170709.922"; + version = "20170807.903"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246"; - sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l"; + rev = "448c197fd78178bcf3e744c90b85a08f07bae3a0"; + sha256 = "0vmh9cqhcw32qliqrlmkb9jwhi3m4iy5x5a96sk3f75zx14ryjr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -74811,8 +75095,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "e9e61170f98bfde12b49b750966a826c0c72f848"; - sha256 = "1s9jysl6gql0fnngm4mwqclbw99502dkrvakz3wxh37c7mf5g9r2"; + rev = "38d2aca88b4afd2ade7f38df7275a3d31324df3b"; + sha256 = "1bahwsx1cpima658bg62w63a4s24vp0qpw0gmxb245cyzpi8ng2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -75115,6 +75399,27 @@ license = lib.licenses.free; }; }) {}; + windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "windwow"; + version = "20170803.1748"; + src = fetchFromGitHub { + owner = "vijumathew"; + repo = "windwow"; + rev = "717190e22aeb28130ce2a52470b7fb26b180e8dd"; + sha256 = "0n2b2jaaqwc8z8rmfc7rqnk2sf875gp3xyjfgayvq7ya9c9bnv7g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow"; + sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h"; + name = "windwow"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/windwow"; + license = lib.licenses.free; + }; + }) {}; winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winpoint"; @@ -75219,22 +75524,22 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170730.314"; + version = "20170803.917"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "5cddefaff6aa0fa8ce2a0fa23900687c07d87481"; - sha256 = "11fsaam88xj8aambiacsmcgn1mjfkx3mm7y74lnnwcslbrmj977a"; + rev = "4d3d50b09dee3305a365d7eb005313d42dddd6ea"; + sha256 = "11416ic4nf04fgd7947lxfc4c8g6lb4r2ickr5mydqw4wqzanqi9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; name = "with-editor"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ async emacs ]; meta = { homepage = "https://melpa.org/#/with-editor"; license = lib.licenses.free; @@ -75264,12 +75569,12 @@ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "with-simulated-input"; - version = "20170729.1252"; + version = "20170807.1512"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "7f37451dcfbb1873f605e2a412d0585f5c3bed49"; - sha256 = "0s40mpy10fbdr2b241qa239zdh54gmqk4j9pigqm1zlzi9d5msan"; + rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; + sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -75369,12 +75674,12 @@ wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordgen"; - version = "20161104.944"; + version = "20170803.1120"; src = fetchFromGitHub { owner = "Fanael"; repo = "wordgen.el"; - rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; - sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; @@ -75768,12 +76073,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170713.629"; + version = "20170804.2244"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770"; - sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166"; + rev = "a91d934e15343738393cb2dc7a75d712581d09eb"; + sha256 = "14b1aw1iffhk7gk0fwyrjb40173cli968hy6x72mmgq3ry664h44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -75789,12 +76094,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170725.420"; + version = "20170804.2206"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "4557ee44475b50061219653f0178efd9d832a79f"; - sha256 = "06fx2mnyd7qs867m1hjzzj47wj06hhqz74bwif6rzhy5v4j7wdcr"; + rev = "174fdd95edb77820a03eb161e3ab6b867936f9fe"; + sha256 = "1l3a6hkhv26ixkmjc1zfl43zx8s0c3czk8zgahydpjx111q5381d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -75810,12 +76115,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170729.1407"; + version = "20170804.2234"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "5eaa02e28c4496bbf898271401005a694176a2d3"; - sha256 = "0wdlc3d4ciyhc2nnnvfp0bdvar4486rcqfkj9czjb6v6jax3farx"; + rev = "6b70b8122643402aedcc1cf88406330628d92286"; + sha256 = "0gd7nsx205s33dxjx52cc4k8frdxrnwsvl7qkx8mckqvc1y2wxa1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -75831,12 +76136,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170729.1310"; + version = "20170804.2154"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "636d4be0adf234ace22ee236b66b7b9ce81cff54"; - sha256 = "1kqy10y7bqza4y7fj5n0vg536hksjzjbd2r3n36dij27k8n996dm"; + rev = "4a7da476edf9eed9ad7725fe31113b87f97696bd"; + sha256 = "140gxnnxqk649j60d3aibs42si95vakmy6m937gb25b2bmvhkwwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -75852,12 +76157,12 @@ xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20170713.628"; + version = "20170804.2211"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "29a82b1a291ad6625b0da152ff1de10455d1831a"; - sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q"; + rev = "00aa90c74f6e23eb9dae3082a16454264f9d1ed8"; + sha256 = "0xp8w9myhdwiw7m2zj9bd2kc93djx35s3iss5yrz92kcw6m3n53m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; @@ -75873,12 +76178,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170713.615"; + version = "20170804.2259"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "91645ba91772bf4a1a20765722b72f7e374feacc"; - sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0"; + rev = "7f4e9252d5f84438c83912720bcd313092f8f44f"; + sha256 = "17fq0b2rc9wjjii17mnybp8v3nvp297azkd2bwz952r0x9g2s92b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -75894,12 +76199,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170707.2324"; + version = "20170803.722"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c"; - sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb"; + rev = "8c988bc469209e7f393fa5a1ac4663bfb713c7a7"; + sha256 = "1ndczz69v70c13jdb651yiqnk1avy78i11ydbvr0qf78gd859i5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; @@ -75936,12 +76241,12 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20170713.628"; + version = "20170804.2216"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba"; - sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6"; + rev = "1249d62fe1d962e38ab8d9e48813c1ad5d21ae51"; + sha256 = "0i8r7kv2kai1r1fs509j3lx4kzv8bv6qsb3882qh6hjcnlpf0pyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -76486,8 +76791,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "69c4e154f9335750ab8658a00577952930138a79"; - sha256 = "166zhipzsv2v2qlxglmxr8a0syi5aq2rrh8sxs6n4wmnpgcfglhg"; + rev = "fdff36994bc59bb02c1968684862ded9003c6c7d"; + sha256 = "0w38s7xl77ch8h65x2njn9nwvwdxjw7rz15gw2qmp69sjv4nvnna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76736,8 +77041,8 @@ src = fetchFromGitHub { owner = "anachronic"; repo = "yarn-mode"; - rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; - sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b"; + sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; @@ -76774,12 +77079,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170723.1530"; + version = "20170808.940"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5"; - sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1"; + rev = "e371c119ecc9044c8ca2d6b93215121eb714d6b1"; + sha256 = "02md6332891fwwiqqf9x3sjd7568lg2lmjcx79cdjcl5hjik7qdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76881,8 +77186,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77036,13 +77341,13 @@ pname = "zeitgeist"; version = "20131228.1009"; src = fetchgit { - url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources"; + url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git"; rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5f96d92b33fe97573334038f2fe4f984f37cca/recipes/zeitgeist"; - sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist"; + sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz"; name = "zeitgeist"; }; packageRequires = []; @@ -77134,6 +77439,27 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "zephir-mode"; + version = "20170808.1302"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "9295bb18b273502dfcc75c34c04ce9f48fe4e53a"; + sha256 = "17wsl7c9fcr6qybr7qhlvkikb11n809cxi6ghgskh131a8mxb4fn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ cl-lib emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; @@ -77346,10 +77672,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170605.1046"; + version = "20170802.1406"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30"; - sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz"; + url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32"; + sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk"; name = "zones.el"; }; recipeFile = fetchurl { @@ -77620,8 +77946,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; - sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; + rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; + sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 434e4384738a..61a63efb67e3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -86,12 +86,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -1136,12 +1136,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; - sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; + rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564"; + sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1981,27 +1981,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "0.0.2"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -2028,14 +2007,14 @@ pname = "auto-compile"; version = "1.4.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; packageRequires = [ dash emacs packed ]; @@ -3124,12 +3103,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -3166,12 +3145,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; - sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + rev = "1110217973afa1329c47a1f7e6962aad36a90134"; + sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -5152,12 +5131,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81"; - sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -6541,17 +6520,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "0.7"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -7284,16 +7265,16 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; - sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; + rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c"; + sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; - sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; name = "docker-compose-mode"; }; packageRequires = [ dash emacs yaml-mode ]; @@ -7808,12 +7789,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.5.5"; + version = "1.5.7"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; - sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; + rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c"; + sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -7889,22 +7870,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83"; + sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -8970,14 +8951,14 @@ pname = "elx"; version = "1.1.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -11802,12 +11783,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0"; - sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -12324,6 +12305,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "0.12.1"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c"; + sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -13424,25 +13426,6 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuel"; - version = "0.96"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0"; - sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; - name = "fuel"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuel"; - license = lib.licenses.free; - }; - }) {}; full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; @@ -16163,12 +16146,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -18512,22 +18495,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.16"; + version = "4.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -18620,16 +18603,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.16"; + version = "4.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -18872,12 +18855,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -19040,12 +19023,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "135e049d763ceb4cabd0bab068c4c71452459065"; - sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -20675,12 +20658,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "b488c3dbba657bbd524402f48fde16ab6b1211db"; - sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5"; + rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; + sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -21459,11 +21442,11 @@ lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; - version = "0.6"; + version = "0.7"; src = fetchhg { url = "https://bitbucket.com/inigoserna/lms.el"; - rev = "5f20620f62a1"; - sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; @@ -21692,13 +21675,13 @@ version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon"; - sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; name = "mac-pseudo-daemon"; }; packageRequires = [ cl-lib ]; @@ -21924,6 +21907,27 @@ license = lib.licenses.free; }; }) {}; + magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-imerge"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-imerge"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; + sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; + name = "magit-imerge"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-imerge"; + license = lib.licenses.free; + }; + }) {}; magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; @@ -22050,22 +22054,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60"; - sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7"; + rev = "959e7b259697c79ccf46b95827575d3e15e83d30"; + sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs git-commit magit s with-editor ]; + packageRequires = [ emacs ghub-plus magit s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -22669,12 +22673,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; - sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -24119,14 +24123,14 @@ pname = "no-littering"; version = "0.5.9"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -24638,12 +24642,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e"; - sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -24680,12 +24684,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "032599b162624a4b65c82c20be06433f24b00e8f"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -24743,12 +24747,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8"; + sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -24873,8 +24877,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad147956b936fd528d26ca88158a8af96ff5827a"; - sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm"; + rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e"; + sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26299,13 +26303,13 @@ version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon"; - sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; name = "osx-pseudo-daemon"; }; packageRequires = []; @@ -26655,14 +26659,14 @@ pname = "packed"; version = "2.0.1"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; packageRequires = [ dash emacs ]; @@ -27277,6 +27281,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170808"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; + sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -28599,12 +28623,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.3.2"; + version = "3.4.0pre1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "5532abc15b97f3489183b266b41844306052a3fa"; - sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; + rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030"; + sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -29583,6 +29607,27 @@ license = lib.licenses.free; }; }) {}; + react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "react-snippets"; + version = "0.1"; + src = fetchFromGitHub { + owner = "johnmastro"; + repo = "react-snippets.el"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; + sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73"; + name = "react-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/react-snippets"; + license = lib.licenses.free; + }; + }) {}; real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; @@ -30237,12 +30282,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; - sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -30447,12 +30492,12 @@ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "knu"; repo = "ruby-electric.el"; - rev = "dfb4b448a63ae749c74edf6415ad569d52cab904"; - sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs"; + rev = "d04313dbee42c0d1009558a7c9424e4ae8611908"; + sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; @@ -30871,8 +30916,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -30991,12 +31036,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937"; - sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c"; + rev = "d1fd5d47aacba723631d5d374169a45ff2051c41"; + sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -31558,12 +31603,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; - sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31663,12 +31708,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -33256,12 +33301,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; - sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; + rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f"; + sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -34514,12 +34559,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; - sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; + rev = "541f73c779e72eb6ebcc6814a75771e91679875a"; + sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -34556,12 +34601,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.8"; + version = "1.8.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; - sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; + rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4"; + sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -34577,12 +34622,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.8"; + version = "1.8.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; - sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; + rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4"; + sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35315,6 +35360,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee"; + sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcomp"; @@ -36451,12 +36517,12 @@ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "with-simulated-input"; - version = "2.0"; + version = "2.2"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31"; - sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c"; + rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; + sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -36532,6 +36598,27 @@ license = lib.licenses.free; }; }) {}; + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wordgen"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = "wordgen.el"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/wordgen"; + license = lib.licenses.free; + }; + }) {}; wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordsmith-mode"; @@ -37015,6 +37102,27 @@ license = lib.licenses.free; }; }) {}; + yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yarn-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "yarn-mode"; + rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; + sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; + sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; + name = "yarn-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yarn-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -37254,6 +37362,27 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zephir-mode"; + version = "0.3.3"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c"; + sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index f51fec800756..e9eccf83334c 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170731.tar"; - sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255"; + url = "http://orgmode.org/elpa/org-20170807.tar"; + sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar"; - sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar"; + sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 50ecdc1d4998..08fc25fe9c14 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -21,7 +21,7 @@ let inherit description license; longDescription = '' Enhancing productivity for every C and C++ - developer on Linux, OS X and Windows. + developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; platforms = platforms.linux; @@ -268,12 +268,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2"; + version = "2017.2.1"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f"; + sha256 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113"; }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -307,12 +307,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1.5"; + version = "2017.2.1"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag"; + sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k"; }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index a40c22e88867..0733bd796656 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.29"; + version = "0.9.31"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7"; + sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659"; + sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1"; } ; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 97e430fded63..0f81b0bdd640 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -89,7 +89,7 @@ composableDerivation { NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; }; - } #Disable Darwin (Mac OS X) support. + } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a688170b8ad4..bb265e90b770 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Vim - the text editor - for Mac OS X"; + description = "Vim - the text editor - for macOS"; homepage = https://github.com/b4winckler/macvim; license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 5e98b3c9a785..c23bf360daf3 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -43,7 +43,7 @@ composableDerivation { ''; }; } - // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. + // edf { name = "darwin"; } #Disable Darwin (macOS) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; } #Include MzScheme interpreter. diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 18eb1803fd62..45a734216cf3 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -77,11 +77,11 @@ in meta = with stdenv.lib; { description = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X + Linux and macOS ''; longDescription = '' Open source source code editor developed by Microsoft for Windows, - Linux and OS X. It includes support for debugging, embedded Git + Linux and macOS. It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 169576f29bf8..48a29e147f01 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,7 +85,9 @@ stdenv.mkDerivation rec { moveToOutput "bin/*-config" "$dev" moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace pkg-config \ + substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ + ${pkgconfig}/bin/pkg-config + substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" done '' + lib.optionalString (ghostscript != null) '' diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f48ce6a4ce44..a3a58bc87ee4 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool +, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, automake114x, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake }: let @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x potrace cmake python2Env + makeWrapper gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif potrace cmake python2Env ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index c2830b2df3d1..e7a05c522ca2 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "3D parametric model compiler"; longDescription = '' OpenSCAD is a software for creating solid 3D CAD objects. It is free - software and available for Linux/UNIX, MS Windows and Mac OS X. + software and available for Linux/UNIX, MS Windows and macOS. Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index a66e91631422..12ff5c772402 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; - homepage = http://processing.org; + homepage = https://processing.org; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 233566c1bdaf..3d03d1dea3e7 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras + phonon, qtimageformats, qtsvg, qtx11extras, kinit }: mkDerivation { @@ -17,5 +17,5 @@ mkDerivation { baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon qtimageformats qtsvg qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 79806dc93fbc..cfe7327ac72a 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -5,7 +5,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info +, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit }: mkDerivation { @@ -30,6 +30,7 @@ mkDerivation { # others ffmpeg libmusicbrainz2 shared_mime_info ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = let k3bPath = lib.makeBinPath [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index bd026c6f0395..d2d60adda2c5 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -20,4 +20,5 @@ mkDerivation { kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index db1bf2aee659..1be07fe6fe86 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -16,5 +16,5 @@ mkDerivation { kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 542450080fea..acd5ae7dd73d 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }: +, curl, netcat, python, bind, iproute, bc, gitMinimal }: let - version = "1.12.0"; + version = "1.17.3"; deps = lib.makeBinPath [ curl - mpv python bind.dnsutils iproute @@ -19,7 +18,7 @@ stdenv.mkDerivation { owner = "alexanderepstein"; repo = "Bash-Snippets"; rev = "v${version}"; - sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg"; + sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r"; }; buildInputs = [ makeWrapper ]; @@ -32,7 +31,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p "$out"/bin "$out"/man/man1 + mkdir -p "$out"/bin "$out"/share/man/man1 ./install.sh all for file in "$out"/bin/*; do wrapProgram "$file" --prefix PATH : "${deps}" diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix new file mode 100644 index 000000000000..78ac55088a4c --- /dev/null +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, pythonPackages +, pkgconfig, autoreconfHook, rsync +, swig, qt4, fcgi +, bitcoin, procps, utillinux +}: +let + + version = "0.96.1"; + sitePackages = pythonPackages.python.sitePackages; + inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted; + +in mkPythonDerivation { + + name = "bitcoinarmory-${version}"; + + src = fetchFromGitHub { + owner = "goatpig"; + repo = "BitcoinArmory"; + rev = "v${version}"; + #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; + sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; + }; + + # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. + #patches = [ ./shutdown-fix.patch ]; + + buildInputs = [ + pkgconfig + autoreconfHook + swig + qt4 + fcgi + rsync # used by silly install script (TODO patch upstream) + ]; + + propagatedBuildInputs = [ + pyqt4 + psutil + twisted + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + makeWrapperArgs = [ + "--prefix PATH : ${bitcoin}/bin" # for `bitcoind` + "--prefix PATH : ${procps}/bin" # for `free` + "--prefix PATH : ${utillinux}/bin" # for `whereis` + "--suffix LD_LIBRARY_PATH : $out/lib" # for python bindings built as .so files + "--run cd\\ $out/lib/armory" # so that GUI resources can be loaded + ]; + + # auditTmpdir runs during fixupPhase, so patchelf before that + preFixup = '' + newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|') + patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB + ''; + + # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after + postFixup = '' + wrapPythonProgramsIn $out/lib/armory "$out $pythonPath" + ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory + ''; + + meta = { + description = "Bitcoin wallet with cold storage and multi-signature support"; + longDescription = '' + Armory is the most secure and full featured solution available for users + and institutions to generate and store Bitcoin private keys. This means + users never have to trust the Armory team and can use it with the Glacier + Protocol. Satoshi would be proud! + + Users are empowered with multiple encrypted Bitcoin wallets and permanent + one-time ‘paper backups’. Armory pioneered cold storage and distributed + multi-signature. Bitcoin cold storage is a system for securely storing + Bitcoins on a completely air-gapped offline computer. + + Maintainer's note: The original authors at https://bitcoinarmory.com/ + discontinued development. I elected instead to package GitHub user + @goatpig's fork, as it's the most active, at time of this writing. + ''; + homepage = https://github.com/goatpig/BitcoinArmory; + license = stdenv.lib.licenses.agpl3Plus; + maintainers = with stdenv.lib.maintainers; [ elitak ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 335d0031b32c..b831924d9cdf 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; - homepage = http://www.blender.org; + homepage = https://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 65e515dbb83d..add46f8871d5 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 8218285c5fbb..e10cb30d1874 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do + for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do wrapProgram "$file" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index cc8dbde273b6..db2b453913f4 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s "${gnuradio}"/bin/* $out/bin/ - for file in "$out"/bin/*; do + for file in $(find $out/bin -type f -executable); do wrapProgram "$file" \ --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ + (map (path: "$(toPythonPath ${path})") extraPackages)} \ --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} done diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 4322b4088436..7315c0a8d724 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -3,43 +3,43 @@ GEM specs: charlock_holmes (0.7.3) diff-lcs (1.3) - gemojione (3.2.0) + gemojione (3.3.0) json - github-markup (1.6.0) + github-markup (1.6.1) gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.1.1) + gollum (4.1.2) gemojione (~> 3.2) - gollum-lib (~> 4.0, >= 4.0.1) + gollum-lib (>= 4.2.7) kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) useragent (~> 0.16.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.5) + gollum-lib (4.2.7) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 2.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 2.1) sanitize (~> 2.1) stringex (~> 2.6) json (2.1.0) kramdown (1.9.0) mime-types (2.99.3) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) mustache (0.99.8) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) posix-spawn (0.3.13) rack (1.6.8) rack-protection (1.5.3) rack - rouge (2.0.7) + rouge (2.1.1) sanitize (2.1.0) nokogiri (>= 1.4.4) sinatra (1.4.8) @@ -47,7 +47,7 @@ GEM rack-protection (~> 1.4) tilt (>= 1.3, < 3) stringex (2.7.1) - tilt (2.0.7) + tilt (2.0.8) useragent (0.16.8) PLATFORMS @@ -57,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.15.0 + 1.15.3 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 2ad724b2bc7a..cff774d7daa0 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -16,22 +16,24 @@ version = "1.3"; }; gemojione = { + dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; github-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; @@ -40,14 +42,16 @@ version = "2.8.1"; }; gollum = { + dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; @@ -56,12 +60,13 @@ version = "1.0.1"; }; gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; type = "gem"; }; - version = "4.2.5"; + version = "4.2.7"; }; json = { source = { @@ -90,10 +95,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; mustache = { source = { @@ -104,12 +109,13 @@ version = "0.99.8"; }; nokogiri = { + dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; type = "gem"; }; - version = "1.6.8.1"; + version = "1.8.0"; }; posix-spawn = { source = { @@ -128,6 +134,7 @@ version = "1.6.8"; }; rack-protection = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -138,12 +145,13 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.1"; }; sanitize = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; @@ -152,6 +160,7 @@ version = "2.1.0"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -170,10 +179,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.8"; }; useragent = { source = { diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index fe58fa92d07b..4143f6fde559 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -19,11 +19,11 @@ in stdenv.mkDerivation { --replace "alias echo=/bin/echo" "" substituteInPlace ./src/config.c \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \ + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \ --replace "/usr/bin/vi" "vi" substituteInPlace ./mdp.1 \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" ''; # we add symlinks to the binary and man page with the name 'gpg-mdp', in case # the completely unrelated program also named 'mdp' is already installed. diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 3fda4d8881af..5ad03c88c64f 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # Some of the code comes from the Cutesdr project, with a BSD license, but # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; - platforms = platforms.linux; # should work on Darwin / OS X too + platforms = platforms.linux; # should work on Darwin / macOS too maintainers = with maintainers; [ bjornfor the-kenny fpletz ]; }; } diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index e92cd4cdaccd..1b8257ca5e59 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb }: +{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }: stdenv.mkDerivation rec { name = "hackrf-${version}"; - version = "2015.07.2"; + version = "2017.02.1"; src = fetchgit { url = "git://github.com/mossmann/hackrf"; rev = "refs/tags/v${version}"; - sha256 = "1mn11yz6hbkmvrbxj5vnp78m5dsny96821a9ffpvbdcwx3s2p23m"; + sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv"; }; buildInputs = [ - cmake pkgconfig libusb + cmake pkgconfig libusb fftwSinglePrec ]; - + + cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; + preConfigure = '' - cd host + cd host ''; - + meta = with stdenv.lib; { description = "An open source SDR platform"; homepage = http://greatscottgadgets.com/hackrf/; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 27757e4e31ae..2b0be1c9030d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.25.1"; + version = "0.26"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz"; + sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index ff832d4961f5..240983b3c716 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; - sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } { @@ -36,15 +36,6 @@ }; } { - goPackagePath = "github.com/bep/inflect"; - fetch = { - type = "git"; - url = "https://github.com/bep/inflect"; - rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; - sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; - }; - } - { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { type = "git"; @@ -76,8 +67,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; - sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; + rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; + sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; }; } { @@ -85,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/fortytw2/leaktest"; - rev = "7dad53304f9614c1c365755c1176a8e876fee3e8"; - sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m"; + rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; + sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; }; } { @@ -103,8 +94,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; + sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; }; } { @@ -112,8 +103,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc"; - sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb"; + rev = "8aac2701530899b64bdea735a1de8da899815220"; + sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6"; }; } { @@ -144,21 +135,21 @@ }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/jdkato/prose"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + url = "https://github.com/jdkato/prose"; + rev = "c24611cae00c16858e611ef77226dd2f7502759f"; + sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; }; } { - goPackagePath = "github.com/kr/fs"; + goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } { @@ -175,8 +166,17 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; - sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; + rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; + sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + }; + } + { + goPackagePath = "github.com/markbates/inflect"; + fetch = { + type = "git"; + url = "https://github.com/markbates/inflect"; + rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; + sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; }; } { @@ -184,8 +184,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "f809cc9d384e2f7f3985a28a899237b892f35719"; - sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd"; + rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; + sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } { @@ -220,26 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; - sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "a5f8514e29e90a859e93871b1582e5c81f466f82"; - sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd"; + rev = "69d355db5304c0f7f809a2edc054553e7142f016"; + sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; }; } { @@ -247,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; - sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; + rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; + sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; }; } { @@ -283,8 +265,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; - sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; + rev = "34594c771f2c18301dc152640ad40ece28795373"; + sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; }; } { @@ -328,8 +310,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; - sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; + rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; + sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; }; } { @@ -337,8 +319,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; - sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; + rev = "05e8a0eda380579888eb53c394909df027f06991"; + sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; }; } { @@ -351,15 +333,6 @@ }; } { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "850760c427c516be930bc91280636328f1a62286"; - sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; - }; - } - { goPackagePath = "golang.org/x/image"; fetch = { type = "git"; @@ -373,8 +346,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; - sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; + rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; + sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; }; } { @@ -382,8 +355,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; + rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; + sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; }; } { @@ -391,8 +364,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; - sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; + rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; + sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; }; } { @@ -400,8 +373,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; + rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; + sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; }; } ] diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix deleted file mode 100644 index 486d3fb7ddf7..000000000000 --- a/pkgs/applications/misc/k3b/wrapper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }: - -let - binPath = lib.makeBinPath [ cdrtools ]; -in symlinkJoin { - name = "k3b-${k3b-original.version}"; - - paths = [ k3b-original ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/k3b \ - --prefix PATH ':' ${binPath} - ''; -} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a3e5f99eef66..914dc3351456 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; postInstall = '' diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix new file mode 100644 index 000000000000..0aba5106387d --- /dev/null +++ b/pkgs/applications/misc/ola/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd +, perl, python3, python3Packages +}: + +stdenv.mkDerivation rec { + name = "ola-${version}"; + version = "0.10.5"; + + src = fetchFromGitHub { + owner = "OpenLightingProject"; + repo = "ola"; + rev = version; + sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; + }; + + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; + propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ]; + + configureFlags = [ "--enable-python-libs" ]; + + meta = with stdenv.lib; { + description = "A framework for controlling entertainment lighting equipment."; + maintainers = [ maintainers.globin ]; + licenses = with licenses; [ lgpl21 gpl2Plus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 137d68d81711..148dd427fbc7 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +let + libfm' = libfm.override { inherit withGtk3; }; + gtk = if withGtk3 then gtk3 else gtk2; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "pcmanfm-1.2.5"; src = fetchurl { @@ -7,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; - buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + + configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { homepage = http://blog.lxde.org/?cat=28/; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index ad5a0b0ef0de..65366607c50c 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }: +{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation { name = "pcmanx-gtk2-1.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; }; - buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; + buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix new file mode 100644 index 000000000000..60a8cf2c6cd1 --- /dev/null +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, libsndfile, libmad +}: + +mkDerivation rec { + name = "qlcplus-${version}"; + version = "4.11.0"; + + src = fetchFromGitHub { + owner = "mcallegari"; + repo = "qlcplus"; + rev = "QLC+_${version}"; + sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg"; + }; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + ]; + + qmakeFlags = [ "INSTALLROOT=$(out)" ]; + + postPatch = '' + patchShebangs . + sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \ + -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \ + -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \ + variables.pri + ''; + + meta = with stdenv.lib; { + description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; + maintainers = [ maintainers.globin ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index e8ab85121dac..f283c250b5bd 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { description = "A Traybar Application for Syncthing written in C++"; longDescription = '' A cross-platform status bar for Syncthing. - Currently supports OS X, Windows and Linux. + Currently supports macOS, Windows and Linux. Written in C++ with Qt. ''; license = licenses.lgpl3; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index 4908769bef6e..fc63745ebb84 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MySQL database management for Mac OS X"; + description = "MySQL database management for macOS"; homepage = http://www.sequelpro.com/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 6c02a51367e0..89d493bcd016 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; + patches = [ ./openssl-1.1.patch ]; + postPatch = '' ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch new file mode 100644 index 000000000000..56dc6112844e --- /dev/null +++ b/pkgs/applications/misc/synergy/openssl-1.1.patch @@ -0,0 +1,18 @@ +--- a/src/lib/net/SecureSocket.cpp 2017-07-22 19:33:22.442645291 +0200 ++++ b/src/lib/net/SecureSocket.cpp 2017-07-22 19:36:25.632595581 +0200 +@@ -805,9 +805,14 @@ + showCipherStackDesc(sStack); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release +- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead ++ // of OpenSSL, it's not visible + STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; ++#else ++ // Use SSL_get_client_ciphers() for newer versions ++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); ++#endif + if (cStack == NULL) { + LOG((CLOG_DEBUG1 "remote cipher list not available")); + } diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index bc15b084cd9f..2b66dd41a2a8 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -1,17 +1,17 @@ /* -Requirements for Building TrueCrypt for Linux and Mac OS X: +Requirements for Building TrueCrypt for Linux and macOS: ----------------------------------------------------------- - GNU Make - GNU C++ Compiler 4.0 or compatible -- Apple XCode (Mac OS X only) +- Apple XCode (macOS only) - pkg-config - wxWidgets 2.8 library source code (available at http://www.wxwidgets.org) - FUSE library (available at http://fuse.sourceforge.net and http://code.google.com/p/macfuse) -Instructions for Building TrueCrypt for Linux and Mac OS X: +Instructions for Building TrueCrypt for Linux and macOS: ----------------------------------------------------------- 1) Change the current directory to the root of the TrueCrypt source code. diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index f0a48cfb8d4a..f745bf3ad601 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, automake111x, autoreconfHook }: +{ stdenv, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { version = "0.9"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; - buildInputs = [ ncurses automake111x autoreconfHook ]; + buildInputs = [ ncurses autoreconfHook ]; preAutoreconf = '' touch NEWS diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix deleted file mode 100644 index 462b6d0e57bb..000000000000 --- a/pkgs/applications/misc/vanitygen/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchgit, stdenv, openssl, pcre }: - -stdenv.mkDerivation rec { - version = "0.21"; - name = "vanitygen-${version}"; - - src = fetchgit { - url = "https://github.com/samr7/vanitygen"; - rev = "refs/tags/${version}"; - sha256 = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah"; - }; - - buildInputs = [ openssl pcre ]; - - installPhase = '' - mkdir -p $out/bin - cp vanitygen $out/bin - cp keyconv $out/bin/vanitygen-keyconv - ''; - - meta = { - description = "Bitcoin vanity address generator"; - longDescription= '' - Vanitygen can search for exact prefixes or regular expression - matches, so you can generate Bitcoin addresses that starts - with the needed mnemonic. - - Vanitygen can generate regular bitcoin addresses, namecoin - addresses, and testnet addresses. - - When searching for exact prefixes, vanitygen will ensure that - the prefix is possible, will provide a difficulty estimate, - and will run about 30% faster. - ''; - homepage = https://github.com/samr7/vanitygen; - license = stdenv.lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 9b27e8fc7947..c677f7371fca 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -4,11 +4,9 @@ , perl, proj, rastermagick, shapelib }: -let +stdenv.mkDerivation rec { + name = "xastir-${version}"; version = "208"; -in -stdenv.mkDerivation { - name = "xastir-"+version; src = fetchFromGitHub { owner = "Xastir"; @@ -17,15 +15,16 @@ stdenv.mkDerivation { sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; }; - buildInputs = - [ autoreconfHook - curl db gdal libgeotiff - libXpm libXt motif pcre - perl proj rastermagick shapelib - ]; + buildInputs = [ + autoreconfHook + curl db gdal libgeotiff + libXpm libXt motif pcre + perl proj rastermagick shapelib + ]; - configureFlags = - [ "--with-motif-includes=${motif}/include" ]; + configureFlags = [ "--with-motif-includes=${motif}/include" ]; + + postPatch = "patchShebangs ."; meta = with stdenv.lib; { description = "Graphical APRS client"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 11177f3ee487..7802e1bf1b56 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,7 +60,10 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg" + "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 ]; opusWithCustomModes = libopus.override { @@ -73,7 +76,7 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz libxslt harfbuzz-icu libxml2 + ffmpeg harfbuzz-icu libxslt libxml2 ]; # build paths and release info @@ -104,23 +107,22 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 dbus_glib + glib gtk2 gtk3 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "56.0.0.0") gtk3; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/nix_plugin_paths_52.patch + ./patches/chromium-gn-bootstrap-r8.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch - ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch - ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch - ++ optional enableWideVine ./patches/widevine.patch; + + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -183,9 +185,14 @@ let enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; - } // { + treat_warnings_as_errors = false; is_clang = false; + clang_use_chrome_plugins = false; + remove_webcore_debug_symbols = true; + use_gtk3 = true; + enable_swiftshader = false; + fieldtrial_testing_like_official_build = true; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30a16d824d01..7aa02e2c5745 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings_desktop_schemas # package customization , channel ? "stable" @@ -67,9 +67,6 @@ let inherit (stdenv.lib) versionAtLeast; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -78,10 +75,10 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings_desktop_schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome3.defaultIconTheme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch deleted file mode 100644 index 2ffdcc0ad6af..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> -Date: 2017-06-25 -Initial Package Version: 57.0.2987.110 -Upstream Status: Not submitted -Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch -Description: Allows building with system provided ffmpeg. Rediffed - for chromium-59.0.3071.109. - -diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h ---- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500 -@@ -23,10 +23,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of FFmpeg's --// BUILD.gn file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +36,6 @@ extern "C" { - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> -diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc ---- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500 -@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- // We ignore kNoTimestamp here since -int64_t::min() is possible; see -- // https://crbug.com/700501. Technically this is a valid value, but in -- // practice shouldn't occur, so just ignore it when estimating. -- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration && -- packet_pts < start_time_estimates[stream->index]) { -- start_time_estimates[stream->index] = packet_pts; -- } -- } -- packet_buffer = packet_buffer->next; -- } -- } - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch new file mode 100644 index 000000000000..d9f389aaf588 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch deleted file mode 100644 index 10a04b7ec8dc..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 -+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 -@@ -41,6 +41,11 @@ - #include <errno.h> - #include <sys/mman.h> - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index be9aa16e1515..c20ce2cca306 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx"; + sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 708320e92a2d..e80cfdbc904e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2"; - sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n"; - version = "60.0.3112.66"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; + version = "60.0.3112.78"; }; dev = { - sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g"; - sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv"; - version = "61.0.3153.4"; + sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq"; + sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1"; + version = "61.0.3163.25"; }; stable = { - sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp"; - sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1"; - version = "59.0.3071.115"; + sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl"; + sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk"; + version = "60.0.3112.90"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index bd5f757738d4..0aacbd2565b9 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 33591b5365a5..2d076828694c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,945 +1,955 @@ { - version = "54.0.1"; + version = "55.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ach/firefox-55.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678"; + sha512 = "c991a8c53d1f415253a66fdf337e082a3cb75f30b9b340ed29b059e2a6f50d67c320bcfa9584206f1e23c1af5d3e8b825e30ee009f7d8130318cc356d8550316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/af/firefox-55.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5"; + sha512 = "8112c343179b1bd61f03cb67a0712ef5584848bd2dfb28dc46ccabfc66eb803ef9f23d023c6f22c6cadf715ba459f36e99bae5be8f6c62af772a7f67f724767e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/an/firefox-55.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3"; + sha512 = "41899ad93e627e851423ec8b5acd6bd940a10dbe80e98377e7d4080b31e9a8f5ceb51eec46931429688a4b56065af2a3595f51c3ef2c51561dd5a06d0c0cb347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ar/firefox-55.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f"; + sha512 = "ba4bf0c1ede64f3c11d00b5ef3b193d4e36bfc49687572050b22cbd0bc30be050a7df3401eb20e869b1f33ab16988701392b845f89d4693a589be589eda54ecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/as/firefox-55.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce"; + sha512 = "b3ae2fad8940ddaa16102f9d43bc5113a5f4f38a4527c43e1a4b88a63015d128a201b68b72377c23274023b7486829181bb44ecec43ba50fe1bc438d30da8349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ast/firefox-55.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4"; + sha512 = "80688f5eb65f4fe09a840d5f3ba2516bbe45dbb2f2b96cb4f8af38900880dea22f3b8e040491d81c96abb4fa1d50815e86b5806dc8e31148c0235b0a72bafb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/az/firefox-55.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42"; + sha512 = "0e8d42394d79c3a8f8f9f7a7ddf5894adbd89627832908e2f82b4712bd3260e8b10e04eb0166ee8c2a1010cd9dc4836ccbf99d3af794187ee90f06142286bed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/be/firefox-55.0.1.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "c13a53874775cf3e2da703dc7ca5c1f9d69e3af9050b7f58cf903f87a2ee7643e7db361d3d3628e470d808ce1b412d355653cf2d67691e1e89c584a9709cfe41"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bg/firefox-55.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68"; + sha512 = "8a6a34f0a31793e70edfd44edb54d3709a3960c3625f5856626c28f0df0e93d18d0190d3161c18315df678328918fd4029de9be9db7a6ee426a9054dc5d9c50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-BD/firefox-55.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c"; + sha512 = "17e2b8046b6dfe2bef7c8dd7027fa2fe2c008672b7d5a9676a9b6ece12b7b3bf7fe61a5d5378f1974f530199739982a83b421b7cf4643c9bd654a4b2235f3bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-IN/firefox-55.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb"; + sha512 = "39a5c15019881507552a583053fe601dbc04e0de410dad3ce7727ddcdb128b28c5becfc748a1c5b89bb272db66f2bcb4eb6ea1b8a3cd37c1d10156ba29b3165d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/br/firefox-55.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd"; + sha512 = "7ee7d1fcffbaa0791c88338a8b471bc20747abed505ece15f74f58b747eb56b300b71ff15e72e56d5deaf75d98ccbe93bf8c1e0ad3038238913f72f9156f8790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bs/firefox-55.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516"; + sha512 = "038c185cd6fd2efb1dc51c9e2275d98fa0040e68de306d5cc3d799893a69f937353c94c00bfb9fcfef2a2c6099149926ce30ecfbd972170cea501f9c44c836c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ca/firefox-55.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5"; + sha512 = "be717242a9c93705234d87d0b091925f1b07e60130aa06ef19b72283f0594abafed577b6d98eaa9fab6941d1f8c2f43292de20b9476312aebe0fc51d368ac50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cak/firefox-55.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4"; + sha512 = "1b9ea57bd4164862c9c29e3fa16200aa7ca15c277f00b838439edba4256e323aff97d27264bbd20a5e08ed70e4f897611505570eb01a2ce0f9cb30c2c611d065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cs/firefox-55.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39"; + sha512 = "ee32ed99d5d4b05d6a9ca4d6d274e16ada833dfc9f5735898eebcffa7925d1ac1229ab671af9f8eaad7d4fd6d2135e58c8f6266e1173a8797a513b977235ec0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cy/firefox-55.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5"; + sha512 = "29302ad22573fc52e0764b89848ea43ebff98ffe94d3d91d1aafa05e063cf9c5580c9e79e0b987f18a87a648a6076f98c48d20d5621ebd46be02fcf41ce19779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/da/firefox-55.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56"; + sha512 = "25f8252bac8b1b4e353dc8be0945820bb9e013dfb30866b14d6109026c122cd9038e0e70d54f959a59dbf99fbbee48d0e3254f7e1091b2e2e2811b83498e36d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/de/firefox-55.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a"; + sha512 = "2d013bd921ea9758807e64588f887fd841c6b8b32a18b9eab3b2ac1f598c4d7acb27b2defd4a836bedac238c96cc7bf700ef87f973a39d21e87ddbb7e27be1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/dsb/firefox-55.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd"; + sha512 = "f640fd20c2beb5cf6aaf402fa220a01176e0eb74d4429cc10f76bfca9a8579e17e490bb2f045ca6e61de4ab49703c68571c4dd7ee82c438b2f8ab94ecf53ec0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/el/firefox-55.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818"; + sha512 = "6d1f68305ef9faf6c0d304b8ed4b4c093375c03b95b01ea7c61fd421cefbc84b8fb878cf49fdc5f3ec8552b277dc351f201470c5c4f45a249b3e010a863dd65b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-GB/firefox-55.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f"; + sha512 = "e4bb9746e00490bac82750130284847d845ee8c85d48d84b799d725a3dd82ce68046bb2c9bcfa4c92070383a4f439766abe58dbfc9346cb51aabdc730b3e8ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-US/firefox-55.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb"; + sha512 = "13598109ae60682bfa122925874173749114a093f7989bf0a4cac4def59db5ad53db61546d28ce09482cab1225924c7d35bf4efa8b3051e78ad760f892050a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-ZA/firefox-55.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637"; + sha512 = "5d7dd0d6b2e06dc2c3ab94cdeefd168c005703cc3c632aafd7896bc631002ebe26c1c0103307f3165b720cfe79e63fdc9b37429885a2eefdba492b714ab308ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eo/firefox-55.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e"; + sha512 = "1f67bfb98891effb2ecfb127b9ab9ffda714187a34265277fb7841f41d5a4ddfb81ead7f4cc1d38af290feaeb36c315b2050a889b6e9b9bd7b9cdd51ba0cbb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-AR/firefox-55.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d"; + sha512 = "011b4f49e90ad091be5e8d932ee9a76b1653f307db328ee6770b99ef37f57e62477ca7529d182f328203523f9d0160f337748166691921d5720640c634522515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-CL/firefox-55.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057"; + sha512 = "ef29baee74951692720c32522bec81330911ac0366e9bbd816a5bdf0738e064268af2f63ea5b3542e51eed21775cde8b4d60f6cb47bb18b94315afcd078a1c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-ES/firefox-55.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de"; + sha512 = "8f21e0632e2b4d86883b139f5992becd89a8c243afd131e2f9dd863e2fb21279bd858f618789a73d46218de3bd59a5c4b017dcdda5b1db9a3400e0e0ace3c9c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-MX/firefox-55.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4"; + sha512 = "9d59bfffc685aee31004894e81dda5efa3c512bfe61dbf5d224b31cdff6a859598287a8a80e7d96645718689df2dfee3b4a79c064e789d246cf32138b9346f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/et/firefox-55.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7"; + sha512 = "a833839e8243760942337161192fdcddcdd7ccffd3b5ce3c7dc939492366e8579e0deabc933a607885f20059e40dabffd389a52db05ea6bdbc794d9e15a1c9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eu/firefox-55.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76"; + sha512 = "0415c1f00f612d080dccfc3829c3f89de4fc5921ad8603c7eda0aaf9ca57b055c66a4a0f44782a8b381e4e166964f5cc805b65b84525a073a1fa3e605bd07aaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fa/firefox-55.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981"; + sha512 = "699be76441b245de502cf0b9ac44fe3c454fd11fa00d6ad590b2a393a31f4f291c3b5b7075741c82c28a721eb38a11a3627e71b42e910fbc2f474f2284820f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ff/firefox-55.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3"; + sha512 = "910928159d16269784d3a41b8a423138060bdedc7e190c80e5bc95bb9358b6e8fd08c519106d68326eea4bc8f5c54157cda151fcb72d5bb1d19f82696297760b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fi/firefox-55.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb"; + sha512 = "1085f674e3fd557d62d29c81d52dbabbf09229a03d38d8eba1886a98937c560e91b8a5cd5fac1d313946eba6622eb21462bb1227cd35dfef523b34e8928b7f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fr/firefox-55.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f"; + sha512 = "038f8198004d38ad9e2814bd55b2ef1d6e3af3f8f3369a90b41e44421b94ae960380ab65367375e15eeb1d0af72343874314c1005aee18dc86cf079fdc19fb80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fy-NL/firefox-55.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17"; + sha512 = "83eb5df7022ad9adce4ab7966fc4979aad7f6d1bf2b47001105d67d7933feb8c264708938b87fac3908a65adcebf72f6af9d5623fa6026458dad76a360f0608d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ga-IE/firefox-55.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa"; + sha512 = "34f3bf3ecfc264bcbde3bbca80bf138d1f7f925ce6606d6c588f0df25f22eb912dd3d0388a6798091cb88b51a22380e01fe984bc80edf95c76e301e7cac2b2cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gd/firefox-55.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2"; + sha512 = "4d2f04c7cf06c6f8efed7abe74f8ab27794c01aba57ae2f45bbd1a749295ed7b6db4389b1c93148330695c6d213642dd9046068f0bd23ed3920bfcc7fb9dd4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gl/firefox-55.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34"; + sha512 = "d70c3cd99be7dd1d80c070d5301a1d84f33f1b626e0471861980512c81672066a7869a5d289cf862ff4d0ff6f488b0a7cc298675aa9afb0a62a191ac476b71b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gn/firefox-55.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff"; + sha512 = "f183e3c3ef451367362aad3bc96cf1500fce451d3c0f467822e756266bc48d7d9d7952e82f171db2d8bf23d41bf58cef34f67da7211d31335f86574abaee567f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gu-IN/firefox-55.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b"; + sha512 = "31afdd21bc2d9af1a52cd24f74c76480658fb0506f38e6fd5f5f85bd66eedae49cef89aed9060f1255c515d24b2998cbf9eb449b5083bc6f2bf1805d152197ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/he/firefox-55.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e"; + sha512 = "c68c416515336a6c2c8ae69151c1b8c972f24671d354929eaf3eb647944d6e99085b5768a8156e59015401a33174fac774f0bdacc6005c3ad23a008009653fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hi-IN/firefox-55.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6"; + sha512 = "2e62b66e9d34c9a7d9472726dc322746ef399b24400b9315dcd15f010d0bdf80d8f0c1ca912ce3275770ad925f47d576b59484b3acd861d1f3fae9e2ffe5277f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hr/firefox-55.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83"; + sha512 = "a5caa5839d7ba556314c513a9599ebdae05de41f5b3289987a1f1d1dee030b53da07773fd6517f42899ef443770ec3549f4160c77e26f68a1e1bb3ca598bd866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hsb/firefox-55.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37"; + sha512 = "df83ae1a93cbed29c85d75add44b70fde9c187953fa169cbdc106ecb722ec845b129fb762325f08d0ecca188ac6bac43c6662059a6694d43ed90472ee8eb23de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hu/firefox-55.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17"; + sha512 = "c5787634d4fcff538423fdd9761989ef341058fb129f33bb729686cbe5319aad7d67c8d19d9e42b7d81ac08381cd0d07504fe413a9c38c310ba3d7440ceb6934"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hy-AM/firefox-55.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117"; + sha512 = "6318a512fee633ce49a2ac6cf3b3295e74624bd935e9979193796956c11239f1da3ebeb99b5547e3aaaf339c4f87d0e4501edacc13fd11435abf000a9e119ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/id/firefox-55.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559"; + sha512 = "2c7d0de71a675a0d6abe14037db11087ad9a2825bc2d9bbd863f209b86d9875da08eb2005590418262b63bdb12a9b122e54230824d5916059f3855b628eec8de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/is/firefox-55.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5"; + sha512 = "a1dc23e047cb7bc21f3c1a888cd8f9168161296a47148c2296e4f033d7038fed83566a429610fb35b514aa8a902839a00201901d46361205e5e292eca7418813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/it/firefox-55.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c"; + sha512 = "cb2bd028873e28aa197e3f599b2d1aed913273f888cc2eb69775b1936763011baec1f03bc57e3da6b2088a8ff37d08ab014bdce8161bf6929c57f658772af8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ja/firefox-55.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4"; + sha512 = "dda54f19f4a5a493b7ae6167955c9ff4c503d8cf239fe6b993a87d3f73171162e29270366bb3f2f1f1afea80e3332928417bb3e26fc414d6543e9ab2e1a2008a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ka/firefox-55.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2"; + sha512 = "9e0a7042225361addf1fe41c13e0e3df869e41c1a88b4adfa64cd4912c4cc113804dac23ef5ac7a8a196ebb8552a2baf988aa9da618ab1a64e307d02c15177c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kab/firefox-55.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9"; + sha512 = "27f319c418dc54296f616b9fc2b6069f1f0da92b2eb95d872b4fa582f494f0339cbe40fe0427ae1cf8a1ddb1ee436ae56773c7413591f4bd76f027916bcef187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kk/firefox-55.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da"; + sha512 = "7d5664fb243b214846fbf2a1772be96df94345bbc6cb076b9e75ea0dc126e3113faab67ee935792df48a915aa7274acc1d4ce48bf09f17f662341b2235ef6d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/km/firefox-55.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4"; + sha512 = "7df87f956678f7f90df95f5bbe1309eba7f89ec2e1030746f56df0e14cdce200a1204bb73f8db68b02655db36d13941cd0887116e974df2e11d8d222f5dfb6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kn/firefox-55.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0"; + sha512 = "532c5d7a67d6508188628b9728fb6a1339ed9c789fd8cc58c33a9b9495e8ba8b979c631bfae66096b164c277dc0eeca167911aa4b856a1d6d437bd5a60103a3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ko/firefox-55.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1"; + sha512 = "c1170288dfe6d2ea418d93e3d401a2746c88df77cd8ededd70b17dac4652488b20966aa472f7e929662a8305fc03f7153b534d79d6e8dc62dfb0b468a417317c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lij/firefox-55.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47"; + sha512 = "3f2b8227f04064ea5507774848296fb12d4e17b806cea7a356c36995648a4db740d68382ab6d6417d745dc278b6cddc6f18cfc6fbbeb60480106d726715c0d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lt/firefox-55.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470"; + sha512 = "24d0621a76f53b2a4fc7f3b4d97a1a066ff6fb7c7e1dba9028ef719a38042271412068a7a874862ccbbaf010a7491088e231036271c54e51c624bb82937b139f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lv/firefox-55.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8"; + sha512 = "c36c40e21e305373e7d4ddb67702055cdef28f880739c2339c5e75a0f1d30c2e73316f65badd69dc93552ae33a1f493658002d73caac5a97b8d03e3e4365e6fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mai/firefox-55.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f"; + sha512 = "f033e7d1cf52486775ec614bf6272cdde3cbb17a00aad49c8c7739d72488c03d9803c860aed581640689e336bc55799521da4bb0b3a6c9cedd3af38f94c944f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mk/firefox-55.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96"; + sha512 = "d01f9acf588e5067681422daff9be1f2e033b91ab2dba9a979dfd9bd918b1a20e5ace64739ebccffe025e03b80a2f3a955cbf5940ee9341e2f62053ffcbdc408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ml/firefox-55.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1"; + sha512 = "95a6cabe1b0fa984de1df148207d22b570a09a5c1fe95e898a33e0e0c905b9f868586294032712339562d8f5cc78961a7fed5aa3c1a5c1a77ea5a5f3197b520d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mr/firefox-55.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb"; + sha512 = "59053496d9d37cec07ed1dde98ae07db593726d49fe97399e97e4a6ac667835cb34db4864c5e67bffd1a9c1727c1af2feb19fea0685fdd2f6b5226ad24022656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ms/firefox-55.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b"; + sha512 = "c3a23a7165b0f233fa606e622868690f696b262f33a2c1f2b23ab37f392e71bac7cfd04f9e240660ed5f6075cd3192d9ce1be46a649d5abfb7beb9a16ff91e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/my/firefox-55.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9"; + sha512 = "493e5d971b55696121edcd72712120caf638aa13d2654e8f4db4e814a7b8c4cc2c7b89622b385029ed1a9ca14294cc39d8522784000708f418205c36b1f2fa64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nb-NO/firefox-55.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9"; + sha512 = "c7c3e85d2749bbdc75a359ff5285ef3cee14b710aaa6e0f39415cd72693f219589b64d26cbf15020c380b51ac0d4a6d41e730af9991cca1b4d5f1ddae4c63dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nl/firefox-55.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3"; + sha512 = "1d77c158ebfdb65004f5c999e6da15ba2cef2dc998c69bbf5477bdb8b41131e968187017783c65103f2040db2154833857790ab9c6aa705b866b60683f0c4ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nn-NO/firefox-55.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd"; + sha512 = "37630d6abf1db435bbff8ea2821966ea58fcc3326199dcfc0e95833732c9ad767610781046ba4b031b516f5dc301e7a7d699699ad7b39efd2e9cf3df05bc3637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/or/firefox-55.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b"; + sha512 = "bec28704aff4671d2ee5413a29335f84bb04b4d5dfbd108988e1772c68486e1f5bdb2b7b799792343b1191b768cee7cda59aad0efbc0dbc45def3149e7eb41a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pa-IN/firefox-55.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c"; + sha512 = "eeb9a7a8400e14241296ea75c55fbc17461d298bf7d4a4b57e26cec434e398d070b9207d6d19a3038b65fec4792f9eff47b758f5e5b0ff373b349f67f44ee1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pl/firefox-55.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4"; + sha512 = "560a7fe08b460f99e6d166caa8fd442ea343a1eff9c5643b96ce9085fbd76cc27eb3b2ccda59172c5e7542bfecdc3cad39257506531c51350f655744bfe166f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-BR/firefox-55.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f"; + sha512 = "452bdb25f38b31af0ed6cb1f2636ce238ab898065b8f61f505206e1dde12555a18d491b5895b549e1d5efef94144b99988a69e19f9ccc068c76474bc0898aca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-PT/firefox-55.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb"; + sha512 = "54c6b9bae229fbdbe366fac25e9a3b89f48d85f41f715f9db1f3f1b4fd210056f642549a982eff9ac4e2b68640ab01517ff9756cd63b72045f11c07619b59761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/rm/firefox-55.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36"; + sha512 = "075a161ab0cbc6417dbfb4873c8ade404a2fc911f2da9e0149d90b04b32f6c9ccbf42b22f2abaf13ef4f9cb4d8330a90054517a651d0c0f1f940431ece8b2518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ro/firefox-55.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53"; + sha512 = "5c1eea33100fe2bd020f9d1ac2bb781ec04b25a12d271d3dbc311319f7a688f245e2d7357055bd8321ead58923857f689e417827ac3125ec206975134e4203cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ru/firefox-55.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea"; + sha512 = "c9d99eaa7ad17a29cfd860c343581654da5daf15db5bf653a3d0b13b03d1914fafe7f6801810b3ee06abcf687c71cc1f9d20cd727b10cbe91e7bb6c977aa279b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/si/firefox-55.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c"; + sha512 = "e36e3e4767f9afd211dd4333bee2ca4ad3d9ccc7081b1cd008098263570aad4272eab91032527c3f6f0a70e54953dc806cfc00a08627ebd81943195add184603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sk/firefox-55.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3"; + sha512 = "148b8ebbaba7d111234108758fb48ddc883c6d9094e8f22680d65cb9ef05fb34eeec4e09c141e7523ff511fbbc2db84b0eef31efa92730ab30a4830192875c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sl/firefox-55.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb"; + sha512 = "fd0f058fb2a7fd304d08fc4966c7235c557d869b0a02955a3459b354793a1c2245e45ecffe9d0b251357062cd81db10b5d3f982ab15abcdf275af31d91038f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/son/firefox-55.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873"; + sha512 = "4e6bc840e788b0a3a9cbeca86969d3a37afcf600b583777de84cd77d21010360afa39dc2ab4809b12cd798307cb84c6f10e7760395b2fd2aedabfc6419b02d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sq/firefox-55.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052"; + sha512 = "e852af7925a2a5a0c59cc54137d1a574d5cadd831929ddbf375b726b1241dcf901b18f97f030a5ca08283453ee86ddfa113488adeac6fb974524911e354cb763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sr/firefox-55.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8"; + sha512 = "99b3f089f8c17701ddedb41add217ff5395b3f942e7f455c19f63e49a499282a2432d9f198eb4ca219cf25656ac90c803c4cb7be01975be307b7835b2ad0561b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sv-SE/firefox-55.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842"; + sha512 = "f5f91a85e7ed10c2734779586e69856903051074ac76dd186d1816253e4d7441d60cad5172c1dc2496e0cb660dbc40fef4bc586e8e7bd19f7145f3b53f2c2736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ta/firefox-55.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6"; + sha512 = "291bd760b10656f5cf7df91e5c978e3caf8748180aa98507e378ee90033df8b971a020b253d5ea691067eb7d08a3ac3f998b64860b49bdf7b2b8eeb29d18b737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/te/firefox-55.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6"; + sha512 = "4b24c2f7a8e9b660285a9a8e14789bf18fe42bdd484dabf68a99b502a52eacce81df5d5375321cdc5c1b69988e35f0e9e3d2d2cfacaee72033a2c68af0b25a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/th/firefox-55.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3"; + sha512 = "a479f709c4c512dd3906e9694ffc454ae315855b4a37740619b8536d1dd98764ad191944617351243eba474ec44c95d3153efb69d4dc13aa8047bbc477feabec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/tr/firefox-55.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537"; + sha512 = "1e12a004cd63cd547cd925736a2cec78ffb98d5f395474c9e8fc96752cf621a2311d638d96444afb593f113c6ec46a892fe96fba882ed7b7c49aa05d4685e70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uk/firefox-55.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744"; + sha512 = "0634489527974d7c7afbe2c55d054f9dd50ebfeb2777944dcb8d4a14ba5171230540c17172c5b0d5df64d99fd23d7b9ce384657e1e1b25b73118b9b66b748613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ur/firefox-55.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd"; + sha512 = "8a519683ea1d611f6932e651dd0e400596529ae428700ddf8929924910614598f8d8c660e317357520d31bf1347d1f90c1e89b91eb74b339eedb981da032af4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uz/firefox-55.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac"; + sha512 = "964afe349e8b7f908f520d039fd1da6c8ee245b68dc8957a04222ff281a077f86e7b8185850ef7a4b741a697832bc36bbfda39051409a9c3adb74f2def64b621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/vi/firefox-55.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24"; + sha512 = "ae9dc4d2be8d82cd82dbcfe638d021713e8559fae2d14847aec687fa90d90afbbb206bfbabaa15ed00ba8c4ac058f4c950bfd320c307b968246968fdd30748de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/xh/firefox-55.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337"; + sha512 = "f9f0c35d0446da3bcc57b0b2dd9cd622de5a3fbb0a6daa987d2de6fcb2804be9020ca190c8b318375fb255d7ff86b265a65e7d0fd819f9004fbeab1546cb62c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-CN/firefox-55.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442"; + sha512 = "f67ba436854973c9a809b78c3a2511aed27b6c4532304464220841a2159f851e84bdf0fe394527aeea48238802fc5c7336b2399078a8891d4c76554e8067038e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-TW/firefox-55.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e"; + sha512 = "ef0e3fc59630c9ab9072142651420151b897b048af3eac878c8222bdba76d47e2e45160227a2a58862a55ccce954451b892b4f5b5c6062d769dbd940edfefdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ach/firefox-55.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d"; + sha512 = "cfd977fb5aea5c5b707df817993d547aae8b8c04293c3f57dfb630fcb2a0e85b5deb79253da544b7c3a92ec5319989fa148ad3b1ce950d6bafc7d4fe8f1bd2d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/af/firefox-55.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f"; + sha512 = "b6c671a746691cea4d4cf6d5b9932b0f1c025f04e11e7ecd38a53c0c2759d3a3ca82e6d00febd1f644fc18730b2f6538734adc02c9e18094f7533f81a955088d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/an/firefox-55.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46"; + sha512 = "51f824b2208b18939ac12a6d63507186d20e8e66e0fd9ff030c1bc637a14d987ba85ad5b2425883d90f88952fde84f43e291e68da004e8114d854965421ba9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ar/firefox-55.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4"; + sha512 = "411b0f01d5f6a4f8915f51960b0d7d62a1b9cd9c3de665674a019d356677e9ea82720df4b715523ddc87458dc3edabd8945b7d1e41574a22dc4df5c0b62ed869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/as/firefox-55.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e"; + sha512 = "18d6094a2780759e97b4556fad1d504ee1c1cb41a5ceb8481599f2a41458b5c0100b1fd2a0911f1e125b4089b093f1a306bf838e1c00bbd1bd5c482e0f894881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ast/firefox-55.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331"; + sha512 = "ec88a6ae8ef64aa01b2c03feed80ece24ddbe19f2c1abe38f5e2b21554b782ee52331175ccada48f47d60c56d4c9a36b28b6d62b332dfe64f033ff9a90581449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/az/firefox-55.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5"; + sha512 = "e58a646b68a068de0c5b96f088770383345fe46661d667e6d9cc1b7fb0384351dbb10caca6eec618303ab8dfaa82708a71d9376e16017173710f41e0b7d55357"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/be/firefox-55.0.1.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "e4d8d905eab7b69c78864cbf268ff8e8246f5792e3e55d28e8a44c12027ae8269738a0ddd0fddd4282dd7536e1266e58461553334f1287f7416c9fd5dd29e2d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bg/firefox-55.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725"; + sha512 = "62ae8fab0c91d585234f7eda98a4a7075956b00bbcee5ba06d1dacc2262b32eae37ef3cd1b66da34b02bc309b1b704a2b97c297e3c189de6eb2c969dc1100626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-BD/firefox-55.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085"; + sha512 = "0cce61b9d0f88911abe306140de86964808d8e94880287e1d3ca6dec6b3c36b79143d03d46bc366809e69b70492ae648aa80bc57897d38c92bd76ab56b36a24e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-IN/firefox-55.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b"; + sha512 = "53f25ae4f49e125b7757740a5f5ec9d08687871d4ab56ae3f4f4506bee2d1453c24c99022a4be0e07f6376bce3b0c0063b7155ec7decff8e2ad61ca456def7e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/br/firefox-55.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66"; + sha512 = "98d83c45d5599bbc62db2204f177b2ff4b710a75ccbbe6d67c8d16829504b8f4a2dbfd2940e583514e41147811c4b3cc4f74637b3212e018eacad85f6f56e892"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bs/firefox-55.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6"; + sha512 = "7691546b4cb9cc4de8f0544e42528704f5c204b382b195da7ef2764faf5e2b6cc58285da890e800ed83e82be01924db0e219d1523959c04faa24a11e3e16b04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ca/firefox-55.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68"; + sha512 = "21d664d5a589ef1f0f41a936d8e46a3b220d7b1c6e996f639556986e36097144b82dce5dcec1807b3191e5dc3835df6007e845c847bafcffb0e456777cfcbb67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cak/firefox-55.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c"; + sha512 = "a2a289569ed8ce5fd9916d11bab43a0f4166c2878095f2a30fc8ed587eabad7ddcd5fa7a43070eb54daf8549e5f19a3c12d103d1cee493eac2e1adc3b536a952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cs/firefox-55.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d"; + sha512 = "a24dcacc4f5de63f335e44087f40c203de5ffd482232e691f1f1cd576bd4d41ab949c3d07ad8c1aeeba38863b1a9ce69380079a3cfa0ae7ea3dffebe7d964972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cy/firefox-55.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d"; + sha512 = "7e961c9366d3c0fb2668d6f8d9d874bd7d52e28ed53a461afc234375a5d06239fdb866c12d53f41027672afb889e257075bb59ad869c56a54b409bcb3a4e0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/da/firefox-55.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7"; + sha512 = "a058ea5cde4277a26d6f3592b281212087511e8efd79dbd05a59696c81e762949709e12f94f794b252abbfb810a410f95c103b52cfcba34d2397a0b0ca51ad96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/de/firefox-55.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04"; + sha512 = "22788aa3f8bf59a1366ef4bcf3250f2d6155d7ee3de8b2b019dda6a294e6fef58ce1ec6bd0d54b41e8618491de872249f4fe1618779edc418a43d2a5189f4b99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/dsb/firefox-55.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912"; + sha512 = "bbafd69ddb7f73c4b3fa272fdf91352a9db8b9ab57d56d2d5e743738026e6e5f811c0bda9a69b1db4d533ca8c6de1b5bece1f0f4784092b3b3e8672bb30c3876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/el/firefox-55.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03"; + sha512 = "650b3add1753bbad904bb2c1577ee28598f0a0588e38a219b29ca1cb333e9e561c17e560e4e00ba6c861d89ddb70bd7352289b5711c0e24f6f78d37e53e02683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-GB/firefox-55.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61"; + sha512 = "e82dc2a34212a8346bee261ecfb07e82aca6b09582a652f1f9ff90df6f5a5fb9f44c284eb27db4aeba743239262a87faa0e4f6ee3fec66fa97788e66c4e83bfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-US/firefox-55.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622"; + sha512 = "763f0b2294085215282852ce482f2be625efe355138ae709c84ed65ef4ba28908115fe3027eece41e3b5fd1fc164c050d150fefb4fb142eb6652229c021bfe7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-ZA/firefox-55.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a"; + sha512 = "9ca62fc6eac9050a7141ad4025e6fd6e3a703e18c3a184ecd1620fa8cf098867ce4886774673e0c10833ca1312b555f02d436b5d8088b78963b682a5de1537bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eo/firefox-55.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c"; + sha512 = "3dd8d02a132d96913e017aa4194ab496c21a7b708c5ee1e02bec3c7bcc769a7f53c8908bd56a71918e55b49201f645f68ece3e0eb522fe0719a152bd6067245b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-AR/firefox-55.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d"; + sha512 = "aa8ab141a092b481cfb9fa72f2226913ab7672260b2fd0dbee894215ce373d7cbc1ed7451cd1c1010ff079d14cf9f2e992cc32e981b44360b82d867fb4709d85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-CL/firefox-55.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f"; + sha512 = "73d2ae9ad8442a49700341127e7ba31ecba568e558d27b607c5a6bf8e89a9e515c3bf6b9946f094ba4640cf5bea970e5f8473a5ce953a09c1fdcabd2a68d7a7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-ES/firefox-55.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5"; + sha512 = "213f71697b99bb7dcc978bca57fe119940f8197b75b5aed3964db89859fdbaaa0968829269c5a8d6f01bf21f670f85bcbdc9f7d4f6b111971636e44580b67003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-MX/firefox-55.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f"; + sha512 = "d12e8f13fd94c3c6f93f5e20ef5cfeb5c3f82a479baa5bca5a5517dd55bd048db59454a56730e69f6bf051a81b5d2bad239ce0fe8975aa00c863667b464503cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/et/firefox-55.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd"; + sha512 = "8f6a6393f009b19743debdaf1bf3cbe12e566a4288f8fdacbb0119961542fcbf082aff03ebe79f54311ba00017851ca4ec4efab9553ea2e1178b6dba9677e31e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eu/firefox-55.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad"; + sha512 = "7b1f3af68205e3688bfc0e519f9cc6f796477d2f8b11f0c7e035fab1ce917e713b6b18dd498c5d04da3c51a50dda01132268a24180ebcdc15f452bb25d0dab0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fa/firefox-55.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332"; + sha512 = "1379243d07c5216b31ae2689b11d8729d0905ace42e4bc8ba40289bd39509020ae551e2fd0f5a16b883486ae0bc20c33ee2902650304cf628a239ce3071ed683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ff/firefox-55.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b"; + sha512 = "3bf4eec5d5a3c4da765db6997a57dca3f67d52ef302cd38db759592b9904e7b357870d39920bd75b805700ec4b9f4a94400111a321518c5d4f31690ece946289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fi/firefox-55.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b"; + sha512 = "1a33cd82fbda2554fa76684afbf3a843babd5872459026f1f32fe496e99ed631252ec63933a291214535476f8858d03aea26b7cf2108a029ab5f99ea8c229650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fr/firefox-55.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4"; + sha512 = "c92bf5cfce5b5114342d98d526e287ded4d82516f008e705ded1ddbf11c1cccd8ba3d3ba777f6be0727f7aca776ac7312fc7e5ce3c2f77ae69420541471d0289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fy-NL/firefox-55.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87"; + sha512 = "16973677379fa16283956fd31a73da2697c4f38b41618e14bcaef4fd3e68430c15ca5327f6752d8123c137b3e026ff682d534e7819f87d8cc3ebe7a7ca865b87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ga-IE/firefox-55.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4"; + sha512 = "a26c96dccb61b5e7685a9914f68e40e3ca468438438bbb07f9b524a9a2f3b26959b7a359b332eeb7da47f7a8ffee5f8811115e857406e99abd7f170b64fa26b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gd/firefox-55.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5"; + sha512 = "d2e4578150f8ad0166c48f6fcad2f735ddc982af2cca30aa694e44e593f4033c259e7f7aee1fd1941fded86d2937464bf11e8a906fb732ca2084632ffc7d642a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gl/firefox-55.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5"; + sha512 = "999546c43bb56cf95509a8e9b122e649e4ca608fc4e0a3b8e82e9f58c334460420c58650a8837e4247b63eee6f840def3bb80e6c517badd50449e0dfc471d661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gn/firefox-55.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd"; + sha512 = "caeec1355d3bd3331241fec97b0c6008b8f3c42c1d56b1796a7be4c2ae994569a5d2011fd5b723ca3e560bf07fb1de50523ad2736345aee753f37d6cf5ae7f09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gu-IN/firefox-55.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1"; + sha512 = "1e3feebb32c4240d5c15b0c915b92eff9f63b266ed74b32e1df9fe824b27a3c4d2d06492c9b9d47ba22460e0c2cc854322250edcc1a54e4b6346ac9ee0048b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/he/firefox-55.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3"; + sha512 = "5d83b761b3f8653e1701e75a66c3741a9dc7e377fdb2d7b66a23bcf314f3993e45293d8682e65fb58f2d6a720ecffb0b2568aedcc89804da1efad0590629c3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hi-IN/firefox-55.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c"; + sha512 = "9c59cba32c02786bed46c01797e7bbf3d745f90da98cd07ce6ccb578c402bdc8cf3d8887a57b5523a072ddc6d98dcd9761862f32c59570160c732b8408f182c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hr/firefox-55.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f"; + sha512 = "20684ed388fffc81fd7b8d88f4d57f4bb130ea4671a60d4dd70d1bd5250b491a36cb0eff0b7820a26f24695d30afd5c909709b6e8ab27f9e24ae1381a8b4dbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hsb/firefox-55.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf"; + sha512 = "996ee7693cdb808ede4df1c6d8533a964f0bd98a4026067bfcdad8d1c78b232cdd83f1fa7fceb532deb9197ccde437d42d13449c8ad0fe9cde3dec1f3006a775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hu/firefox-55.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73"; + sha512 = "faaf14a3f2aaefdada31761bca2056d2592bdb6ec5a053d7c8efe871b0b2ff191b152fc240782b24f3954b4913501efd303bdb301b4a69140e6c47a3fa6856a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hy-AM/firefox-55.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a"; + sha512 = "9190ade1a9885ebbfd0090ee926e0d5e31da61a7c98f874916c423a60328c5f936f29fb60949c1ebf9d726f07f097312c64a67dc193d71537d4adf4a9b7729c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/id/firefox-55.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207"; + sha512 = "88fe78ccc643a704e068a32d2fc60624a23c269b85bf0c96c8538fb5243c1db93578f1a91993537bd7dc672acb9dc6f4cc75ed444774ff74c7abaf621226b43e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/is/firefox-55.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8"; + sha512 = "969e28b5d8696fe735063161b4848fb3a8cc400ca2f2e3db246dbe68d301c7da3adad7bfda61eed10c85ac028582b2568f57d0c727abd184be2850d44bea427e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/it/firefox-55.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173"; + sha512 = "59b389ae6710bfe3d8c62b9b482bf44af419446db0ff5278b1c18bb45eaf122f5b3b47d32b19eb3686cd965bf1e51643221bb01fd6be6990f8ef14159ae6477a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ja/firefox-55.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b"; + sha512 = "f79c322f4d2d23efc682ca4e02d114583008f2797e5672022d412b27356a1bd34f4c216545ef8c8f00fef17be0fb405384d98f4e44679372b9cf7953e2e8af78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ka/firefox-55.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d"; + sha512 = "a5f440758bc4607955911d0fb2320036b4d9a06dea07c7cbfe9fd67b767a544cc0df582af329e4c99f3eeb065627e90a989368d26a14530fc94a28d6fe65c7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kab/firefox-55.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f"; + sha512 = "1f9d2fd390226d06f0165d9a5f53c5b9d67a424969b7881b91374867179ed09efd05cf404de086734165312cfe09131692874632359c9a9fd323a6a9b7dec101"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kk/firefox-55.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44"; + sha512 = "faa9e21a95a41d8c846a5cec6f7cd0d2cdb0a382593e91e824e1d8013af146378c965b28cd44953702167e2e355436a2f5042ae727cf6c95ca75d0eb57f92119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/km/firefox-55.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6"; + sha512 = "514bccf7cf2c433d846c7307c75b512f20c6ca4deef5f8f59f744656a81e514a9e62fd4336e223fdb59698b6dc00db0aeec51da4518f0d3467b5a3f06598ef42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kn/firefox-55.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6"; + sha512 = "814b1fcdd19fa4044ab760818ffc6e246ea2cea36b89785069af857763b23623f4e9cc50a6aa19a77a00a61b501c26182d7296706b7d01bc9a25006c03580058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ko/firefox-55.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830"; + sha512 = "462747db276da856fffb562036367b947822f18513c2eb7cf70d6d3ac31438b59896ebf9c12e9e61abd5adb0b761774ad90cb41eb59789beb994c8dba11fe8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lij/firefox-55.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b"; + sha512 = "04802af2002399a7540f7ea5e5dbb23cb02d30f567a0afb64fdbc45645251d8bdd6e9563f4b5f5c324c267828115c719b161b074b80f7b9ba8ad4a1a0b24f371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lt/firefox-55.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd"; + sha512 = "968e19afc7f0613fc184632529b379334d2409d5d0da5b24117748cbdfac714e8465267b65d2674f8721b47e969279c054add60f2a060331617ac2a02e97d032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lv/firefox-55.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c"; + sha512 = "b6ec789c77040508706702d1fff20f0a277c8a5a1f28a375eedef91e0d7cf29a58b3f2027ce1ad2bf8a25ea5043751ee52b8468c4cfc516e1859570a1dad02d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mai/firefox-55.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54"; + sha512 = "1ca567163688b14cfd4deb5cd2f0739807807060dde26508d87c8590cb8ebc9010edd7dc92869de6af2928eab32d42fad5da94a74ebb3bf96cdb7883cf2f9225"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mk/firefox-55.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351"; + sha512 = "87ad815c0aa9e45507ef044248fb961b7bb98b4d4b10426aa448f41d129a162bc1d3f6106016c7cd92cf03b63c1682224aedfea9093030561b13dca79c6d11f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ml/firefox-55.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5"; + sha512 = "85fe206ba0b20d8eb6c3846685c851ec579d8f188a5d6626ec56c9840bf8a76a0616457ee687cb4d395ac0e71978f9403832207a4675c560546c7ea813014aca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mr/firefox-55.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886"; + sha512 = "c41938fdc8a19a49a6100ebf2d452750069e3038d8dbaeab4397f2289622963fa6d74a3c96419eb6cfe7e14bafcbf4b3b4a1f85638f1a402c2cb69daf720b740"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ms/firefox-55.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b"; + sha512 = "f37a606f1713e2f680b32ebcd5bb90f68cf324f26512bfeb628a4d9e71d138004bf08082fad8fa961b2ff28ae3d34c453d890c37b9f775fe27944bb7a5c013f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/my/firefox-55.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471"; + sha512 = "fa730b3568f06a8350372ac88d3ed7738cd254406a65c36570efbb502a61a60a1a4ab14bf587b4ffe365d3133eb76c841540248402dc87db0d3607235f2878c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nb-NO/firefox-55.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617"; + sha512 = "5e1fb7632da3755454deca4169802694051c769b0da75978b1762694e0516b202198b74b306d2670c9d05f7237faead7ba15cb55272cc8b3c7cdf14c0a44ce8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nl/firefox-55.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac"; + sha512 = "5e6dc41cb51190786724b34a566ffa8b16314f54200b7bc2130a6178f0d3693df0fefc7a3935db13e9cd27ff5ade21927900680e9cd6c964ac7a23961d72214d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nn-NO/firefox-55.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16"; + sha512 = "2d95d711b99a9e94bcb0e2cb923fa584d7a1e7ca2d2b3d289b20f78a8f8c0bf909a26d45a1feb540bcc4c9e983e40d0eecd24b16d0227d5155f7ad684705215c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/or/firefox-55.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae"; + sha512 = "d9bb706c45c5e7a822f106888f47615c1948ee74d8bb5a179ba838634262862a561fcf8d0b79a86089b08f0213cf1ee21387bd4e7de1b47719fd76ef607234ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pa-IN/firefox-55.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55"; + sha512 = "ca8121c9ab978cd044bf8efd5c0ad07d7e790cfd1cd6121413d2508d6ddf8fa75e510cf866b5e8506312b1b22fdbc95e3af9008440fdfb8c392dbefeb81ad3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pl/firefox-55.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d"; + sha512 = "d83d65bf5f0ed37a7f5a2b66e075aaf4caea91240763e537d0198369e93d0c64b1526f14023d7daa697ac6678728f6d7520aa66bcec7ea282760116642b00c05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-BR/firefox-55.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0"; + sha512 = "2184c06f9f205b624f2fa7e9437311c9dd3100135061cb0eb94dabafa27e9b5c5da5aa31e97a70e6f8b773b1c1704472a4cd87d30d6dd463eaad3d8eda009254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-PT/firefox-55.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a"; + sha512 = "c40aea22fe64588eae5510b0c047c2d42673b7f22ef17a126bd642a2cfa9fa6ee27e7480089b381d4ceaedec2508ca6685f8301631948624f85b024403456d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/rm/firefox-55.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4"; + sha512 = "235cf224fa8f78561ce0f1178dbaf3ac0798cbfd3c3da97069e74aadfb38c6fdc90c3e01d45a5346588bc001f5f82e5fbed73672e7bae6fd2ce721d99416c1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ro/firefox-55.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64"; + sha512 = "f6f3ba58b8241678c4a82d03433e2f58ead36037068809c404e930afb335fcd4057f3db6a5266785fd573271e66dd98d4987d6524c2b0fa2d01fb05b5671432f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ru/firefox-55.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d"; + sha512 = "c7f9833724b30b81a58c6efb00ae57a69b32c2e7590d6ca0ccdc65d8960336068daf7b8f4e305a466c054f8f4897464cadb3fea48ac05aecef14e18c121a64ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/si/firefox-55.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68"; + sha512 = "669762fb074a3d7da7ae00c753863519e1d8afe68a183e7f6bd83d8e4305f2db7e1bb8b9a8e64aec20d3b735196bd55874573cca257d4a2de5f59b3d6d7aaee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sk/firefox-55.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147"; + sha512 = "beb2861f5127b121fce3ef6811de7d801c5ec3cd05c832c16b2839c08a925d2e34a8106270ec956e5f45d6062e9d5cbf72ae4d7d9ed894d9cb44d5914f0a41dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sl/firefox-55.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1"; + sha512 = "687b20e50fae586cfff1426e189f28d54aecdeacef80b3f68caacf002f52cb7141fe34803dd1e1d8664efc8500987c752e616e26aaa15b3f051afe878e3a82af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/son/firefox-55.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9"; + sha512 = "92b0b4353fb0e858e3998903c5d2ef82e38259ce1d9560abf06ec6b55174d17db871d967cdb62b4ad23bfbcbb10a2541d14f0b2886f73d6b2d670c93fc48220d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sq/firefox-55.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08"; + sha512 = "d9ec031149f9a845e6f11c34a96aa54cc14566e569b1395a83158fe32f433c51a95b1e16e99706f92973661c48856372b134c43b2ebbdc8d358108dc0998033c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sr/firefox-55.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc"; + sha512 = "cbb81a562427e4773a4c971d24bfc5f9ac689f8f85b6edc2a2b32572f10b202e8b16de562cae85cfe1a9e86eafa3bd60c8bcbfc2b3675128c96c73c223894f08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sv-SE/firefox-55.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43"; + sha512 = "f46223ace271fcd4ca96ac6724bf60d99da5e80dcf00d6f2889cfdb41d1ca8c03ea3ca5ba61f6cc855c9cc2b62e4602628847d641f85d8bf2c6dd33cdd208b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ta/firefox-55.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21"; + sha512 = "cd3297d41e6524eb7ce5d398b8a95ee0ab008a626b1846e50096343aa5f469149a2a5c0f3d452d0f10ebe6f397e68d76dda4eaa9f3c10b0fa2b6a0d5d60bfa2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/te/firefox-55.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502"; + sha512 = "ac7a7ffe87187610a861e32a1a314ab0dc3141eb0910a1987946adccc686cbd1b58ccd996009fef49d642f3ae0568cf429811e652f4fa23b1f5381f3511fb65c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/th/firefox-55.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0"; + sha512 = "2dc3ed9875d863b27151ae75dc83b5f2f738f0fac24f5fd1b3ba9f7a4aed1c2e77aaaf588bdca534b2a4078a086558ed820cbfd6e852244897dda7601bd5091f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/tr/firefox-55.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7"; + sha512 = "869d654afeb246281be5b287ae76749e25da2e15d7d456cb5848281153307ca50f35a2c62dba0014b90ecf322a85ae8b7daa12ca156e8f5ac33854f6a890f19e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uk/firefox-55.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47"; + sha512 = "709a5b8889c4a871dfa15c46bc7eee38986f4b76eef4bade78daf88f46e0ee50a815c54c0bf1e77924d1ae04d464de3a4d1c03494bb2781df11ab32d9e4766ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ur/firefox-55.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92"; + sha512 = "d7a0481116d791eebc511ef35a79dad263bcbcde54838a03b86fd5864746c4353cea4e8ee7998b18b266509e2ce584da0cfed39c324c79b847b44ecb043ccf8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uz/firefox-55.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa"; + sha512 = "5102829f08869d90f362c8da8a6947c23b23c616b6c3cca58e4a8fc9ba68573e8d74238029ad51ca2439f7946359903bbf03c2468c86bfa7f7679580f9a60649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/vi/firefox-55.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f"; + sha512 = "a4a936439a729142af19aa2db02a6e769bfe6c653e6d54381b7d80756968b6ebe6dbad51a267936e173b49d3f92b94e89012fd35c54aa790f17217b001b7dc3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/xh/firefox-55.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae"; + sha512 = "9ac4a54cb66cdbc720e263277dbeee14d243c025ee63f6a1ee4990575fbbb333a0979a19615c226fe1486d9896d6754b5485dedcffb576511754d6781c572dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-CN/firefox-55.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738"; + sha512 = "e007854739c12502665418c3e0470940cb9df0314537275dac5d3c80923a756dda14b7161196b7289187d6706d58f887f59f47e07f764714298e5da1a41a0979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-TW/firefox-55.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb"; + sha512 = "f414e7c6da2b2b5a1871f25def1ee055f7cdb66a6e76ee66848c26e2eb2d999e65070a816067990cb9d855420392e4b84b52b957e6dca063f8a011f2ddb4bbe6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 3bcc2ab003c1..ac3f7d1380c5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -22,7 +22,7 @@ in writeScript "update-${name}" '' pushd ${basePath} HOME=`mktemp -d` - cat ${./firefox.key} | gpg2 --import + cat ${./firefox.key} | gpg --import tmpfile=`mktemp` url=${baseUrl} @@ -47,7 +47,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 11d9324c0424..a5256e19e1b4 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }: let common = opts: callPackage (import ./common.nix opts); in @@ -6,12 +6,17 @@ rec { firefox = common rec { pname = "firefox"; - version = "54.0.1"; + version = "55.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2"; + sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47"; }; + patches = lib.optional stdenv.isi686 (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; + sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; + }); + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -25,10 +30,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.2.1esr"; + version = "52.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3"; + sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9"; }; meta = firefox.meta // { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index c33bff60e01e..fa98f2a9e785 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; installPhase = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index c25390a7c99a..0452e7486e6f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z" + "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8" else - "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl" + "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d" else if arch == "x86_64" then - "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls" + "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l" else - "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w"; + "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index d7dd83b58f37..9a805eb55e4f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp" + "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb" else - "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8"; + "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 423be7c33e78..980c90a91ee7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -84,7 +84,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.3"; + version = "7.0.4"; lang = "en-US"; @@ -94,7 +94,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1p91szx60xx3295bpap9w2ydgaibj0yn9lbdyhajal35bbhjxqhc"; + sha256 = "17hz6nv7py80zbksk1dypmj8agr5jzsfrpjncphpsrflvbqzs2bx"; }; "i686-linux" = fetchurl { @@ -102,7 +102,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0p51dxiq3qxyc5n7xvh1hq039pvp7z730f6dks4h5p3sfqw6isfp"; + sha256 = "0g8m5x891f4kdvb3fhmh98xfw569sbqd9wcadflabf9vc9bqv3al"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 749fc8557881..a1238cb5964f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -6,17 +6,18 @@ , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr -, patchelf +, patchelf, makeWrapper +, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.10.867.38-1"; + version = "1.11.917.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi"; + sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6"; }; unpackPhase = '' @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { tar -xvf data.tar.xz ''; - nativeBuildInputs = [ patchelf ]; + nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf - ]; + ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/vivaldi/vivaldi-bin + '' + stdenv.lib.optionalString proprietaryCodecs '' + sed -i '/^VIVALDI_FFMPEG_FOUND/ a \ + checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi + '' + '' echo "Finished patching Vivaldi binaries" ''; @@ -67,6 +72,8 @@ stdenv.mkDerivation rec { "$out"/opt/vivaldi/product_logo_''${d}.png \ "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png done + wrapProgram "$out/bin/vivaldi" \ + --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix new file mode 100644 index 000000000000..1a1b7ae142c5 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, fetchpatch +, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, pciutils, pkgconfig, python2, xdg_utils +}: + +stdenv.mkDerivation rec { + name = "${product}-${version}"; + product = "vivaldi-ffmpeg-codecs"; + version = "60.0.3112.90"; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5"; + }; + + buildInputs = [ ]; + + nativeBuildInputs = [ + dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + python2 xdg_utils + ]; + + patches = [ + ../chromium/patches/chromium-gn-bootstrap-r8.patch + ]; + + configurePhase = '' + runHook preConfigure + + local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0" + python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args" + out/Release/gn gen out/Release -v --args="$args" + + runHook postConfigure + ''; + + buildPhase = '' + ninja -C out/Release -v libffmpeg.so + ''; + + dontStrip = true; + + installPhase = '' + mkdir -p "$out/lib" + cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so" + ''; + + meta = with stdenv.lib; { + description = "Additional support for proprietary codecs for Vivaldi"; + homepage = "https://ffmpeg.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lluchs ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh new file mode 100755 index 000000000000..6ef6206c4f4a --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p libarchive curl common-updater-scripts + +set -eu -o pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +root=../../../../.. +export NIXPKGS_ALLOW_UNFREE=1 + +version() { + (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') +} + +vivaldi_version_old=$(version vivaldi) +vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p') + +if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then + echo "nothing to do, vivaldi $vivaldi_version is current" + exit +fi + +# Download vivaldi and save hash and file path. +url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb" +mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") +hash=${prefetch[0]} +path=${prefetch[1]} + +echo "vivaldi: $vivaldi_version_old -> $vivaldi_version" +(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash") + +# Check vivaldi-ffmpeg-codecs version. +chromium_version_old=$(version vivaldi-ffmpeg-codecs) +chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+') + +if [[ "$chromium_version" != "$chromium_version_old" ]]; then + echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version" + (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") +fi diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 5016dc8fca3f..95ad83cb3b17 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.12.0"; + version = "0.12.2"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y"; + sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index a7cc5d789382..65758fca6000 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - makeWrapper autoconf automake115x libtool curl sasl jdk maven + makeWrapper autoconf automake libtool curl sasl jdk maven python wrapPython boto setuptools leveldb subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 5cdb30b3f00e..081811ecd646 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,15 +14,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.6.3"; + localkube-version = "1.7.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm"; + sha256 = "1pp5bi0bpxxzrshvkv47hqs20jfx3gp1i1p3pw1rvzm5n1fn2q1a"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.20.0"; + version = "0.21.0"; goPackagePath = "k8s.io/minikube"; @@ -30,7 +30,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb"; + sha256 = "1y72kdrpbxwfzxs9jslcrb2l3xw83z4i7raf5c7sky4wf2nx8vis"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 92b043cfdbd2..a04cbed96101 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -54,4 +54,16 @@ in { # checks are failing again doCheck = false; }; + + terraform_0_10_0 = generic { + version = "0.10.0"; + sha256 = "1z6pmyfh4z5w8k2j46ancc0m9lsiq6d0m56nxj1kawb3n5q9dgds"; + # remove debugging and the -dev postfix in the version + preBuild = '' + buildFlagsArray=( + -ldflags + "-X github.com/hashicorp/terraform/terraform.VersionPrerelease= -s -w" + ) + ''; + }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e97bdd906c57..25259b467bb6 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,30 +24,27 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "30.4.22"; - sha256 = - { - "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r"; - "i686-linux" = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - arch = - { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + version = "32.4.23"; + sha256 = { + "x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1"; + "i686-linux" = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + arch = { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - libs = - [ - dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM - libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt - ncurses zlib + libs = [ + dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM + libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt + ncurses zlib - qtbase qtdeclarative qtwebkit - ]; + qtbase qtdeclarative qtwebkit + ]; ldpath = stdenv.lib.makeLibraryPath libs; desktopItem = makeDesktopItem { @@ -99,10 +96,10 @@ in mkDerivation { mkdir -p "$out/bin" RPATH="${ldpath}:$out/${appdir}" + chmod 755 $out/${appdir}/dropbox makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" - chmod 755 $out/${appdir}/dropbox rm $out/${appdir}/wmctrl ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl @@ -141,11 +138,11 @@ in mkDerivation { paxmark m $out/${appdir}/dropbox ''; - meta = { - homepage = http://www.dropbox.com; + meta = with lib; { description = "Online stored folders (daemon version)"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = lib.licenses.unfree; + homepage = http://www.dropbox.com; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 37dcd00fd02d..6643f385074b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { longDescription = '' FileZilla Client is a free, open source FTP client. It supports FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available - under many platforms, binaries for Windows, Linux and Mac OS X are + under many platforms, binaries for Windows, Linux and macOS are provided. ''; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix new file mode 100644 index 000000000000..284c4f8cee1a --- /dev/null +++ b/pkgs/applications/networking/gns3/gui.nix @@ -0,0 +1,34 @@ +{ stdenv, python34Packages, fetchFromGitHub }: + +# TODO: Python 3.6 was failing +python34Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "gns3-gui"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; + }; + + propagatedBuildInputs = with python34Packages; [ + raven psutil jsonschema # tox for check + # Runtime dependencies + sip pyqt5 + ]; + + doCheck = false; # Failing + + meta = with stdenv.lib; { + description = "Graphical Network Simulator"; + #longDescription = '' + # ... + #''; + homepage = "https://www.gns3.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix new file mode 100644 index 000000000000..067d636f137c --- /dev/null +++ b/pkgs/applications/networking/gns3/server.nix @@ -0,0 +1,37 @@ +{ stdenv, python34Packages, fetchFromGitHub }: + +python34Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "gns3-server"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7"; + }; + + propagatedBuildInputs = with python34Packages; [ + aiohttp jinja2 psutil zipstream aiohttp-cors raven jsonschema + ]; + + # Requires network access + doCheck = false; + + postInstall = '' + rm $out/bin/gns3loopback # For windows only + ''; + meta = with stdenv.lib; { + description = "Graphical Network Simulator 3 server"; + longDescription = '' + The GNS3 server manages emulators such as Dynamips, VirtualBox or + Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST + API. + ''; + homepage = "https://www.gns3.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a1f9588d6c90..f787f3f26e92 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,44 +1,46 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, fetchurl, makeDesktopItem, makeWrapper , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango -, systemd, libXScrnSaver }: +, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb +, pango, systemd, libXScrnSaver, libcxx }: stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "10m3ixvhmxdw55awd84gx13m222qjykj7gcigbjabcvsgp2z63xs"; + sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz"; }; + nativeBuildInputs = [ makeWrapper ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss pango systemd libXScrnSaver + libXtst nspr nss libxcb pango systemd libXScrnSaver ]; installPhase = '' - mkdir -p $out/{bin,share/pixmaps} - mv * $out + mkdir -p $out/{bin,opt,share/pixmaps} + mv * $out/opt # Copying how adobe-reader does it, # see pkgs/applications/misc/adobe-reader/builder.sh patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out:$libPath" \ - $out/Discord + --set-rpath "$out/opt:$libPath" \ + $out/opt/Discord + + paxmark m $out/opt/Discord - paxmark m $out/Discord + wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib" - ln -s $out/Discord $out/bin/ - ln -s $out/discord.png $out/share/pixmaps + ln -s $out/opt/Discord $out/bin/ + ln -s $out/opt/discord.png $out/share/pixmaps - # Putting udev in the path won't work :( - ln -s ${systemd.lib}/lib/libudev.so.1 $out ln -s "${desktopItem}/share/applications" $out/share/ ''; @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; - maintainers = [ maintainers.ldesgoui ]; + maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix deleted file mode 100644 index 014ea0933366..000000000000 --- a/pkgs/applications/networking/instant-messengers/gale/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf -, libtool, pkgconfig }: - -stdenv.mkDerivation { - name = "gale-1.1happy"; - - src = fetchFromGitHub { - owner = "grawity"; - repo = "gale"; - rev = "b34a67288e8bd6f0b51b60abb704858172a3665c"; - sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf"; - }; - - nativeBuildInputs = [ m4 libtool automake autoconf ]; - buildInputs = [ boehmgc openssl adns pkgconfig ]; - - patches = [ ./gale-install.in.patch ]; - - preConfigure = '' - substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc - ./bootstrap - ''; - configureArgs = [ "--sysconfdir=/etc" ]; - - meta = with stdenv.lib; { - homepage = http://gale.org/; - description = "Chat/messaging system (server and client)"; - platforms = platforms.all; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch deleted file mode 100644 index 33e3e09a96d2..000000000000 --- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch +++ /dev/null @@ -1,339 +0,0 @@ -diff --git a/gale-install.in b/gale-install.in -index 50e8ad8..eec0ed2 100644 ---- a/gale-install.in -+++ b/gale-install.in -@@ -29,22 +29,78 @@ testkey_stdin() { - gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>" - } - --if [ -n "$GALE_SYS_DIR" ]; then -- SYS_DIR="$GALE_SYS_DIR" --elif [ -n "$sysconfdir" ]; then -- SYS_DIR="$sysconfdir/gale" -+INST_SYS_DIR="$sysconfdir/gale" -+ -+if [ `id -u` -eq 0 ]; then -+ is_root=yes -+ SYS_DIR=/etc/gale -+else -+ is_root=no -+ SYS_DIR="$HOME/.gale" -+fi -+ -+if [ -f /etc/NIXOS ]; then -+ is_nixos=yes -+else -+ is_nixos=no -+fi -+ -+if [ -u /run/wrappers/bin/gksign ]; then -+ cat <<EOM -+ -+Gale appears to have already been set up via the NixOS module system (check -+/etc/nixos/configuration.nix). -+ -+EOM -+ -+ exit 0 -+fi -+ -+if [ $is_root = yes ]; then -+ cat <<EOM -+ -+You are running gale-install as root, so I'm going to assume you want to set up -+Gale for system-wide use. Unfortunately, Gale expects to be able to run the -+"gksign" program via setuid, and we can't change gksign's permissions once it's -+already been installed because the Nix store is immutable by design. -+ -+EOM -+ -+ if [ $is_nixos = no ]; then -+ cat <<EOM -+ -+This isn't a NixOS system. Gale can only be installed for a single user on -+non-NixOS systems. If you want a system-wide installation, you'll have to -+install Gale the old-fashioned way. Sorry. -+ -+EOM -+ -+ exit 1 -+ fi -+ cat <<EOM -+ -+This script will generate a domain key for you, and after you get it signed, you -+can finish the setup process by configuring Gale via the NixOS module system -+(i.e. /etc/nixos/configuration.nix). -+ -+EOM -+ - else -- echo "Error: cannot locate Gale system configuration directory." -- exit 1 -+ cat <<EOM -+ -+Hi. You are running gale-install as a normal user, so I'm going to assume you -+want to set up Gale for your own (i.e. non-system-wide) use. -+ -+EOM -+ - fi - --CONF="$SYS_DIR/conf" - umask 022 --PATH="$bindir:$sbindir:$PATH:/usr/ucb" -+PATH="$bindir:$sbindir:$PATH" - export PATH - --if [ -f "$CONF" ]; then -- exec 3<"$CONF" -+if [ -n "$SYS_DIR" ] && [ -f "$SYS_DIR/conf" ]; then -+ exec 3<"$SYS_DIR/conf" - - while read var value <&3 ; do - case "$var" in -@@ -58,52 +114,14 @@ if [ -f "$CONF" ]; then - exec 3<&- - fi - --USER="`whoami`" --if [ -z "$USER" ]; then -- echo "Error: cannot determine your username." -- exit 1 --fi -- --# ----------------------------------------------------------------------------- --# check directory structure -- --if [ ! -d "$SYS_DIR" ]; then -- echo "Error: Invalid SYS_DIR: \"$SYS_DIR\"." -- exit 1 --fi -- - # ----------------------------------------------------------------------------- --# get settings for important variables: user, domain, server -+# get settings for important variables: domain, server - --[ -n "$CONF_GALE_USER" ] && GALE_USER="$CONF_GALE_USER" - [ -n "$CONF_GALE_DOMAIN" ] && GALE_DOMAIN="$CONF_GALE_DOMAIN" - [ -n "$CONF_GALE_SERVER" ] && GALE_SERVER="$CONF_GALE_SERVER" - --if [ -z "$GALE_USER" ]; then --cat << EOM -- --Hi. You need to denote a user to own the Gale domain secret key. You must --trust this user with Gale authentication for your domain; the "gksign" program --will run as this user. I recommend using a special "gale" user; if you don't --have administrative privileges here, you'll probably have to use your own --account. I do not recommend the use of "root". -- --No harm done if you stop this script now to set up such a user. -- --EOM -- -- printf "Enter the Gale username: " -- read GALE_USER -- if [ -z "$GALE_USER" ]; then -- echo "Error: Invalid username or no home dir: \"$GALE_USER\"." -- exit 1 -- fi --else -- echo "Using \"$GALE_USER\" as the Gale owner." --fi -- - if [ -z "$GALE_DOMAIN" ] ; then --cat << EOM -+ cat << EOM - - You need to identify the name of your Gale domain for two purposes: - -@@ -140,97 +158,56 @@ else - fi - - # ----------------------------------------------------------------------------- --# create configuration file -- --if [ ! -f "$CONF" ]; then --cat > "$CONF" <<EOM --# $CONF -- created by Gale installer; edit to suit. --EOM -+# create configuration file (if this is a single-user setup) -+ -+if [ $is_root = no ]; then -+ CONF="$SYS_DIR/conf" -+ -+ if [ ! -d "$SYS_DIR" ]; then -+ run mkdir -m 0700 -p "$SYS_DIR" -+ run mkdir -m 0700 -p "$SYS_DIR/auth" -+ run mkdir -m 0755 -p "$SYS_DIR/auth/trusted" -+ run cp -f "$INST_SYS_DIR/auth/trusted/ROOT" "$SYS_DIR/auth/trusted" -+ run mkdir -m 0700 -p "$SYS_DIR/auth/private" -+ run mkdir -p "$SYS_DIR/auth/local" "$SYS_DIR/auth/cache" -+ fi - --cat <<EOM -+ if [ ! -f "$CONF" ]; then -+ cat <<EOM - - *** Creating "$CONF". - Examine and edit this file to your taste and local needs. - If you want to recreate it from scratch, remove it and re-run this. --EOM --fi -- --[ -n "$CONF_GALE_USER" ] || cat >> "$CONF" <<EOM - --# The user who owns the domain secret key. (Used in installation and upgrade) --GALE_USER $GALE_USER - EOM - --[ -n "$CONF_GALE_DOMAIN" ] || cat >> "$CONF" << EOM -+ cat > "$CONF" <<EOF -+# $CONF -- created by Gale installer; edit to suit. - - # The authentication domain to use. (Mandatory) - GALE_DOMAIN $GALE_DOMAIN --EOM -- --# ----------------------------------------------------------------------------- --# make gksign setuid -+EOF - --gksign="$sbindir/gksign" --readlink="`which readlink 2>/dev/null`" --[ -x "$readlink" ] && gksignlink="`"$readlink" "$gksign" 2>/dev/null`" --[ -f "$gksignlink" ] && gksign="$gksignlink" -- --echo "" --if copy chown "$GALE_USER" "$gksign" ; then -- : --else -- echo "*** We need to chown $GALE_USER '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 -+ fi - fi --run chmod 4755 "$gksign" - --# ----------------------------------------------------------------------------- --# create a domain, if necessary -+if [ $is_root = no ]; then -+ GALE_SYS_DIR="$SYS_DIR" -+ export GALE_SYS_DIR - --echo "" --if test -u "$gksign" || copy chmod u+s "$gksign" ; then -- : -+ testkey "$GALE_DOMAIN" && exit 0 -+ echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -+ GALE="$SYS_DIR" - else -- echo "*** We need to chmod u+s '$gksign'." -- echo " Please run this script as a user that can do so," -- echo " or do so yourself and re-run this script." -- exit 1 --fi -- --testkey "$GALE_DOMAIN" && exit 0 --echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"." -- --if [ "x$GALE_USER" != "x$USER" ]; then --cat <<EOM --Become user "$GALE_USER" (you are now "$USER") and run this script again --to create a new domain; contact your domain administrator if you wish to --become part of an existing domain. --EOM -- exit 1 --fi -- --if [ -z "$HOME" ]; then -- cd -- HOME="`pwd`" -- echo "Warning: \$HOME not set, assuming \"$HOME\"." --fi -- --GALE="$HOME/.gale" --mkdir -p "$GALE" --if [ ! -w "$GALE" ]; then -- echo "Error: Cannot create \"$GALE\"." -- exit 1 -+ GALE="`pwd`" - fi - - unsigned="$GALE/$GALE_DOMAIN.unsigned" - signer="`echo "$GALE_DOMAIN" | sed 's%^[^.@:/]*[.@:/]%%'`" - [ -z "$signer" ] && signer="ROOT" - --if [ -f "$unsigned" ]; then -- --cat << EOM -+if [ $is_root = no ] && [ -f "$unsigned" ]; then -+ cat << EOM - - Okay, so we've already been here. Last time, I created the file - "$unsigned" for you to have signed. -@@ -275,16 +252,12 @@ EOM - exit 1 - fi - --cat << EOM -- --The domain should be properly configured now. Assuming users can access a --version of "gksign" setuid to "$GALE_USER" (this user), they should be --able to start running clients and generating IDs for themselves. -+ cat << EOM - --The installation process is complete! -+The domain should be properly configured now. The installation process is -+complete! - - EOM -- - exit 0 - fi - -@@ -300,7 +273,10 @@ printf "Enter the description: " - read descr - - echo "We will generate the key now. Have patience." --gkgen -r "$GALE/auth/private/$GALE_DOMAIN.gpri" \ -+if [ $is_root = no ]; then -+ install_gpri=auth/private/ -+fi -+gkgen -r "$GALE/${install_gpri}$GALE_DOMAIN.gpri" \ - -u "$unsigned" "$GALE_DOMAIN" /"$descr" || exit 1 - - cat << EOM -@@ -311,8 +284,29 @@ the owner of the "$signer" domain through appropriate means. - Take care to preseve the file's binary data; you may need to uuencode it. - - Assuming they trust you with your subdomain, they should pass the key through --"gksign" as a filter, returning the signed output to you. When you have this --signed key file available, re-run this script, and we will move on to the --next step. -+"gksign" as a filter, returning the signed output to you. -+ -+EOM -+ -+if [ $is_nixos = yes ]; then -+ cat <<EOM -+ -+When you have this signed key file available, you can finish the setup process -+by placing the private key and signed public key in a directory (they will be -+copied) and setting "services.gale.keyPath" in /etc/nixos/configuration.nix. - - EOM -+else -+ cat <<EOM -+ -+When you have this signed key file available, re-run this script, and we will -+move on to the next step. -+ -+*** IMPORTANT *** -+You must set GALE_SYS_DIR="$GALE_SYS_DIR" in your environment before re-running -+this script and before running any Gale programs once setup is finished! Make -+sure to set it now, and consider setting it via your shell initialization files -+so that you don't forget to do it next login. -+ -+EOM -+fi diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix index f12a14c5c926..37a3746669b1 100644 --- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation { description = "Bring messenger.com to your Linux desktop."; longDescription = '' A simple & beautiful desktop client for Facebook Messenger. Chat without - distractions on OS X, Windows and Linux. Not affiliated with Facebook. + distractions on macOS, Windows and Linux. Not affiliated with Facebook. This is NOT an official product. ''; homepage = https://messengerfordesktop.org; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index c29c6def2f60..05ea0fda8353 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ]; + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + + preFixup = '' + wrapProgram "$out/libexec/telepathy-idle" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; meta = { description = "IRC connection manager for the Telepathy framework"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4cf0d2a04492..37d5ea2e17b8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig -, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -12,13 +12,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool - gobjectIntrospection dbus_libs telepathy_glib.python ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper + gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; nativeBuildInputs = [ libxslt ]; configureFlags = "--enable-call"; + preFixup = '' + wrapProgram "$out/libexec/telepathy-logger" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a8fc9477707d..87ae0210bdae 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: stdenv.mkDerivation rec { name = "${pname}-5.16.3"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/mission-control-5" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d77cf347e5a8..91c77fc9d7ca 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,11 +4,11 @@ let - version = "2.0.91373.0502"; + version = "2.0.98253.0707"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a"; + sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r"; }; }; @@ -75,13 +75,12 @@ in stdenv.mkDerivation { #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it - wrapProgram $packagePath/zoom \ + makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" - ln -s "$packagePath/zoom" "$out/bin/zoom-us" cat > $packagePath/qt.conf <<EOF [Paths] @@ -92,10 +91,10 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://zoom.us; + homepage = https://zoom.us/; description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = builtins.attrNames srcs; maintainers = with stdenv.lib.maintainers; [ danbst ]; }; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index e391f0074c5a..a79df085e6bb 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,45 +1,37 @@ -{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }: +{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: -let - - version = "0.8.9"; - sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; - - # fetches patches from a gentoo mirror - fetchPatch = - { file, sha256 }: - fetchurl { - url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}"; - inherit sha256; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bip-${version}"; + version = "0.8.9"; # fetch sources from debian, because the creator's website provides # the files only via https but with an untrusted certificate. src = fetchurl { url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz"; - inherit sha256; + sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; }; + buildInputs = [ bison flex autoconf automake openssl ]; + # includes an important security patch - patches = map fetchPatch [ - { file = "bip-freenode.patch"; - sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f"; - } + patches = [ + (fetchpatch { + url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/bip-freenode.patch"; + sha256 = "05qy7a62p16f5knrsdv2lkhc07al18qq32ciq3k4r0lq1wbahj2y"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; + sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; + }) ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; - buildInputs = [ bison flex autoconf automake openssl ]; - meta = { description = "An IRC proxy (bouncer)"; homepage = http://bip.milkypond.org/; license = stdenv.lib.licenses.gpl2; - downloadPage= "https://projects.duckcorp.org/projects/bip/files"; - inherit version; + downloadPage = "https://projects.duckcorp.org/projects/bip/files"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 8b30f6391a0f..0b52515228b9 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }: +{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { name = "epic5-${version}"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch"; + sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv"; + }) + ]; + configureFlags = [ "--disable-debug" "--with-ipv6" ]; postConfigure = '' diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c53383b954e7..606e5593593f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { find test -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ - -e "s|gpg |${gnupg}/bin/gpg2 |" \ - -e "s| gpg| ${gnupg}/bin/gpg2|" \ + -e "s|gpg |${gnupg}/bin/gpg |" \ + -e "s| gpg| ${gnupg}/bin/gpg|" \ -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ - -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \ + -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \ "{}" ";" for src in \ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { emacs/notmuch-crypto.el do substituteInPlace "$src" \ - --replace \"gpg\" \"${gnupg}/bin/gpg2\" + --replace \"gpg\" \"${gnupg}/bin/gpg\" done ''; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 6b6f66e24d09..8c7958ecaaa2 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,15 +1,42 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { - name = "eiskaltdcpp-2.2.9"; + name = "eiskaltdcpp-${version}"; + version = "2.2.10"; - src = fetchurl { - url = "https://eiskaltdc.googlecode.com/files/${name}.tar.xz"; - sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf"; + src = fetchFromGitHub { + owner = "eiskaltdcpp"; + repo = "eiskaltdcpp"; + rev = "v${version}"; + sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; + patches = [ + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch"; + sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch"; + sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch"; + sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch"; + sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9"; + }) + (fetchpatch { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch"; + sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8"; + }) + ]; + cmakeFlags = '' -DUSE_ASPELL=ON -DUSE_QT_QML=ON diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix deleted file mode 100644 index b540ffd0967c..000000000000 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl -, libX11, boost, zlib, libnotify }: - -stdenv.mkDerivation rec { - name = "ldcpp-1.1.0"; - src = fetchurl { - url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; - sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; - }; - buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; - - installPhase = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; - - touch gettext xgettext msgfmt msgcat - chmod +x gettext xgettext msgfmt msgcat - export PATH=$PATH:$PWD - - mkdir -p $out - scons PREFIX=$out - scons PREFIX=$out install - ''; - - meta = { - description = "Direct Connect client"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix deleted file mode 100644 index 4b881445323a..000000000000 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: - -stdenv.mkDerivation { - name = "retroshare-0.6-git-fabc3a3"; - - src = fetchFromGitHub { - owner = "RetroShare"; - repo = "RetroShare"; - rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a"; - sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; - - patchPhase = '' - # Fix build error - sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ - libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # Where to find the bootstrap DHT bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsaccounts.cc - ''; - - # sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \ - # retroshare-gui/src/retroshare-gui.pro \ - # retroshare-nogui/src/retroshare-nogui.pro - - buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory - enableParallelBuilding = false; - - postInstall = '' - mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin - - # plugins - mkdir -p $out/share/retroshare - mv $out/lib* $out/share/retroshare - - # BT DHT bootstrap - cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare - ''; - - meta = with stdenv.lib; { - description = ""; - homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; - platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; - }; -} diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index cb6dad20ce08..0d7a41735ea4 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,40 +1,44 @@ -{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt }: - -stdenv.mkDerivation { - name = "retroshare-0.5.5c"; - - src = fetchurl { - url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz; - sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; +{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg +, qtmultimedia, qtx11extras, qttools }: + +stdenv.mkDerivation rec { + name = "retroshare-${version}"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "RetroShare"; + repo = "RetroShare"; + rev = "v${version}"; + sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8"; }; - NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ]; + # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; patchPhase = '' + # Fix build error sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ libretroshare/src/upnp/UPnPBase.cpp - # Extensions get installed - sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc - # For bdboot.txt - sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ - libretroshare/src/rsserver/rsinit.cc ''; - buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig - protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; - - sourceRoot = "retroshare-0.5.5/src"; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ + speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg + ]; preConfigure = '' qmakeFlags="$qmakeFlags DESTDIR=$out" ''; + # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory + enableParallelBuilding = false; + postInstall = '' mkdir -p $out/bin - mv $out/retroshare-nogui $out/bin - mv $out/RetroShare $out/bin + mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui + mv $out/RetroShare06 $out/bin/Retroshare + ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui # plugins mkdir -p $out/share/retroshare @@ -47,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ""; homepage = http://retroshare.sourceforge.net/; - #license = licenses.bsd2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 9c6aefd8ced4..d930e24883ea 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,39 +1,28 @@ -{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}: +{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools +, seafile-shared, ccnet, makeWrapper }: -stdenv.mkDerivation rec -{ - version = "5.0.7"; +stdenv.mkDerivation rec { + version = "6.1.0"; name = "seafile-client-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5"; + sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd"; }; - buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; - - builder = writeScript "${name}-builder.sh" '' - source $stdenv/setup - - tar xvfz $src - cd seafile-client-* - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" . - make -j1 - - make install + nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; + buildInputs = [ qtbase qttools seafile-shared ]; + postInstall = '' wrapProgram $out/bin/seafile-applet \ --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]} - ''; + ''; - meta = - { - homepage = https://github.com/haiwen/seafile-clients; + meta = with stdenv.lib; { + homepage = https://github.com/haiwen/seafile-client; description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch new file mode 100644 index 000000000000..a009057307b0 --- /dev/null +++ b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch @@ -0,0 +1,132 @@ +diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod +--- wireshark-2.4.0/doc/udpdump.pod 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-2.4.0-p/doc/udpdump.pod 2017-08-01 10:48:40.551431319 +0200 +@@ -0,0 +1,128 @@ ++ ++=head1 NAME ++ ++udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format. ++ ++=head1 SYNOPSIS ++ ++B<udpdump> ++S<[ B<--help> ]> ++S<[ B<--version> ]> ++S<[ B<--extcap-interfaces> ]> ++S<[ B<--extcap-dlts> ]> ++S<[ B<--extcap-interface>=E<lt>interfaceE<gt> ]> ++S<[ B<--extcap-config> ]> ++S<[ B<--capture> ]> ++S<[ B<--fifo>=E<lt>path to file or pipeE<gt> ]> ++S<[ B<--port>=E<lt>portE<gt> ]> ++S<[ B<--payload>=E<lt>typeE<gt> ]> ++ ++=head1 DESCRIPTION ++ ++B<udpdump> is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from ++any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic ++functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP ++port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless ++(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in ++https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master ++ ++=head1 OPTIONS ++ ++=over 4 ++ ++=item --help ++ ++Print program arguments. ++ ++=item --version ++ ++Print program version. ++ ++=item --extcap-interfaces ++ ++List available interfaces. ++ ++=item --extcap-interface=E<lt>interfaceE<gt> ++ ++Use specified interfaces. ++ ++=item --extcap-dlts ++ ++List DLTs of specified interface. ++ ++=item --extcap-config ++ ++List configuration options of specified interface. ++ ++=item --capture ++ ++Start capturing from specified interface save saved it in place specified by --fifo. ++ ++=item --fifo=E<lt>path to file or pipeE<gt> ++ ++Save captured packet to file or send it through pipe. ++ ++=item --port=E<lt>portE<gt> ++ ++Set the listerner port. Port 5555 is the default. ++ ++=item --payload=E<lt>typeE<gt> ++ ++Set the payload of the exported PDU. Default: data. ++ ++=back ++ ++=head1 EXAMPLES ++ ++To see program arguments: ++ ++ udpdump --help ++ ++To see program version: ++ ++ udpdump --version ++ ++To see interfaces: ++ ++ udpdump --extcap-interfaces ++ ++ Example output: ++ interface {value=udpdump}{display=UDP Listener remote capture} ++ ++To see interface DLTs: ++ ++ udpdump --extcap-interface=udpdump --extcap-dlts ++ ++ Example output: ++ dlt {number=252}{name=udpdump}{display=Exported PDUs} ++ ++To see interface configuration options: ++ ++ udpdump --extcap-interface=udpdump --extcap-config ++ ++ Example output: ++ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on} ++ ++To capture: ++ ++ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture ++ ++NOTE: To stop capturing CTRL+C/kill/terminate application. ++ ++=head1 SEE ALSO ++ ++wireshark(1), tshark(1), dumpcap(1), extcap(4) ++ ++=head1 NOTES ++ ++B<udpdump> is part of the B<Wireshark> distribution. The latest version ++of B<Wireshark> can be found at L<https://www.wireshark.org>. ++ ++HTML versions of the Wireshark project man pages are available at: ++L<https://www.wireshark.org/docs/man-pages>. ++ ++=head1 AUTHORS ++ ++ Original Author ++ --------------- ++ Dario Lombardo <lomato[AT]gmail.com> diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 326529d1e0ff..340c2e0babe3 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules +, libssh, zlib, cmake, extra-cmake-modules, fetchpatch , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp @@ -12,17 +12,19 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.7"; + version = "2.4.0"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8"; + url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; + sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9"; }; + cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + nativeBuildInputs = [ bison cmake extra-cmake-modules flex ] ++ optional withGtk wrapGAppsHook; @@ -35,7 +37,19 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch + + # Backported from master. Will probably have to be dropped during next + # update. + (fetchpatch { + name = "AUTHORS_add_newline_after_bracket"; + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde"; + sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3"; + }) + # A file is missing from distribution. This should be fixed in upcoming + # releases + ./add_missing_udpdump_pod.patch + ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' @@ -61,7 +75,7 @@ in stdenv.mkDerivation { longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network protocol analyzer developed by an international team of networking - experts. It runs on UNIX, OS X and Windows. + experts. It runs on UNIX, macOS and Windows. ''; platforms = platforms.unix; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 19a077d15898..550445f73068 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "umurmur-${version}"; - version = "0.2.16a"; + version = "0.2.17"; src = fetchFromGitHub { - owner = "fatbob313"; + owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1"; + sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; }; buildInputs = [ autoreconfHook openssl protobufc libconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; - homepage = http://code.google.com/p/umurmur/; + homepage = https://github.com/umurmur/umurmur; platforms = platforms.all; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index ef824f57a354..3421abc557fc 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { --prefix PERL5LIB ":" "$PERL5LIB" \ --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { longDescription = '' GnuCash is personal and small-business financial-accounting software, freely licensed under the GNU GPL and available for GNU/Linux, BSD, - Solaris, Mac OS X and Microsoft Windows. + Solaris, macOS and Microsoft Windows. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 1eedf1f313b7..4ed150813127 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { longDescription = '' GnuCash is personal and small-business financial-accounting software, freely licensed under the GNU GPL and available for GNU/Linux, BSD, - Solaris, Mac OS X and Microsoft Windows. + Solaris, macOS and Microsoft Windows. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 7c122c0725af..7f564379c660 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do + for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a wrapProgram "$out/bin/$a" \ --prefix XDG_DATA_DIRS : \ diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 02723530ba10..5903edd337df 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and - Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body + macOS. It uses Newtonian physics using the Barnes-Hut N-body algorithm. Although the main goal of Gravit is to be as accurate as possible, it also creates beautiful looking gravity patterns. It records the history of each particle so it can animate and diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix new file mode 100644 index 000000000000..b98af36604a3 --- /dev/null +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +with stdenv.lib; + +stdenv.mkDerivation { + name = "gwyddion"; + version = "2.48"; + src = fetchurl { + url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; + sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; + }; + buildInputs = [ gtk2 pkgconfig ]; + meta = { + homepage = http://gwyddion.net/; + + description = "Scanning probe microscopy data visualization and analysis"; + + longDescription = '' + A modular program for SPM (scanning probe microscopy) data + visualization and analysis. Primarily it is intended for the + analysis of height fields obtained by scanning probe microscopy + techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of + SPM data formats. However, it can be used for general height + field and (greyscale) image processing, for instance for the + analysis of profilometry data or thickness maps from imaging + spectrophotometry. + ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f93856e90e11..9620140dde4b 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6" +, version ? "8.6.1" }: let @@ -18,9 +18,10 @@ let "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -132,7 +133,7 @@ self = stdenv.mkDerivation { homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; }; }; in self diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 0ec7f93d26f5..c8e20c7260c9 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree"; name = "${name}-src.tar.gz"; - sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; + sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0"; }; patchPhase = ''patchShebangs tests/regress/check.sh''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # only installing the libyices.so.2.5.1 file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0ba1212567f4..8a84ed78b781 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false let name = "maxima"; - version = "5.39.0"; + version = "5.40.0"; searchPath = stdenv.lib.makeBinPath @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm"; + sha256 = "15pp35ayglv723bjbqc60gcdv2bm54s6pywsm4i4cwbjsf64dzkl"; }; buildInputs = stdenv.lib.filter (x: x != null) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 081bfd5918b8..82846a564cd9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -34,6 +34,8 @@ rec { git = appendToName "minimal" gitBase; + git-fame = callPackage ./git-fame {}; + # The full-featured Git. gitFull = gitBase.override { svnSupport = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile new file mode 100644 index 000000000000..17373f02b44d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in git_fame.gemspec +gem "git_fame" diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock new file mode 100644 index 000000000000..0ac7907fe55d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock @@ -0,0 +1,26 @@ +GEM + remote: https://rubygems.org/ + specs: + git_fame (2.5.2) + hirb (~> 0.7.3) + memoist (~> 0.14.0) + method_profiler (~> 2.0.1) + progressbar (~> 0.21.0) + scrub_rb (~> 1.0.1) + trollop (~> 2.1.2) + hirb (0.7.3) + memoist (0.14.0) + method_profiler (2.0.1) + hirb (>= 0.6.0) + progressbar (0.21.0) + scrub_rb (1.0.1) + trollop (2.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + git_fame + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix new file mode 100644 index 000000000000..8b77efd1be23 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -0,0 +1,19 @@ +{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }: + +bundlerEnv rec { + inherit ruby; + + pname = "git_fame"; + + gemdir = ./.; + + meta = with stdenv.lib; { + description = '' + A command-line tool that helps you summarize and pretty-print collaborators based on contributions + ''; + homepage = http://oleander.io/git-fame-rb; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix new file mode 100644 index 000000000000..49b4af4ef6d3 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix @@ -0,0 +1,60 @@ +{ + git_fame = { + dependencies = ["hirb" "memoist" "method_profiler" "progressbar" "scrub_rb" "trollop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02k5ls5zyif8skdbnym6zw9y76whlnksw2m94jsh2n1ygk98izdd"; + type = "gem"; + }; + version = "2.5.2"; + }; + hirb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji"; + type = "gem"; + }; + version = "0.7.3"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03d3h6kp16bf0crqg1cxdgp1d2iyzn53d3phbmjh4pjybqls0gcm"; + type = "gem"; + }; + version = "0.14.0"; + }; + method_profiler = { + dependencies = ["hirb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ax04qrrv7fqp5ayxaxhn72660pybdkpkvmgiwbg7bs7x5ijjzd8"; + type = "gem"; + }; + version = "2.0.1"; + }; + progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17haw9c6c9q6imsn83pii32jnihpg76jgd09x7y4hjqq45n3qcdh"; + type = "gem"; + }; + version = "0.21.0"; + }; + scrub_rb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dwg33w83w17aiij9kcbi7irj7lh045nh9prjgkzjya3f1j60d3x"; + type = "gem"; + }; + version = "1.0.1"; + }; + trollop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; + type = "gem"; + }; + version = "2.1.2"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 3b10c3305efc..1bf7a14932ec 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -4,10 +4,6 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; version = "0.5"; - phases = [ "unpackPhase" "installPhase" ]; - - dontInstallSrc = true; - src = fetchFromGitHub { owner = "michaeldfallen"; repo = "git-radar"; @@ -15,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; }; + dontBuild = true; + installPhase = '' mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7219b4781ae2..746801eb9087 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,7 +12,7 @@ }: let - version = "2.13.4"; + version = "2.14.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1nmg0n9l5ix876iqhcyhdnmiy7ihv0ybdijf1lssch6ja8m5j6ip"; + sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 6543f40c4dad..bf089a03fa0f 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.0.2"; - rev = "85e2aec4d949517b4a7a53e4f745689331952b6c"; + version = "2.2.1"; + rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy"; + sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s"; }; preBuild = '' diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 01d1a21f3a7f..39d44ab145d2 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.1.1"; + version = "4.3.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3"; + sha256 = "18hq6vvjsrjsnbs15bvyyfrss35bgc0hgw4wxksdyaj578pg04ib"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 17ff3e4b19f3..586f4c527924 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,12 +104,12 @@ let in { subversion18 = common { - version = "1.8.17"; - sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy"; + version = "1.8.18"; + sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5"; }; subversion19 = common { - version = "1.9.5"; - sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa"; + version = "1.9.6"; + sha256 = "06dfram53lyfyyqgz1r7c5323qqc6mjcpwi1j402y21lnqgwbjyv"; }; } diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index b36b539176ee..bc6cd015b865 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz"; sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/key-mon; + homepage = https://code.google.com/archive/p/key-mon; description = "Utility to show live keyboard and mouse status for teaching and screencasts"; license = licenses.asl20; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 0500fc14586c..e98500f8e76c 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -23,7 +23,7 @@ rec { description = "A program launcher for Kodi"; longDescription = '' Advanced Launcher allows you to start any Linux, Windows and - OS X external applications (with command line support or not) + macOS external applications (with command line support or not) directly from the Kodi GUI. Advanced Launcher also give you the possibility to edit, download (from Internet resources) and manage all the meta-data (informations and images) related diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index be4363c8314d..93a8d2070542 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://zdfmediathk.sourceforge.net/; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.chaoflow ]; - platforms = platforms.linux; # also OS X and cygwin, but not investigated, yet + platforms = platforms.linux; # also macOS and cygwin, but not investigated, yet }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0877df0a68cf..b902b96a7cd8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "13.0.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777"; + sha256 = "1ygc2qrd074vz2yw4iqml5ir31kkvkv7pz3hcfy423p9s06xi1k2"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d21a8ab6dcc9..27ce61eec6d1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -73,11 +73,11 @@ assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but # for purity reasons this behavior should be avoided. - wafVersion = "1.8.12"; + wafVersion = "1.9.8"; waf = fetchurl { urls = [ "http://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; - sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1"; + sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cddd2af7ae24..b0214f4faa34 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "19.0.3"; + version = "20.0.0"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b"; + sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 4ca31916965c..72dbf87fdefe 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nixpkgs maintainer(s). If you wish to report any bugs upstream, please use the official build from shotcut.org instead. ''; - homepage = http://shotcut.org; + homepage = https://shotcut.org; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 719762b9d177..b381a2547bea 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -173,8 +173,8 @@ rec { version = "17.06.0-ce"; rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm"; - runcRev = "992a5be178a62e026f4069f443c6164912adbf09"; - runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k"; + runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; + runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a"; containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d1bf5792a1b4..b790a15e607f 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-06-27"; - rev = "0d91d102b046eec535a6d67df9829b80b24e9ce9"; + name = "lkl-2017-08-09"; + rev = "083cdeece0577635d523244dcf0da86074e23e4e"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas"; + sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 885ffde8a506..a23537847a19 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.28.1"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "08bzi44rs4g8cxb44pxh7ln85zhkhmi40r8mb73kibnnzd008vg3"; + sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index dad16ffb0f08..13dbf544c927 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,12 +9,12 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.1"; + version = "1.4.2"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; + sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"; }; nativeBuildInputs = [ wrapGAppsHook intltool file ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index f6205f5c467a..3429545557ad 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -53,7 +53,7 @@ callPackage (import ./generic.nix (rec { patches = [ (xsaPatch { name = "216-qemuu"; - sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1"; + sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn"; }) ]; meta.description = "Xen's fork of upstream Qemu"; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 0e45b836b018..2a685c590fa8 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Lightweight Virtualization on OS X Based on bhyve"; + description = "Lightweight Virtualization on macOS Based on bhyve"; homepage = https://github.com/mist64/xhyve; maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 892fe7ba4e72..83c4e6828e1d 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1600"; + version = "1621"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv"; + sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 0f362e02ebf1..37596f5f212b 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do wrapProgram $i \ - --prefix REP_DL_LOAD_PATH "$out/lib/rep" \ - --set REP_LOAD_PATH "$out/share/sawfish/lisp" + --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ + --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 7cc37d156735..678f5a3fe9e6 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -141,11 +141,12 @@ sub addPkg { my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; if (-e $propagatedFN) { open PROP, "<$propagatedFN" or die; - while (my $p = <PROP>) { - chomp $p; + my $propagated = <PROP>; + close PROP; + my @propagated = split ' ', $propagated; + foreach my $p (@propagated) { $postponed{$p} = 1 unless defined $done{$p}; } - close PROP; } } diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 5634c82aa285..4d28ba08d103 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -1,28 +1,88 @@ +# N.B. It may be a surprise that the derivation-specific variables are exported, +# since this is just sourced by the wrapped binaries---the end consumers. This +# is because one wrapper binary may invoke another (e.g. cc invoking ld). In +# that case, it is cheaper/better to not repeat this step and let the forked +# wrapped binary just inherit the work of the forker's wrapper script. + +var_templates=( + NIX_CC_WRAPPER+START_HOOK + NIX_CC_WRAPPER+EXEC_HOOK + NIX_LD_WRAPPER+START_HOOK + NIX_LD_WRAPPER+EXEC_HOOK + + NIX+CFLAGS_COMPILE + NIX+CFLAGS_LINK + NIX+CXXSTDLIB_COMPILE + NIX+CXXSTDLIB_LINK + NIX+GNATFLAGS_COMPILE + NIX+IGNORE_LD_THROUGH_GCC + NIX+LDFLAGS + NIX+LDFLAGS_BEFORE + NIX+LDFLAGS_AFTER + NIX+LDFLAGS_HARDEN + + NIX+SET_BUILD_ID + NIX+DONT_SET_RPATH + NIX+ENFORCE_NO_NATIVE +) + +# Accumulate infixes for taking in the right input parameters. See setup-hook +# for details. +declare -a role_infixes=() +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then + role_infixes+=(_BUILD_) +fi +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then + role_infixes+=(_) +fi +if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then + role_infixes+=(_TARGET_) +fi + +# We need to mangle names for hygiene, but also take parameters/overrides +# from the environment. +for var in "${var_templates[@]}"; do + outputVar="${var/+/_@infixSalt@_}" + export ${outputVar}+='' + # For each role we serve, we accumulate the input parameters into our own + # cc-wrapper-derivation-specific environment variables. + for infix in "${role_infixes[@]}"; do + inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + export ${outputVar}+="${!outputVar:+ }${!inputVar}" + fi + done +done + # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. -export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" +NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE" + +# Export and assign separately in order that a failing $(..) will fail +# the script. if [ -e @out@/nix-support/libc-cflags ]; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" + NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi if [ -e @out@/nix-support/cc-cflags ]; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" + NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi if [ -e @out@/nix-support/gnat-cflags ]; then - export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" + NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" fi if [ -e @out@/nix-support/libc-ldflags ]; then - export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)" + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" fi if [ -e @out@/nix-support/cc-ldflags ]; then - export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)" + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi if [ -e @out@/nix-support/libc-ldflags-before ]; then - export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" + NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" fi -export NIX_CC_WRAPPER_FLAGS_SET=1 +# That way forked processes will not extend these environment variables again. +export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index b98833b3513b..aa8eb720486c 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,53 +1,69 @@ hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow) -hardeningFlags+=("${hardeningEnable[@]}") +# Intentionally word-split in case 'hardeningEnable' is defined in +# Nix. Also, our bootstrap tools version of bash is old enough that +# undefined arrays trip `set -u`. +if [[ -v hardeningEnable[@] ]]; then + hardeningFlags+=(${hardeningEnable[@]}) +fi hardeningCFlags=() hardeningLDFlags=() -hardeningDisable=${hardeningDisable:-""} -hardeningDisable+=" @hardening_unsupported_flags@" +declare -A hardeningDisableMap + +# Intentionally word-split in case 'hardeningDisable' is defined in Nix. +for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ +do + hardeningDisableMap[$flag]=1 +done -if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: Value of '$hardeningDisable': $hardeningDisable >&2; fi +if [[ -n "${NIX_DEBUG:-}" ]]; then + printf 'HARDENING: disabled flags:' >&2 + (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 + echo >&2 +fi -if [[ ! $hardeningDisable =~ "all" ]]; then - if [[ -n "$NIX_DEBUG" ]]; then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi +if [[ -z "${hardeningDisableMap[all]:-}" ]]; then + if [[ -n "${NIX_DEBUG:-}" ]]; then + echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; + fi for flag in "${hardeningFlags[@]}" do - if [[ ! "${hardeningDisable}" =~ "$flag" ]]; then + if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then case $flag in fortify) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling fortify >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') ;; stackprotector) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackprotector >&2; fi - hardeningCFlags+=('-fstack-protector-strong' '--param ssp-buffer-size=4') + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi + hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi hardeningCFlags+=('-fPIE') if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningLDFlags+=('-pie') fi ;; pic) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling pic >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi hardeningCFlags+=('-fPIC') ;; strictoverflow) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling strictoverflow >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi hardeningCFlags+=('-fno-strict-overflow') ;; format) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling format >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; relro) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling relro >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi hardeningLDFlags+=('-z' 'relro') ;; bindnow) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; *) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 99eb63f40edf..e5a3a5818519 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,17 +1,24 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + path_backup="$PATH" -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" -fi -if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then - source "$NIX_CC_WRAPPER_START_HOOK" +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi -if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then + source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" +fi + source @out@/nix-support/utils.sh @@ -19,16 +26,17 @@ source @out@/nix-support/utils.sh # For instance, figure out if linker flags should be passed. # GCC prints annoying warnings when they are not needed. dontLink=0 -getVersion=0 nonFlagArgs=0 +# shellcheck disable=SC2193 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 expandResponseParams "$@" -n=0 -while [ $n -lt ${#params[*]} ]; do +declare -i n=0 +nParams=${#params[@]} +while [ "$n" -lt "$nParams" ]; do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "$p" = -c ]; then dontLink=1 elif [ "$p" = -S ]; then @@ -55,10 +63,10 @@ while [ $n -lt ${#params[*]} ]; do nonFlagArgs=1 elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS+=" -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" fi fi - n=$((n + 1)) + n+=1 done # If we pass a flag like -Wl, then gcc will call the linker unless it @@ -71,39 +79,40 @@ if [ "$nonFlagArgs" = 0 ]; then fi # Optionally filter out paths not refering to the store. -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do + nParams=${#params[@]} + declare -i n=0 + while [ "$n" -lt "$nParams" ]; do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -L ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -I ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -isystem ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" else rest+=("$p") fi - n=$((n + 1)) + n+=1 done params=("${rest[@]}") fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then rest=() - for i in "${params[@]}"; do - if [[ "$i" = -m*=native ]]; then - skip $i + for p in "${params[@]}"; do + if [[ "$p" = -m*=native ]]; then + skip "$p" else - rest+=("$i") + rest+=("$p") fi done params=("${rest[@]}") @@ -111,37 +120,36 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE+=" ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" fi - NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK" + NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" fi -LD=@ldPath@/ld source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_CFLAGS_COMPILE ${hardeningCFlags[@]}) +extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}") extraBefore=() if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter+=($NIX_CFLAGS_LINK ${hardeningLDFlags[@]}) + extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK "${hardeningLDFlags[@]}") # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_LDFLAGS again). - for i in $NIX_LDFLAGS_BEFORE; do - extraBefore=(${extraBefore[@]} "-Wl,$i") + # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). + for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do + extraBefore+=("-Wl,$i") done - for i in $NIX_LDFLAGS; do + for i in $NIX_@infixSalt@_LDFLAGS; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") else extraAfter+=("-Wl,$i") fi done - export NIX_LDFLAGS_SET=1 + export NIX_@infixSalt@_LDFLAGS_SET=1 fi # As a very special hack, if the arguments are just `-v', then don't @@ -154,24 +162,21 @@ if [ "$*" = -v ]; then fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + set +u # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "${params[@]}" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 + set -u fi -if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_CC_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then + source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" +set +u # Old bash workaround, see above. +exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 09d1d4cd681a..905135e7adce 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -12,6 +12,7 @@ , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {}, hostPlatform, targetPlatform , runCommand ? null +, useMacosReexportHack ? false }: with stdenv.lib; @@ -52,42 +53,13 @@ let "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; - # TODO(@Ericson2314) Make unconditional - infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget; - infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_"); - _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget); - - # We want to prefix all NIX_ flags with the target triple - preWrap = textFile: - # TODO: Do even when not cross on next mass-rebuild - # TODO: use @target_tripple@ for consistency - if targetPlatform == hostPlatform - then textFile - else runCommand "sed-nix-env-vars" {} ('' - cp --no-preserve=mode ${textFile} $out - - sed -i $out \ - -e 's^NIX_^NIX_${infixSalt_}^g' \ - -e 's^addCVars^addCVars${_infixSalt}^g' \ - -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g' - - # NIX_ things which we don't both use and define, we revert them - #asymmetric=$( - # for pre in "" "\\$" - # do - # grep -E -ho $pre'NIX_[a-zA-Z_]*' ./* | sed 's/\$//' | sort | uniq - # done | sort | uniq -c | sort -nr | sed -n 's/^1 NIX_//gp') - - # hard-code for now - asymmetric=("CXXSTDLIB_COMPILE" "CC") - - # The ([^a-zA-Z_]|$) bussiness is to ensure environment variables that - # begin with `NIX_CC` don't also get blacklisted. - for var in "''${asymmetric[@]}" - do - sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g" - done - ''); + + # The "infix salt" is a arbitrary string added in the middle of env vars + # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used + # without interfering. For the moment, it is defined as the target triple, + # adjusted to be a valid bash identifier. This should be considered an + # unstable implementation detail, however. + infixSalt = dashlessTarget; # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. @@ -128,20 +100,21 @@ stdenv.mkDerivation { gnugrep_bin = if nativeTools then "" else gnugrep; binPrefix = prefix; + inherit infixSalt; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile - prefix infixSalt infixSalt_ _infixSalt; + prefix; emacsBufferSetup = pkgs: '' ; We should handle propagation here too (mapc (lambda (arg) (when (file-directory-p (concat arg "/include")) - (setenv "NIX_${infixSalt_}CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt_}CFLAGS_COMPILE") " -isystem " arg "/include"))) + (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include"))) (when (file-directory-p (concat arg "/lib")) - (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib"))) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; @@ -177,7 +150,7 @@ stdenv.mkDerivation { echo $dynamicLinker > $out/nix-support/dynamic-linker '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH+=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook '' else '' if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 @@ -267,7 +240,7 @@ stdenv.mkDerivation { # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" exec="$ldPath/${prefix}ld" - wrap ld-solaris ${preWrap ./ld-solaris-wrapper.sh} + wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + '' @@ -278,14 +251,21 @@ stdenv.mkDerivation { ln -s $ldPath/${prefix}as $out/bin/${prefix}as fi - wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' + (if !useMacosReexportHack then '' + wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' else '' + ldInner="${prefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} + wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then - wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold + wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold fi if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd + wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi # We export environment variables pointing to the wrapped nonstandard @@ -297,49 +277,49 @@ stdenv.mkDerivation { export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" if [ -e $ccPath/${prefix}gcc ]; then - wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc + wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc ln -s ${prefix}gcc $out/bin/${prefix}cc export named_cc=${prefix}gcc export named_cxx=${prefix}g++ elif [ -e $ccPath/clang ]; then - wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang + wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang ln -s ${prefix}clang $out/bin/${prefix}cc export named_cc=${prefix}clang export named_cxx=${prefix}clang++ fi if [ -e $ccPath/${prefix}g++ ]; then - wrap ${prefix}g++ ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}g++ + wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++ ln -s ${prefix}g++ $out/bin/${prefix}c++ elif [ -e $ccPath/clang++ ]; then - wrap ${prefix}clang++ ${preWrap ./cc-wrapper.sh} $ccPath/clang++ + wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++ ln -s ${prefix}clang++ $out/bin/${prefix}c++ fi if [ -e $ccPath/cpp ]; then - wrap ${prefix}cpp ${preWrap ./cc-wrapper.sh} $ccPath/cpp + wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp fi '' + optionalString cc.langFortran or false '' - wrap ${prefix}gfortran ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gfortran + wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran ln -sv ${prefix}gfortran $out/bin/${prefix}g77 ln -sv ${prefix}gfortran $out/bin/${prefix}f77 '' + optionalString cc.langJava or false '' - wrap ${prefix}gcj ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcj + wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj '' + optionalString cc.langGo or false '' - wrap ${prefix}gccgo ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gccgo + wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo '' + optionalString cc.langAda or false '' - wrap ${prefix}gnatgcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gnatgcc - wrap ${prefix}gnatmake ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatmake - wrap ${prefix}gnatbind ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatbind - wrap ${prefix}gnatlink ${preWrap ./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink + wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc + wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake + wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind + wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink '' + optionalString cc.langVhdl or false '' @@ -347,7 +327,7 @@ stdenv.mkDerivation { '' + '' - substituteAll ${preWrap ./setup-hook.sh} $out/nix-support/setup-hook.tmp + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook rm $out/nix-support/setup-hook.tmp @@ -366,9 +346,9 @@ stdenv.mkDerivation { '' + '' - substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${preWrap ./utils.sh} $out/nix-support/utils.sh + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh + substituteAll ${./utils.sh} $out/nix-support/utils.sh '' + extraBuildCommands; @@ -386,5 +366,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; - }; + } // optionalAttrs useMacosReexportHack { + platforms = stdenv.lib.platforms.darwin; + }; } diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 0d74527dd8ad..1a09f4841098 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,15 +1,24 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + +# N.B. Gnat is not used during bootstrapping, so we don't need to +# worry about the old bash empty array `set -u` workarounds. + path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" + PATH="@coreutils_bin@/bin" fi -if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_START_HOOK" +if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh fi -if [ -z "$NIX_GNAT_WRAPPER_FLAGS_SET" ]; then - source @out@/nix-support/add-flags.sh +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" fi source @out@/nix-support/utils.sh @@ -18,7 +27,6 @@ source @out@/nix-support/utils.sh # Figure out if linker flags should be passed. GCC prints annoying # warnings when they are not needed. dontLink=0 -getVersion=0 nonFlagArgs=0 for i in "$@"; do @@ -30,7 +38,7 @@ for i in "$@"; do nonFlagArgs=1 elif [ "$i" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" fi fi done @@ -47,37 +55,33 @@ fi # Optionally filter out paths not refering to the store. params=("$@") -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do - p=${params[n]} - p2=${params[$((n+1))]} + for p in "${params[@]}"; do if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then - skip $p + skip "${p:2}" elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then - skip $p + skip "${p:2}" else rest+=("$p") fi - n=$((n + 1)) done params=("${rest[@]}") fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then rest=() - for i in "${params[@]}"; do - if [[ "$i" = -m*=native ]]; then - skip $i + for p in "${params[@]}"; do + if [[ "$p" = -m*=native ]]; then + skip "$p" else - rest+=("$i") + rest+=("$p") fi done params=("${rest[@]}") @@ -85,38 +89,42 @@ fi # Add the flags for the GNAT compiler proper. -extraAfter=($NIX_GNATFLAGS_COMPILE) +extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) extraBefore=() -if [ "`basename $0`x" = "gnatmakex" ]; then - extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ") +if [ "$(basename "$0")x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ") fi -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") -#done +#if [ "$dontLink" != 1 ]; then +# # Add the flags that should be passed to the linker (and prevent +# # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). +# for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do +# extraBefore+=("-largs" "$i") +# done +# for i in $NIX_@infixSalt@_LDFLAGS; do +# if [ "${i:0:3}" = -L/ ]; then +# extraAfter+=("$i") +# else +# extraAfter+=("-largs" "$i") +# fi +# done +# export NIX_@infixSalt@_LDFLAGS_SET=1 +#fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "${params[@]}" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index c9958dbbb413..ee973d3270f9 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -1,33 +1,40 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + +# N.B. Gnat is not used during bootstrapping, so we don't need to +# worry about the old bash empty array `set -u` workarounds. # Add the flags for the GNAT compiler proper. -extraAfter="--GCC=@out@/bin/gcc" +extraAfter=("--GCC=@out@/bin/gcc") extraBefore=() -# Add the flags that should be passed to the linker (and prevent -# `ld-wrapper' from adding NIX_LDFLAGS again). -#for i in $NIX_LDFLAGS_BEFORE; do -# extraBefore=(${extraBefore[@]} "-largs $i") +## Add the flags that should be passed to the linker (and prevent +## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). +#for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do +# extraBefore+=("-largs" "$i") +#done +#for i in $NIX_@infixSalt@_LDFLAGS; do +# if [ "${i:0:3}" = -L/ ]; then +# extraAfter+=("$i") +# else +# extraAfter+=("-largs" "$i") +# fi #done +#export NIX_@infixSalt@_LDFLAGS_SET=1 # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "$@"; do - echo " $i" >&2 - done - echo "extraBefore flags to @prog@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @prog@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "$@" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" fi -exec @prog@ ${extraBefore[@]} "$@" ${extraAfter[@]} +exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 263ea5408e9a..72c999ff8bc8 100755 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -1,40 +1,25 @@ #!@shell@ +set -eu -o pipefail +shopt -s nullglob -set -e -set -u - +declare -a args=("$@") # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@ld@ -z ignore" - -args=("$@"); +declare -a argsBefore=(-z ignore) argsAfter=() # This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. # GNU binutils does not have this problem: # http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter -i=0; -while [[ $i -lt $# ]]; do +while (( $# )); do case "${args[$i]}" in - -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; - -L*) cmd="$cmd ${args[$i]}" ;; - *) ;; + -L) argsBefore+=("$1" "$2"); shift ;; + -L?*) argsBefore+=("$1") ;; + *) argsAfter+=("$1") ;; esac - i=($i+1); -done - -i=0; -while [[ $i -lt $# ]]; do - case "${args[$i]}" in - -L) i=($i+1); ;; - -L*) ;; - *) cmd="$cmd ${args[$i]}" ;; - esac - i=($i+1); + shift done # Trace: set -x -exec $cmd - -exit 0 +exec "@ld@" "${argsBefore[@]}" "${argsAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 240082b5dfdc..d0a1d5a0ddb7 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,15 +1,21 @@ -#! @shell@ -e +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" + PATH="@coreutils_bin@/bin" fi -if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then - source "$NIX_LD_WRAPPER_START_HOOK" +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh fi -if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then - source @out@/nix-support/add-flags.sh +if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then + source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" fi source @out@/nix-support/utils.sh @@ -17,21 +23,22 @@ source @out@/nix-support/utils.sh # Optionally filter out paths not refering to the store. expandResponseParams "$@" -if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" + && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then rest=() - n=0 - while [ $n -lt ${#params[*]} ]; do + nParams=${#params[@]} + declare -i n=0 + while [ "$n" -lt "$nParams" ]; do p=${params[n]} - p2=${params[$((n+1))]} + p2=${params[n+1]:-} # handle `p` being last one if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip $p + skip "${p:2}" elif [ "$p" = -L ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -rpath ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then - n=$((n + 1)); skip $p2 + n+=1; skip "$p2" elif [ "${p:0:1}" = / ] && badPath "$p"; then # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 @@ -40,147 +47,128 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ # Our ld is not built with sysroot support (Can we fix that?) : else - rest=("${rest[@]}" "$p") + rest+=("$p") fi - n=$((n + 1)) + n+=1 done params=("${rest[@]}") fi -LD=@prog@ source @out@/nix-support/add-hardening.sh -extra=(${hardeningLDFlags[@]}) +extraAfter=("${hardeningLDFlags[@]}") extraBefore=() -if [ -z "$NIX_LDFLAGS_SET" ]; then - extra+=($NIX_LDFLAGS) - extraBefore+=($NIX_LDFLAGS_BEFORE) +if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then + extraAfter+=($NIX_@infixSalt@_LDFLAGS) + extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) fi -extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN) - - -# Add all used dynamic libraries to the rpath. -if [ "$NIX_DONT_SET_RPATH" != 1 ]; then - - declare -A libDirsSeen - declare -a libDirs - - addToLibPath() { - local path="$1" - if [ "${path:0:1}" != / ]; then return 0; fi - case "$path" in - *..*|*./*|*/.*|*//*) - local path2 - if path2=$(readlink -f "$path"); then - path="$path2" - fi +extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN) + +declare -a libDirs +declare -A libs +relocatable= + +# Find all -L... switches for rpath, and relocatable flags for build id. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then + prev= + # Old bash thinks empty arrays are undefined, ugh, so temporarily disable + # `set -u`. + set +u + for p in "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"; do + set -u + case "$prev" in + -L) + libDirs+=("$p") + ;; + -l) + libs["lib${p}.so"]=1 + ;; + -dynamic-linker | -plugin) + # Ignore this argument, or it will match *.so and be added to rpath. + ;; + *) + case "$p" in + -L/*) + libDirs+=("${p:2}") + ;; + -l?*) + libs["lib${p:2}.so"]=1 + ;; + "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) + # This is a direct reference to a shared library. + libDirs+=("${p%/*}") + libs["${p##*/}"]=1 + ;; + -r | --relocatable | -i) + relocatable=1 + esac ;; esac - if [[ -z ${libDirsSeen[$path]} ]]; then - libDirs+=("$path") - libDirsSeen[$path]=1 - fi - } - - declare -A rpathsSeen - declare -a rpaths - - addToRPath() { - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi - if [[ -z ${rpathsSeen[$1]} ]]; then - rpaths+=("$1") - rpathsSeen[$1]=1 - fi - } - - declare -a libs - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - n=0 - while [ $n -lt ${#allParams[*]} ]; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if [ "${p:0:3}" = -L/ ]; then - addToLibPath ${p:2} - elif [ "$p" = -L ]; then - addToLibPath ${p2} - n=$((n + 1)) - elif [ "$p" = -l ]; then - libs+=(${p2}) - n=$((n + 1)) - elif [ "${p:0:2}" = -l ]; then - libs+=(${p:2}) - elif [ "$p" = -dynamic-linker ]; then - # Ignore the dynamic linker argument, or it - # will get into the next 'elif'. We don't want - # the dynamic linker path rpath to go always first. - n=$((n + 1)) - elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then - # This is a direct reference to a shared library, so add - # its directory to the rpath. - path="$(dirname "$p")"; - addToRPath "${path}" - fi - n=$((n + 1)) + prev="$p" done +fi - # Second, for each directory in the library search path (-L...), + +# Add all used dynamic libraries to the rpath. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then + # For each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. # It's important to add the rpath in the order of -L..., so # the link time chosen objects will be those of runtime linking. - for i in ${libDirs[@]}; do - for j in ${libs[@]}; do - if [ -f "$i/lib$j.so" ]; then - addToRPath $i + declare -A rpaths + for dir in "${libDirs[@]}"; do + if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then + dir="$dir2" + fi + if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + continue + fi + for path in "$dir"/*; do + file="${path##*/}" + if [ "${libs[$file]:-}" ]; then + # This library may have been provided by a previous directory, + # but if that library file is inside an output of the current + # derivation, it can be deleted after this compilation and + # should be found in a later directory, so we add all + # directories that contain any of the libraries to rpath. + rpaths["$dir"]=1 + extraAfter+=(-rpath "$dir") break fi done done - - # Finally, add `-rpath' switches. - for i in ${rpaths[@]}; do - extra+=(-rpath "$i") - done fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? -if [ "$NIX_SET_BUILD_ID" = 1 ]; then - for p in "${params[@]}"; do - if [ "$p" = "-r" -o "$p" = "--relocatable" -o "$p" = "-i" ]; then - relocatable=1 - break - fi - done - if [ -z "$relocatable" ]; then - extra+=(--build-id) - fi +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then + extraAfter+=(--build-id) fi # Optionally print debug info. -if [ -n "$NIX_DEBUG" ]; then - echo "original flags to @prog@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extra flags to @prog@:" >&2 - for i in ${extra[@]}; do - echo " $i" >&2 - done +if [ -n "${NIX_DEBUG:-}" ]; then + set +u # Old bash workaround, see above. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "${params[@]}" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 + set -u fi -if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_LD_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then + source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" fi PATH="$path_backup" -exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]} +set +u # Old bash workaround, see above. +exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash new file mode 100644 index 000000000000..b7aa7ea5c092 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -0,0 +1,106 @@ +#! @shell@ + +set -eu -o pipefail + +path_backup="$PATH" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +declare -r recurThreshold=300 + +declare overflowCount=0 +for ((n=0; n < $#; ++n)); do + case "${!n}" in + -l*) let overflowCount+=1 ;; + -reexport-l*) let overflowCount+=1 ;; + *) ;; + esac +done + +declare -a allArgs=() + +if (( "$overflowCount" <= "$recurThreshold" )); then + allArgs=("$@") +else + declare -a childrenLookup=() childrenLink=() + + while (( $# )); do + case "$1" in + -L/*) + childrenLookup+=("$1") + allArgs+=("$1") + ;; + -L) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -l) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -lazy_framework | -lto_library) + # We aren't linking any "azy_library", "to_library", etc. + allArgs+=("$1") + ;; + -lazy-l | -weak-l) allArgs+=("$1") ;; + # We can't so easily prevent header issues from these. + -lSystem) allArgs+=("$1") ;; + # Special case as indirection seems like a bad idea for something + # so fundamental. Can be removed for simplicity. + -l?* | -reexport-l?*) childrenLink+=("$1") ;; + *) allArgs+=("$1") ;; + esac + + shift + done + + declare n=0 + while (( $n < "${#childrenLink[@]}" )); do + if [[ "${childrenLink[n]}" = -l* ]]; then + childrenLink[n]="-reexport${childrenLink[n]}" + fi + let ++n + done + unset n + + declare -r outputNameLibless=$(basename $( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + elif [[ "${outputName:0:3}" = lib ]]; then + echo "${outputName:3}" + else + echo "${outputName}" + fi)) + declare -ra children=("$outputNameLibless-reexport-delegate-0" \ + "$outputNameLibless-reexport-delegate-1") + + mkdir -p "$out/lib" + + PATH="$PATH:@out@/bin" + + symbolBloatObject=$outputNameLibless-symbol-hack.o + if [[ ! -e $symbolBloatObject ]]; then + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ + | @binPrefix@as -- -o $symbolBloatObject + fi + + # first half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" + + # second half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" + + allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +fi + +PATH="$path_backup" +exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 104b82425f29..c6abd6281d26 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -1,51 +1,142 @@ -addCVars () { - if [ -d $1/include ]; then - export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" +# CC Wrapper hygiene +# +# For at least cross compilation, we need to depend on multiple cc-wrappers at +# once---specifically up to one per sort of dependency. This follows from having +# different tools targeting different platforms, and different flags for those +# tools. For example: +# +# # Flags for compiling (whether or not linking) C code for the... +# NIX_BUILD_CFLAGS_COMPILE # ...build platform +# NIX_CFLAGS_COMPILE # ...host platform +# NIX_TARGET_CFLAGS_COMPILE # ...target platform +# +# Notice that these platforms are the 3 *relative* to the package using +# cc-wrapper, not absolute like `x86_64-pc-linux-gnu`. +# +# The simplest solution would be to have separate cc-wrappers per (3 intended +# use-cases * n absolute concrete platforms). For the use-case axis, we would +# @-splice in 'BUILD_' '' 'TARGET_' to use the write environment variables when +# building the cc-wrapper, and likewise prefix the binaries' names so they didn't +# clobber each other on the PATH. But the need for 3x cc-wrappers, along with +# non-standard name prefixes, is annoying and liable to break packages' build +# systems. +# +# Instead, we opt to have just one cc-wrapper per absolute platform. Matching +# convention, the binaries' names can just be prefixed with their target +# platform. On the other hand, that means packages will depend on not just +# multiple cc-wrappers, but the exact same cc-wrapper derivation multiple ways. +# That means the exact same cc-wrapper derivation must be able to avoid +# conflicting with itself, despite the fact that `setup-hook.sh`, the `addCvars` +# function, and `add-flags.sh` are all communicating with each other with +# environment variables. Yuck. +# +# The basic strategy is: +# +# - Everyone exclusively *adds information* to relative-platform-specific +# environment variables, like `NIX_TARGET_CFLAGS_COMPILE`, to communicate +# with the wrapped binaries. +# +# - The wrapped binaries will exclusively *read* cc-wrapper-derivation-specific +# environment variables distinguished with with `infixSalt`, like +# `NIX_@infixSalt@_CFLAGS_COMPILE`. +# +# - `add-flags`, beyond its old task of reading extra flags stuck inside the +# cc-wrapper derivation, will convert the relative-platform-specific +# variables to cc-wrapper-derivation-specific variables. This conversion is +# the only time all but one of the cc-wrapper-derivation-specific variables +# are set. +# +# This ensures the flow of information is exclusive from +# relative-platform-specific variables to cc-wrapper-derivation-specific +# variables. This allows us to support the general case of a many--many relation +# between relative platforms and cc-wrapper derivations. +# +# For more details, read the individual files where the mechanisms used to +# accomplish this will be individually documented. + + +# It's fine that any other cc-wrapper will redefine this. Bash functions close +# over no state, and there's no @-substitutions within, so any redefined +# function is guaranteed to be exactly the same. +ccWrapper_addCVars () { + # The `depOffset` describes how the platforms of the dependencies are slid + # relative to the depending package. It is brought into scope of the + # environment hook defined as the role of the dependency being applied. + case $depOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + return 1 ;; + esac + + if [[ -d "$1/include" ]]; then + export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi - if [ -d $1/lib64 -a ! -L $1/lib64 ]; then - export NIX_LDFLAGS+=" -L$1/lib64" + if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib64" fi - if [ -d $1/lib ]; then - export NIX_LDFLAGS+=" -L$1/lib" + if [[ -d "$1/lib" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib" fi - if test -d $1/Library/Frameworks; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -F$1/Library/Frameworks" + if [[ -d "$1/Library/Frameworks" ]]; then + export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi } -envHooks+=(addCVars) +# Since the same cc-wrapper derivation can be depend on in multiple ways, we +# need to accumulate *each* role (i.e. target platform relative the depending +# derivation) in which the cc-wrapper derivation is used. +# `NIX_CC_WRAPPER_@infixSalt@_TARGET_*` tracks this (needs to be an exported env +# var so can't use fancier data structures). +# +# We also need to worry about what role is being added on *this* invocation of +# setup-hook, which `role` tracks. +if [ -n "${crossConfig:-}" ]; then + export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role="BUILD_" +else + export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 + role="" +fi + +# Eventually the exact sort of env-hook we create will depend on the role. This +# is because based on what relative platform we are targeting, we use different +# dependencies. +envHooks+=(ccWrapper_addCVars) -# Note: these come *after* $out in the PATH (see setup.sh). +# Note 1: these come *after* $out in the PATH (see setup.sh). +# Note 2: phase separation makes this look useless to shellcheck. +# shellcheck disable=SC2157 if [ -n "@cc@" ]; then addToSearchPath _PATH @cc@/bin fi +# shellcheck disable=SC2157 if [ -n "@binutils_bin@" ]; then addToSearchPath _PATH @binutils_bin@/bin fi +# shellcheck disable=SC2157 if [ -n "@libc_bin@" ]; then addToSearchPath _PATH @libc_bin@/bin fi +# shellcheck disable=SC2157 if [ -n "@coreutils_bin@" ]; then addToSearchPath _PATH @coreutils_bin@/bin fi -if [ -z "$crossConfig" ]; then - ENV_PREFIX="" -else - ENV_PREFIX="BUILD_" -fi +# Export tool environment variables so various build systems use the right ones. -export NIX_${ENV_PREFIX}CC=@out@ +export NIX_${role}CC=@out@ -export ${ENV_PREFIX}CC=@named_cc@ -export ${ENV_PREFIX}CXX=@named_cxx@ +export ${role}CC=@named_cc@ +export ${role}CXX=@named_cxx@ for CMD in \ cpp \ @@ -54,9 +145,9 @@ do if PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null then - export "${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; fi done -# No local scope available for sourced files -unset ENV_PREFIX +# No local scope in sourced file +unset role diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 87e48da9c8d5..5a70c2d9ccf3 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,5 +1,5 @@ skip () { - if [ -n "$NIX_DEBUG" ]; then + if [ -n "${NIX_DEBUG:-}" ]; then echo "skipping impure path $1" >&2 fi } @@ -24,11 +24,15 @@ badPath() { } expandResponseParams() { - params=("$@") + declare -g params=("$@") local arg for arg in "$@"; do if [[ "$arg" == @* ]]; then + # phase separation makes this look useless + # shellcheck disable=SC2157 if [ -n "@expandResponseParams@" ]; then + # params is used by caller + #shellcheck disable=SC2034 readarray -d '' params < <("@expandResponseParams@" "$@") return 0 else diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 160c3f85977b..17d7f2da035c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -497,16 +497,23 @@ rec { # Use the temp folder we've been working on to create a new image. mv temp image/$layerID - # Create image configuration file (used by registry v2) by using - # the configuration of the last layer - SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }') - jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json - CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1) - mv config.json image/$CONFIG_SHA.json - - # Create image manifest - LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g') - jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json + # Create image json and image manifest + imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") + currentID=$layerID + while [[ -n "$currentID" ]]; do + layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) + imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") + + currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true)) + done + + imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) + echo "$imageJson" > "image/$imageJsonChecksum.json" + manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") + echo "$manifestJson" > image/manifest.json # Store the json under the name image/repositories. jshon -n object \ diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index e41b1fd6a215..bd733f1b9baf 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation { linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" } - for pkg in $requires; do + # Iterate over the array of inputs (avoiding nix's own interpolation) + for pkg in "''${requires[@]}"; do linkEmacsPackage $pkg done diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index 722fd2566ef3..bd71f93c5291 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -5,10 +5,11 @@ let mirrors = import ./mirrors.nix; in { url ? builtins.head urls , urls ? [] , sha256 +, name ? baseNameOf (toString url) }: import <nix/fetchurl.nix> { - inherit system sha256; + inherit system sha256 name; url = # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/build-support/setup-hooks/die.sh new file mode 100644 index 000000000000..0db41e030f4c --- /dev/null +++ b/pkgs/build-support/setup-hooks/die.sh @@ -0,0 +1,21 @@ +# Exit with backtrace and error message +# +# Usage: die "Error message" +die() { + # Let us be a little sloppy with errors, because otherwise the final + # invocation of `caller` below will cause the script to exit. + set +e + + # Print our error message + printf "\nBuilder called die: %b\n" "$*" + printf "Backtrace:\n" + + # Print a backtrace. + local frame=0 + while caller $frame; do + ((frame++)); + done + printf "\n" + + exit 1 +} diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 8fe661026774..1b36f5f555da 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -1,4 +1,4 @@ -# On Mac OS X, binaries refer to dynamic library dependencies using +# On macOS, binaries refer to dynamic library dependencies using # either relative paths (e.g. "libicudata.dylib", searched relative to # $DYLD_LIBRARY_PATH) or absolute paths # (e.g. "/nix/store/.../lib/libicudata.dylib"). In Nix, the latter is diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh index e3a08b2598d9..cf8416c0838d 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh @@ -1,4 +1,4 @@ -# On Mac OS X, frameworks are linked to the system CoreFoundation but +# On macOS, frameworks are linked to the system CoreFoundation but # dynamic libraries built with nix use a pure version of CF this # causes segfaults for binaries that depend on it at runtime. This # can be solved in two ways. diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index eebde886a884..cde28fbbcaf1 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -1,3 +1,12 @@ +# Assert that FILE exists and is executable +# +# assertExecutable FILE +assertExecutable() { + local file="$1" + [[ -f "${file}" && -x "${file}" ]] || \ + die "Cannot wrap ${file} because it is not an executable file" +} + # construct an executable file that wraps the actual executable # makeWrapper EXECUTABLE ARGS @@ -24,6 +33,8 @@ makeWrapper() { local params varName value command separator n fileNames local argv0 flagsBefore flags + assertExecutable "${original}" + mkdir -p "$(dirname "$wrapper")" echo "#! $SHELL -e" > "$wrapper" @@ -32,26 +43,20 @@ makeWrapper() { for ((n = 2; n < ${#params[*]}; n += 1)); do p="${params[$n]}" - if test "$p" = "--set"; then + if [[ "$p" == "--set" ]]; then varName="${params[$((n + 1))]}" value="${params[$((n + 2))]}" n=$((n + 2)) echo "export $varName=\"$value\"" >> "$wrapper" - fi - - if test "$p" = "--unset"; then + elif [[ "$p" == "--unset" ]]; then varName="${params[$((n + 1))]}" n=$((n + 1)) echo "unset $varName" >> "$wrapper" - fi - - if test "$p" = "--run"; then + elif [[ "$p" == "--run" ]]; then command="${params[$((n + 1))]}" n=$((n + 1)) echo "$command" >> "$wrapper" - fi - - if test "$p" = "--suffix" -o "$p" = "--prefix"; then + elif [[ ("$p" == "--suffix") || ("$p" == "--prefix") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" value="${params[$((n + 3))]}" @@ -63,9 +68,7 @@ makeWrapper() { echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper" fi fi - fi - - if test "$p" = "--suffix-each"; then + elif [[ "$p" == "--suffix-each" ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" values="${params[$((n + 3))]}" @@ -73,9 +76,7 @@ makeWrapper() { for value in $values; do echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper" done - fi - - if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then + elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" fileNames="${params[$((n + 3))]}" @@ -87,17 +88,15 @@ makeWrapper() { echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper" fi done - fi - - if test "$p" = "--add-flags"; then + elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" n=$((n + 1)) flagsBefore="$flagsBefore $flags" - fi - - if test "$p" = "--argv0"; then + elif [[ "$p" == "--argv0" ]]; then argv0="${params[$((n + 1))]}" n=$((n + 1)) + else + die "makeWrapper doesn't understand the arg $p" fi done @@ -131,6 +130,9 @@ filterExisting() { wrapProgram() { local prog="$1" local hidden + + assertExecutable "${prog}" + hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped while [ -e "$hidden" ]; do hidden="${hidden}_" @@ -138,5 +140,5 @@ wrapProgram() { mv "$prog" "$hidden" # Silence warning about unexpanded $0: # shellcheck disable=SC2016 - makeWrapper "$hidden" "$prog" --argv0 '$0' "$@" + makeWrapper "$hidden" "$prog" --argv0 '$0' "${@:2}" } diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 9891128a6231..79b8d5b73fa1 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -39,7 +39,7 @@ wrapGAppsHook() { targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) for targetDir in "${targetDirs[@]}"; do if [[ -d "${targetDir}" ]]; then - find "${targetDir}" -type f -executable -print0 \ + find -L "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do echo "Wrapping program ${file}" wrapProgram "${file}" "${gappsWrapperArgs[@]}" diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 16bd4e8e4054..14553c33e039 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -26,6 +26,7 @@ rec { , text , executable ? false # run chmod +x ? , destination ? "" # relative path appended to $out eg "/bin/foo" + , checkPhase ? "" # syntax checks, e.g. for scripts }: runCommand name { inherit text executable; @@ -44,6 +45,8 @@ rec { echo -n "$text" > "$n" fi + ${checkPhase} + (test -n "$executable" && chmod +x "$n") || true ''; @@ -54,6 +57,20 @@ rec { writeScript = name: text: writeTextFile {inherit name text; executable = true;}; writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; + # Create a Shell script, check its syntax + writeShellScriptBin = name : text : + writeTextFile { + inherit name; + executable = true; + destination = "/bin/${name}"; + text = '' + #!${stdenv.shell} + ${text} + ''; + checkPhase = '' + ${stdenv.shell} -n $out + ''; + }; # Create a forest of symlinks to the files in `paths'. symlinkJoin = diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 79faf7c7baa6..b77b79338c75 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"; + sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index cd3fe3e2dd2b..cf138abee88f 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple offline API documentation browser"; longDescription = '' - Zeal is a simple offline API documentation browser inspired by Dash (OS X + Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; homepage = http://zealdocs.org/; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 562aa8be4eff..5c708457f8d2 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,22 +1,18 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "andagii-${version}"; +let version = "1.0.2"; +in fetchzip { + name = "andagii-${version}"; - src = fetchzip { - url = http://www.i18nguy.com/unicode/andagii.zip; - sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k"; - stripRoot = false; - curlOpts = "--user-agent 'Mozilla/5.0'"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + url = http://www.i18nguy.com/unicode/andagii.zip; + curlOpts = "--user-agent 'Mozilla/5.0'"; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf ''; + sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 024793789835..3ac2c9432997 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "anonymousPro-${version}"; +let version = "1.002"; +in fetchzip rec { + name = "anonymousPro-${version}"; - src = fetchurl { - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; - }; - - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with stdenv.lib; { homepage = https://www.marksimonson.com/fonts/view/anonymous-pro; diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 59be4fd14c89..c2e64cb63dd1 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "arkpandora-${version}"; - version = "2.04"; +{ stdenv, fetchurl, unzip }: - src = fetchurl { - urls = [ - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51"; - }; +let + version = "2.04"; +in fetchurl { + name = "arkpandora-${version}"; - installPhase = '' + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + downloadToTemp = true; + recursiveHash = true; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index b392ac79b2da..37d9a1995674 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchzip, mkfontscale, mkfontdir }: -{ - arphic-ukai = stdenv.mkDerivation rec { +let + version = "0.2.20080216.2"; +in { + arphic-ukai = fetchzip { name = "arphic-ukai-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + meta = with stdenv.lib; { description = "CJK Unicode font Kai style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; @@ -32,27 +28,21 @@ }; }; - arphic-uming = stdenv.mkDerivation rec { + arphic-uming = fetchzip { name = "arphic-uming-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + meta = with stdenv.lib; { description = "CJK Unicode font Ming style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 9941b4791b58..1a83ce17646e 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,21 +1,14 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "aurulent-sans-0.1"; - src = fetchgit { - url = "https://github.com/deepfire/hartke-aurulent-sans.git"; - rev = "refs/tags/${name}"; - sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; - }; - - dontBuild = true; - - installPhase = '' - fontDir=$out/share/fonts/opentype - mkdir -p $fontDir - cp *.otf $fontDir + url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 16534d4d6cbe..97333f7d953a 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,22 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let + version = "10.0.0"; +in fetchzip { name = "babelstone-han-${version}"; - version = "9.0.2"; - src = fetchurl { - url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip"; - sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' + url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip; + postFetch = '' mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; + sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r"; meta = with stdenv.lib; { description = "Unicode CJK font with over 32600 Han characters"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index ba1f21c186e1..555bba63354c 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "baekmuk-ttf-2.2"; - src = fetchurl { - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8"; - }; - - dontBuild = true; - - installPhase = let - fonts_dir = "$out/share/fonts"; - doc_dir = "$out/share/doc/${name}"; - in '' - mkdir -pv ${fonts_dir} - mkdir -pv ${doc_dir} - cp ttf/*.ttf ${fonts_dir} - cp COPYRIGHT* ${doc_dir} + url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts $out/share/doc/${name} + cp ttf/*.ttf $out/share/fonts + cp COPYRIGHT* $out/share/doc/${name} ''; + sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index bffa7edb6049..8d87154c1df0 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,20 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "bakoma-ttf"; - src = fetchurl { - url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2; - sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; - }; - - dontBuild = true; + url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km; - installPhase = '' + postFetch = '' + tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype ''; + sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index 8e432db84183..5bf4d454b062 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "cabin-1.005"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; - sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; - }; + url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd"; + meta = with stdenv.lib; { description = "A humanist sans with 4 weights and true italics"; longDescription = '' diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 110405839a12..56d8273f78ab 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "caladea-${version}"; +let version = "20130214"; +in fetchzip rec { + name = "caladea-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf ''; + sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index bc1402270aa4..dfdf367337c3 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "camingo-code-${version}"; +let version = "1.0"; +in fetchzip rec { + name = "camingo-code-${version}"; - src = fetchurl { - url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; - sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s"; - }; - - buildInputs = [ unzip ]; - - installPhase = '' + url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v camingo-code/*.ttf $out/share/fonts/truetype/ - cp -v camingo-code/*.txt $out/share/doc/${name}/ + cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/ + cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/ ''; + sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1"; meta = with stdenv.lib; { homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 98ce946044dd..de2edad451b9 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index b90d89c9779c..2243435bc5db 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,23 +1,22 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "carlito-${version}"; +let version = "20130920"; +in fetchzip rec { + name = "carlito-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab"; - }; - - phases = ["unpackPhase" "installPhase"]; + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - installPhase = '' + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; + sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv"; + meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 9334468d76c9..1e4df0c9221e 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontdir mkfontscale ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6"; meta = { description = "A Unicode font"; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index ed7ce93e1896..d17021feb81e 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "cm-unicode-${version}"; +let version = "0.7.0"; +in fetchzip rec { + name = "cm-unicode-${version}"; - src = fetchurl { - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - installPhase = '' + postFetch = '' + tar -xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v *.otf $out/share/fonts/opentype/ cp -v README FontLog.txt $out/share/doc/${name} ''; + sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + meta = with stdenv.lib; { homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; description = "Computer Modern Unicode fonts"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index c773f3955921..0dd4f727ad25 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,25 +1,18 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comfortaa-${version}"; +let version = "2.004"; +in fetchzip rec { + name = "comfortaa-${version}"; - src = fetchurl { - url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; - sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z"; - }; - - phases = ["unpackPhase" "installPhase"]; - - buildInputs = [unzip]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt $out/share/doc/${name}/ - cp -v donate.html $out/share/doc/${name}/ + url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; + postFetch = '' + mkdir -p $out/share/fonts $out/share/doc + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} ''; + sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h"; meta = with stdenv.lib; { homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 5d3da910e0b2..07fc172ca513 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl -, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "comic-neue-${version}"; +let version = "2.2"; +in fetchzip rec { + name = "comic-neue-${version}"; - src = fetchurl { - url = "http://comicneue.com/${name}.zip"; - sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n"; - }; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = name; + url = "http://comicneue.com/${name}.zip"; - installPhase = '' - mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name} - cp -v OTF/*.otf $out/share/fonts/opentype - cp -v Web/*.ttf $out/share/fonts/truetype - cp -v Web/*.eot $out/share/fonts/EOT - cp -v Web/*.woff $out/share/fonts/WOFF - cp -v Web/*.woff2 $out/share/fonts/WOFF2 - cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name} + postFetch = '' + mkdir -vp $out/share/{doc,fonts} + unzip -j $downloadedFile comic-neue-2.2/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile comic-neue-2.2/\*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile comic-neue-2.2/\*.eot -d $out/share/fonts/EOT + unzip -j $downloadedFile comic-neue-2.2/\*.woff -d $out/share/fonts/WOFF + unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2 + unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name} ''; + sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q"; + meta = with stdenv.lib; { homepage = http://comicneue.com/; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 31c89215ea77..2a1273214bd6 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,32 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comic-relief-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "comic-relief-${version}"; - src = fetchurl { - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; - }; - - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src - ''; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/doc/${name} mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - cp -v FONTLOG.txt $out/share/doc/${name} + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + meta = with stdenv.lib; { homepage = http://loudifier.com/comic-relief/; description = "A font metric-compatible with Microsoft Comic Sans"; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index c514f1ab7fb2..91c8ed1163d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + meta = with stdenv.lib; { homepage = http://corefonts.sourceforge.net/; description = "Microsoft's TrueType core fonts for the Web"; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index f612f0770647..e96c13b7822b 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "crimson-${version}"; +let version = "2014.10"; +in fetchzip rec { + name = "crimson-${version}"; - src = fetchurl { - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b"; - }; + url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - phases = ["unpackPhase" "installPhase"]; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 - installPhase = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype cp -v README.md $out/share/doc/${name} ''; + sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + meta = with stdenv.lib; { homepage = https://aldusleaf.org/crimson.html; description = "A font family inspired by beautiful oldstyle typefaces"; diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 08783e46cdea..236058c0b271 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "culmus-${version}"; +let version = "0.130"; +in fetchzip { + name = "culmus-${version}"; - src = fetchurl { - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1"; - }; - - installPhase = '' + url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; + + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype/ ''; - + + sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6"; + meta = { description = "Culmus Hebrew fonts"; longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows."; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index d08887a5cdee..b94004b24bb4 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { for i in Dina_r700-*.bdf; do bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i done - gzip *.pcf + gzip -n *.pcf fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { preferLocalBuild = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0v0qn5zwq4j1yx53ypg6w6mqx6dk8l1xix0188b0k4z3ivgnflyb"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index a206bd7f9115..66feaf0ff544 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2.92"; +in fetchzip rec { name = "dina-font-${version}"; - src = fetchurl { - url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; - }; - - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - installPhase = - '' + postFetch = '' mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts + unzip -j $downloadedFile \*.bdf -d $out/share/fonts ''; + sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 84c57fc7e8f8..f564507c777c 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for i in */etc/*.bdf; do fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz" echo -n "Installing font $fontOut..." >&2 - ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut" + ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 -n > "$fontOut" echo " done." >&2 done cp */etc/dosemu.alias "$fontPath/fonts.alias" @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { ${mkfontscale}/bin/mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1miqv0ral5vazx721wildjlzvji5r7pbgm39c0cpj5ywafaikxr8"; + meta = { description = "Various fonts from the DOSEmu project"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 28b9ee2f1e71..01157e8b7e4c 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "dosis-1.007"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; - sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; - }; + url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq"; + meta = with stdenv.lib; { description = "A very simple, rounded, sans serif family"; longDescription = '' diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 70730a7d8b7b..c2a4868a091c 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/droid ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3"; + meta = { description = "Droid Family fonts by Google Android"; homepage = https://github.com/google/fonts; diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 0956250e36ce..53a5d9f73cc1 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "eb-garamond-${version}"; +let version = "0.016"; +in fetchzip rec { + name = "eb-garamond-${version}"; - src = fetchzip { - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "otf/"*.otf $out/share/fonts/opentype/ - cp -v Changes README.markdown README.xelualatex $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" ''; + sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + meta = with stdenv.lib; { homepage = http://www.georgduffner.at/ebgaramond/; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 4082d5949a3f..10305a8c2d2b 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "emacs-all-the-icons-fonts-${version}"; +let version = "3.1.1"; +in fetchzip { + name = "emacs-all-the-icons-fonts-${version}"; - src = fetchFromGitHub { - owner = "domtronn"; - repo = "all-the-icons.el"; - rev = version; - sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; - }; + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/all-the-icons - for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons ''; + sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq"; + meta = with stdenv.lib; { description = "Icon fonts for emacs all-the-icons"; longDescription = '' diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index e0f79b2722ce..96d64e138935 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "encode-sans-1.002"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Encode-Sans"; - rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; - sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; - }; + url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + meta = with stdenv.lib; { description = "A versatile sans serif font family"; longDescription = '' diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 203b68f5e5d2..40880d022db0 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1"; + meta = with stdenv.lib; { description = '' Readable bitmap font inspired by Envy Code R diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index a87c89d1df9f..de52ae411efb 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,28 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "fantasque-sans-mono-${version}"; +let version = "1.7.1"; +in fetchzip rec { + name = "fantasque-sans-mono-${version}"; - src = fetchurl { - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb"; - }; - - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile README.md -d $out/share/doc/${name} ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "OTF/"*.otf $out/share/fonts/opentype - cp -v README.md $out/share/doc/${name} - ''; + sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0"; meta = with stdenv.lib; { homepage = https://github.com/belluzj/fantasque-sans; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index e14505f61bdd..5cfd2ec1f472 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "fira-code-${version}"; +let version = "1.204"; +in fetchzip { + name = "fira-code-${version}"; - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"; - }; - - sourceRoot = "otf"; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; description = "Monospace font with programming ligatures"; diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index e8868764271c..c19fbccb1420 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,11 +1,16 @@ -{ stdenv, runCommand, fetchurl, unzip }: +{ stdenv, fetchzip }: -runCommand "fira-code-symbols-20160811" { - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; - sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg"; - }; - buildInputs = [ unzip ]; +fetchzip { + name = "fira-code-symbols-20160811"; + + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile -d $out/share/fonts/opentype + ''; + + sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; meta = with stdenv.lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -18,7 +23,4 @@ runCommand "fira-code-symbols-20160811" { maintainers = [ maintainers.profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -} '' - mkdir -p $out/share/fonts/opentype - unzip "$src" -d $out/share/fonts/opentype -'' +} diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 3997ba27719b..4fc6aab95108 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip { name = "fira-mono-3.206"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - sha256 = "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"; - }; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraMonoFonts3206"; + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0m4kdjh4xjyznybpgh21a0gibv4wsxq0rqyl3wv942zk6mclmgdf"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Monospace font for Firefox OS"; diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index f777ae33e0bf..cddb8cd726a5 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "fira-4.106"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - sha256 = "123xwd7abb96lsla1v579vfpvc7fwixhq78221qxrw4dv8mgf8id"; - }; - - buildInputs = [unzip]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4106"; + url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "174nwmpvxqg1qjfj6h3yvrphs1s3n6zricdh27iaxilajm0ilbgs"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Sans-serif font for Firefox OS"; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index bc564a80d923..34548b972442 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "font-awesome-${version}"; +let version = "4.7.0"; +in fetchzip rec { + name = "font-awesome-${version}"; - src = fetchFromGitHub { - owner = "FortAwesome"; - repo = "Font-Awesome"; - rev = "v${version}"; - sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc"; - }; + url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - buildCommand = '' - mkdir -p $out/share/fonts/truetype - cp $src/fonts/*.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype ''; + sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; + meta = with stdenv.lib; { description = "Font Awesome - TTF font"; longDescription = '' diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index 360cacb551d7..e1be0da428a8 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip +, version ? "0.3.5" +, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk" +}: -let version = "0.3.5"; in -stdenv.mkDerivation { +fetchzip { name = "fontconfig-penultimate-${version}"; - src = fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8"; - }; + url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip"; + inherit sha256; - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d - cp *.conf $out/etc/fonts/conf.d + unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 00d5cfba27a0..87b3abe2911f 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,20 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "freefont-ttf-20120503"; - src = fetchurl { - url = "mirror://gnu/freefont/${name}.zip"; - sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw"; - }; - - buildInputs = [ unzip ]; + url = "mirror://gnu/freefont/${name}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "0h0x2hhr7kvjiycf7fv800xxwa6hcpiz54bqx06wsqc7z61iklvd"; + meta = { description = "GNU Free UCS Outline Fonts"; longDescription = '' diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 28bea4c2c8bd..359074099ba1 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -1,62 +1,51 @@ -{stdenv, fetchurl, unzip, lib }: +{stdenv, fetchzip, lib}: + let fonts = { - symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5"; + symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v"; + aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij"; + akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7"; description = "Sumero-Akkadian Cuneiform"; }; - anatolian = { version = "5.02"; file = "Anatolian.zip"; sha256 = "0arm58sijzk0bqmfb70k1sjvq79wgw16hx3j2g4l8qz4sv05bp8l"; + anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc"; description = "Anatolian Hieroglyphs"; }; - maya = { version = "4.14"; file = "Maya.zip"; sha256 = "0l97racgncrhb96mfbsx8dr5n4j289iy0nnwhxf9b21ns58a9x4f"; + maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh"; description = "Maya Hieroglyphs"; }; - unidings = { version = "8.00"; file = "Unidings.zip"; sha256 = "1i0z3mhgj4680188lqpmk7rx3yiz4l7yybb4wq6zk35j75l28irm"; + unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; - musica = { version = "3.12"; file = "Musica.zip"; sha256 = "079vyb0mpxvlcf81d5pqh9dijkcvidfbcyvpbgjpmgzzrrj0q210"; + musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6"; description = "Musical Notation"; }; - analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f"; + analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj"; description = "Coptic, Gothic, Deseret"; }; - # the following are also available from http://users.teilar.gr/~g1951d/ - # but not yet packaged: - # - Aroania - # - Anaktoria - # - Alexander - # - Avdira - # - Asea - # - Aegean + textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl"; + description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf"; + description = "Aegean"; }; + abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8"; + description = "AbydosFont"; }; }; - mkpkg = name_: {version, file, sha256, description}: - stdenv.mkDerivation rec { - name = "${name_}-${version}"; - - src = fetchurl { - url = "http://users.teilar.gr/~g1951d/${file}"; - inherit sha256; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ + mkpkg = name_: {version, file, sha256, description}: fetchzip rec { + name = "${name_}-${version}"; + url = "http://users.teilar.gr/~g1951d/${file}"; + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty + ''; + inherit sha256; - mkdir -p "$out/doc/${name}" - cp -v *.docx *.pdf *.xlsx "$out/doc/${name}/" - ''; - - meta = { - inherit description; - # In lieu of a license: - # Fonts in this site are offered free for any use; - # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. - license = stdenv.lib.licenses.free; - homepage = http://users.teilar.gr/~g1951d/; - platforms = stdenv.lib.platforms.unix; - }; + meta = { + inherit description; + # In lieu of a license: + # Fonts in this site are offered free for any use; + # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. + license = stdenv.lib.licenses.free; + homepage = http://users.teilar.gr/~g1951d/; + platforms = stdenv.lib.platforms.unix; }; - + }; in -lib.mapAttrs mkpkg fonts + lib.mapAttrs mkpkg fonts diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index c6812e39ef86..4c1e484253cf 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,26 +1,23 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-book-basic-${version}"; +let major = "1"; minor = "102"; version = "${major}.${minor}"; +in fetchzip rec { + name = "gentium-book-basic-${version}"; - src = fetchzip { - name = "${name}.zip"; - url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip"; - sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} ''; + sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + meta = with stdenv.lib; { homepage = http://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 975c4c72a9c0..2e2ffdeb5bb4 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-${version}"; +let version = "5.000"; +in fetchzip rec { + name = "gentium-${version}"; - src = fetchzip { - url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip"; - sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -vr documentation/ FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; + sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + meta = with stdenv.lib; { homepage = http://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 0c9dfa40982f..a0af38cfd240 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0"; + meta = with stdenv.lib; { homepage = https://blog.golang.org/go-fonts; description = "The Go font family"; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 2bd0d5800b43..f4043697e7b5 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7"; + meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index a5f43d4169b2..492d89a674ce 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let baseName = "gyre-fonts"; version = "2.005"; +in fetchzip { name="${baseName}-${version}"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; - sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; - }; - - buildInputs = [unzip]; - sourceRoot = "."; + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.otf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype ''; + sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; + meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; longDescription = '' diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 689e1e054dc0..f997f10db1dd 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hack-font-${version}"; +let version = "2.020"; +in fetchzip rec { + name = "hack-font-${version}"; - src = let - version_ = with stdenv.lib; - concatStringsSep "_" (splitString "." version); - in fetchurl { - sha256 = "16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; + url = let + version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); + in "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - installPhase = '' - mkdir -p $out/share/fonts/hack - cp *.ttf $out/share/fonts/hack + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack ''; + sha256 = "0cpsglb9vnhmpsn496aqisfvmq3yxvjnj7c361dspy0fn6z8x60c"; + meta = with stdenv.lib; { description = "A typeface designed for source code"; longDescription = '' diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 01be8afd7aac..27459b2d1f3f 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hanazono-${version}"; +let version = "20141012"; +in fetchzip { + name = "hanazono-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-20141012.zip"; - sha256 = "020jhqnzm9jvkmfvvyk1my26ncwxbnb9yc8v7am252jwrifji9q6"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; + url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/hanazono - cp *.ttf $out/share/fonts/hanazono - mkdir -p $out/share/doc/hanazono - cp *.txt $out/share/doc/hanazono + postFetch = '' + mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; + sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + meta = with stdenv.lib; { description = "Free kanji font containing 96,327 characters"; homepage = http://fonts.jp/hanazono/; diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 51d2b8b9c114..96af2e573a2f 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,25 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "hasklig-${version}"; +let version = "1.1"; +in fetchzip { + name = "hasklig-${version}"; - src = fetchurl { - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - - phases = [ "unpackPhase" "installPhase" ]; + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - installPhase = '' + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/opentype cp *.otf $out/share/fonts/opentype ''; + sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + meta = with stdenv.lib; { homepage = https://github.com/i-tu/Hasklig; description = "A font with ligatures for Haskell code based off Source Code Pro"; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 13e98462b215..a614017b8095 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "helvetica-neue-lt-std-${version}"; +let version = "2013.06.07"; # date of most recent file in distribution +in fetchzip rec { + name = "helvetica-neue-lt-std-${version}"; - src = fetchurl { - url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - sha256 = "0nrjdj2a11dr6d3aihvjxzrkdi0wq6f2bvaiimi5iwmpyz80n0h6"; - }; - - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "Helvetica Neue LT Std"; + url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Helvetica\ Neue\ LT\ Std/\*.otf -d $out/share/fonts/opentype ''; + sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; + meta = { homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; description = "Helvetica Neue LT Std font"; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index caa67256a1fe..13aeae803124 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "inconsolata-${version}"; +let version = "1.010"; +in fetchzip { + name = "inconsolata-${version}"; - src = fetchurl { - url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"; - }; + url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - phases = [ "installPhase" ]; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v $src $out/share/fonts/opentype/inconsolata.otf - ''; + sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7"; meta = with stdenv.lib; { homepage = http://www.levien.com/type/myfonts/inconsolata.html; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 8cfda1a5e9c8..5217b175ed20 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "input-fonts-${version}"; - version = "2016-10-06"; # date of the download and checksum + version = "2017-08-10"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "http://input.fontbureau.com/download/"; - sha256 = "06hrsrb5a6hzrgkkhk0gdj92rhgr433vgn4j5g3pd8f1ijlfqn4y"; + sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; }; nativeBuildInputs = [ unzip ]; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cp -a *.txt "$out"/share/doc/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; longDescrition = '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 73f675b61593..b72e5a27391f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "iosevka-${version}"; +let version = "1.13.1"; +in fetchzip rec { + name = "iosevka-${version}"; - buildInputs = [ unzip ]; - - src = fetchurl { - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; - }; - - sourceRoot = "."; - - installPhase = '' - fontdir=$out/share/fonts/iosevka + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - mkdir -p $fontdir - cp -v iosevka-* $fontdir + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; + sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7"; + meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; downloadPage = "https://github.com/be5invis/Iosevka/releases"; diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index e6d4b6734bf3..dfeab5124c84 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ipaexfont-003.01"; - src = fetchurl { - url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - sha256 = "0nmfyh10rzkvp0qmrla0dahkmmxq47678y4v8fdm8fpdzmf0kpn7"; - }; - - buildInputs = [ unzip ]; + url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - cp *.ttf $out/share/fonts/opentype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; + sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + meta = with stdenv.lib; { description = "Japanese font package with Mincho and Gothic fonts"; longDescription = '' diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 1f37630835d9..c056f14f46fd 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "ipafont-003.03"; - src = fetchurl { - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; - }; - - buildInputs = [ unzip ]; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - unpackPhase = '' - unzip $src + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp ./IPAfont00303/*.ttf $out/share/fonts/opentype/ - ''; + sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; meta = { description = "Japanese font package with Mincho and Gothic fonts"; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 875d63ee8ce1..8b1ddd0c7538 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "junicode-0.7.8"; - src = fetchurl { - url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl"; - }; + url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - buildInputs = [ unzip ]; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf + ''; - installPhase = - '' - mkdir -p $out/share/fonts/junicode-ttf - cp fonts/*.ttf $out/share/fonts/junicode-ttf - ''; + sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956"; meta = { homepage = http://junicode.sourceforge.net/; - description = "A Unicode font"; + description = "A Unicode font for medievalists"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index bbb1981957b8..852fdec82f82 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,21 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "kawkab-mono-20151015"; - src = fetchurl { - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - sha256 = "16pv9s4q7199aacbzfi2d10rcrq77vyfvzcy42g80nhfrkz1cb0m"; - }; - - buildInputs = [ unzip ]; - sourceRoot = "."; + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + meta = { description = "An arab fixed-width font"; homepage = https://makkuk.com/kawkab-mono/; diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index ea2c15752d7f..c24e68981296 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: let version = "20030809"; in -stdenv.mkDerivation { +fetchzip { name = "kochi-substitute-naga10-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; - }; - - sourceRoot = "kochi-substitute-${version}"; + url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf ''; + sha256 = "1bjb5cr3wf3d5y7xj1ly2mkv4ndwvg615rb1ql6lsqc2icjxk7j9"; + meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 6337387b3763..f49d20e3ba7c 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hcrf51npc1w2jsz5aiw07dgw96vs4wmsz4ai9zyaswipvf8ddy"; + meta = { description = "Japanese font, a free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 8d1111090aab..91d85ce9a0dd 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lato-2.0"; - src = fetchurl { - url = http://www.latofonts.com/download/Lato2OFL.zip; - sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"; - }; - - sourceRoot = "Lato2OFL"; + url = http://www.latofonts.com/download/Lato2OFL.zip; - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/lato - cp *.ttf $out/share/fonts/lato + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato ''; + sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + meta = with stdenv.lib; { homepage = http://www.latofonts.com/; diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 8f6d5ec8ad6b..82ceebae3275 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp */share/fonts/opentype/*.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0"; + meta = { description = "Font Collection by The League of Moveable Type"; diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 964210c8dfe5..2e1f89ed1e72 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "liberastika-${version}"; +let version = "1.1.5"; +in fetchzip rec { + name = "liberastika-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*.ttf') $out/share/fonts/truetype + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile AUTHORS ChangeLog COPYING README -d "$out/share/doc/${name}" ''; + sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp"; + meta = with stdenv.lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = https://sourceforge.net/projects/lib-ka/; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index 64779b5d388f..18f236068a2f 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-baskerville-1.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; - sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; - }; + url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a"; + meta = with stdenv.lib; { description = "A webfont family optimized for body text"; longDescription = '' diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 691d5556e8f2..96f366973f0e 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-bodoni-2.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; - sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; - }; + url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw"; + meta = with stdenv.lib; { description = "Bodoni fonts adapted for today's web requirements"; longDescription = '' diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 5037cb81f393..ec932ab978c2 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; + meta = with stdenv.lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = http://www.impallari.com/librecaslon; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index 473102d77efd..9ca37e356409 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-franklin-1.014"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; - sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; - }; + url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z"; + meta = with stdenv.lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; homepage = https://github.com/impallari/Libre-Franklin; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index e694ba4db75e..6876000d6e41 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmodern-2.004.4"; - - src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; - sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; - }; - installPhase = '' + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + + postFetch = '' + tar xzvf $downloadedFile + mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r ./* $out/texmf-dist/ - cp -r fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.004.4/* $out/texmf-dist/ + cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/ - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix index 6e136c39eb00..c6e0788eed38 100644 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmmath-0.903"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64"; - name = "lmmath-0.903.zip"; - }; - buildInputs = [unzip]; + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sourceRoot = "."; + postFetch = '' + unzip $downloadedFile - installPhase = '' mkdir -p $out/texmf-dist/fonts/opentype mkdir -p $out/share/fonts/opentype cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index 84752fe6a1d7..850fd1a1f94c 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -65,6 +65,10 @@ in cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/lobstertwo; description = "Script font with many ligatures"; diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index c0454bc2730a..c847b4cdd270 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,57 +1,59 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchzip, lib }: let fonts = { - assamese = { version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; }; - bengali = { version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; }; - devanagari = { version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; }; - gujarati = { version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; }; - gurmukhi = { version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi - kannada = { version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; }; - malayalam = { version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; }; - marathi = { version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; }; - nepali = { version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; }; - odia = { version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya - tamil-classical = { version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; }; - tamil = { version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; }; - telugu = { version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; }; + assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; }; + bengali = { label = "Bengali"; version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; }; + devanagari = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; }; + gujarati = { label = "Gujarati"; version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; }; + malayalam = { label = "Malayalam"; version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; }; + marathi = { label = "Marathi"; version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; }; + nepali = { label = "Nepali"; version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; }; + odia = { label = "Odia"; version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; }; + tamil = { label = "Tamil"; version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; }; + telugu = { label = "Telugu"; version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; }; - konkani = { version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; }; - maithili = { version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; }; - sindhi = { version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; }; + konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; }; + maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; }; }; - mkpkg = license: name: {version, sha256}: - stdenv.mkDerivation { - name = "lohit-${name}-${version}"; - - src = fetchurl { - url = "https://fedorahosted.org/releases/l/o/lohit/lohit-${name}-ttf-${version}.tar.gz"; - inherit sha256; - }; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ - - mkdir -p $out/etc/fonts/conf.d - cp -v *.conf $out/etc/fonts/conf.d - - mkdir -p "$out/share/doc/lohit-${name}" - cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" - ''; - - meta = { - inherit license; - homepage = https://fedorahosted.org/lohit/; - maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; - # Set a non-zero priority to allow easy overriding of the - # fontconfig configuration files. - priority = 5; - platforms = stdenv.lib.platforms.unix; - }; + + mkpkg = license: name: {label, version, sha256}: fetchzip { + name = "lohit-${name}-${version}"; + + url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz"; + + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype/ + + mkdir -p $out/etc/fonts/conf.d + cp -v *.conf $out/etc/fonts/conf.d + + mkdir -p "$out/share/doc/lohit-${name}" + cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" + ''; + + inherit sha256; + + meta = { + inherit license; + description = "Free and open source fonts for Indian languages (" + label + ")"; + homepage = https://pagure.io/lohit; + maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; + platforms = stdenv.lib.platforms.unix; }; + }; in # Technically, GPLv2 with usage exceptions diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index e3f47cb8b0d4..48b2f4c516b6 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "marathi-cursive-${version}"; +let version = "1.2"; +in fetchzip rec { + name = "marathi-cursive-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - sha256 = "0zhqkkfkz5mhfz8xv305s16h80p9v1iva829fznxd2c44ngyplmc"; - }; - - buildInputs = [ p7zip ]; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - unpackCmd = "7z x $curSrc"; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile + cd MarathiCursive - installPhase = '' mkdir -p $out/share/fonts/marathi-cursive cp -v *.otf *.ttf $out/share/fonts/marathi-cursive mkdir -p $out/share/doc/${name} cp -v README *.txt $out/share/doc/${name} ''; + sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v"; + meta = with stdenv.lib; { - homepage = https://github.com/MihailJP/marathi-cursive; + homepage = https://github.com/MihailJP/MarathiCursive; description = "Modi script font with Graphite and OpenType support"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.mit; # It's the M+ license, M+ is MIT(-ish) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix new file mode 100644 index 000000000000..ea44c9c79b1e --- /dev/null +++ b/pkgs/data/fonts/material-icons/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "material-icons-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = "${version}"; + sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0"; + }; + + buildCommand = '' + mkdir -p $out/share/fonts/truetype + cp $src/iconfont/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "System status icons by Google, featuring material design"; + homepage = https://material.io/icons; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mpcsh ]; + }; +} diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index fe123f6622d0..8a11a98ebd23 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1cppf8sk6r5wjnnas9n6iyag6pj9jvaic66lvwpqg3742s5akx6x"; + meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = https://github.com/andreberg/Meslo-Font/; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index d93c0fb96d41..cc481a136ba7 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mononoki-${version}"; +let version = "1.2"; +in fetchzip { + name = "mononoki-${version}"; - src = fetchurl { - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg"; - }; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" ]; + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - unpackPhase = '' + postFetch = '' mkdir -p $out/share/fonts/mononoki - unzip $src -d $out/share/fonts/mononoki + unzip -j $downloadedFile -d $out/share/fonts/mononoki ''; + sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; + meta = with stdenv.lib; { homepage = https://github.com/madmalik/mononoki; description = "A font for programming and code review"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 70fd2060ff1e..7d7be9a41a61 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -2,22 +2,23 @@ # # https://aur.archlinux.org/packages/ttf-montserrat/ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "montserrat-${version}"; +let version = "1.0"; +in fetchzip { + name = "montserrat-${version}"; - src = fetchurl { - url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x"; - }; + url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/montserrat cp *.ttf $out/share/fonts/montserrat ''; + sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; + meta = with stdenv.lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; homepage = "http://www.fontspace.com/julieta-ulanovsky/montserrat"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 49d857ec575a..5729561c5809 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,23 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "MPH-2B-Damase"; - src = fetchurl { - url = http://www.wazu.jp/downloads/damase_v.2.zip; - sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; - }; - - buildInputs = [unzip]; + url = http://www.wazu.jp/downloads/damase_v.2.zip; - unpackPhase = '' - unzip $src; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; + sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 839d61206c2e..b70166b7ec17 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mplus-${version}"; +let version = "062"; +in fetchzip rec { + name = "mplus-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - sha256 = "1f44vmnma5njhfiz351gwblxmdh9njv486864zrxqaa1h5pvdhha"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - installPhase = '' + postFetch = '' + tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z"; + meta = with stdenv.lib; { description = "M+ Outline Fonts"; homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 493a26e5556e..8986a9adb7a8 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "mro-unicode-2013-05-25" { - src = fetchurl { - url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; - sha256 = "1za74ych0sh97ks6qp9iqq9jankgnkrq65s350wsbianwi72di45"; - }; +fetchzip { + name = "mro-unicode-2013-05-25"; + + url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + + sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; meta = with lib; { homepage = https://github.com/phjamr/MroUnicode; @@ -14,7 +17,3 @@ runCommand "mro-unicode-2013-05-25" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/MroUnicode-Regular.ttf -'' diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index d75dcda6421a..054c2ca91f6e 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { # cp $riqa/*.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1wa0j65iz20ij37dazd1rjg8x625m6q1y8g5h7ia48pbc88sr01q"; + meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; longDescription = '' diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 409dcce024b5..4b725cbf5f8d 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./install.sh ${withFont} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0bxna3llj6kf1rndvkw8w81blmgwy9l8kricynlf0l3mdd6li1f4"; + meta = with stdenv.lib; { description = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index 9bd38409955a..35d69aa7f078 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = "norwester"; +let version = "1.2"; + pname = "norwester"; +in fetchzip rec { name = "${pname}-${version}"; - src = fetchurl { - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - sha256 = "0syg8ss7mpli4cbxvh3ld7qrlbhb2dfv3wchm765iw6ndc05g92d"; - }; - - phases = [ "installPhase" ]; - - buildInputs = [ unzip ]; + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -D -j $src ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ + unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ ''; + sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + meta = with stdenv.lib; { homepage = http://jamiewilson.io/norwester; description = "A condensed geometric sans serif by Jamie Wilson"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 28fce3799683..73059cbcc33a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: rec { # 18MB - noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation { + noto-fonts = let version = "git-2016-03-29"; in fetchzip { name = "noto-fonts-${version}"; - src = fetchFromGitHub { - owner = "googlei18n"; - repo = "noto-fonts"; - rev = "e8b0af48b15d64bd490edab4418b5e396cf29644"; - sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip; + postFetch = '' + unzip $downloadedFile - installPhase = '' mkdir -p $out/share/fonts/noto - cp hinted/*.ttf $out/share/fonts/noto + cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto # Also copy unhinted & alpha fonts for better glyph coverage, # if they don't have a hinted version # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) - cp -n unhinted/*.ttf $out/share/fonts/noto - cp -n alpha/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64"; meta = with stdenv.lib; { inherit version; @@ -49,27 +42,16 @@ rec { }; }; # 89MB - noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation { + noto-fonts-cjk = let version = "1.004"; in fetchzip { name = "noto-fonts-cjk-${version}"; - src = fetchurl { - # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file - url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; - sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6"; - }; - - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/noto - cp *.ttc $out/share/fonts/noto + # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file + url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index 411af37932af..4e55b5098c80 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "oldsindhi-${version}"; +let version = "0.1"; +in fetchzip rec { + name = "oldsindhi-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - sha256 = "1sbmxyxi81k88hkfw7gnnpgd5vy2vyj5y5428cd6nz4zlaclgq8z"; - }; - - buildInputs = [ p7zip ]; + url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - unpackCmd = "7z x $curSrc"; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile - installPhase = '' mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README *.txt $out/share/doc/${name} + cp -v OldSindhi/*.ttf $out/share/fonts/truetype/ + cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name} ''; + sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q"; + meta = with stdenv.lib; { homepage = https://github.com/MihailJP/oldsindhi; description = "Free Sindhi Khudabadi font"; diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index 125a4b636a99..95f8f3be7d65 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { cp -v FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/oldstand; description = "An attempt to revive a specific type of Modern style of serif typefaces"; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 9d241654b121..9b1324639720 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,25 +1,20 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "open-dyslexic-${version}"; +let version = "2014-11-11"; +in fetchzip { + name = "open-dyslexic-${version}"; - src = fetchgit { - url = "https://github.com/antijingoist/open-dyslexic.git"; - rev = "f4b5ba89018b44d633608907e15f93fb3fabbabc"; - sha256 = "04pa7c2cary6pqxsmxqrg7wi19szg7xh8panmvqvmc7jas0mzg6q"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v 'otf/'*.otf $out/share/fonts/opentype + url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip; - mkdir -p $out/share/doc/open-dyslexic - cp -v README.md $out/share/doc/open-dyslexic + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic ''; + sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; + meta = with stdenv.lib; { homepage = http://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 16e2d54f1300..6f3762c971c9 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -1,22 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD - -stdenv.mkDerivation rec { +fetchzip { name = "opensans-ttf-20140617"; - src = fetchurl { - url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4"; - }; - - sourceRoot = "."; + url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf"; + meta = { description = "Open Sans fonts"; longDescription = '' diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index fa34d9586c5b..e0ef1ecda813 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "orbitron-${version}"; +let version = "20110526"; +in fetchzip { + name = "orbitron-${version}"; - src = fetchFromGitHub { - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; - sha256 = "1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip; - installPhase = '' + postFetch = '' otfdir=$out/share/fonts/opentype/orbitron ttfdir=$out/share/fonts/ttf/orbitron mkdir -p $otfdir $ttfdir - cp -v Orbitron*.otf $otfdir - cp -v Orbitron*.ttf $ttfdir + unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir + unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir ''; + sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + meta = with stdenv.lib; { homepage = https://www.theleagueofmoveabletype.com/orbitron; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index e24d61d5ba1c..8bb4e82747ad 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "overpass-${version}"; +let version = "3.0.2"; +in fetchzip rec { + name = "overpass-${version}"; - src = fetchFromGitHub { - owner = "RedHatBrand"; - repo = "Overpass"; - rev = version; - sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6"; - }; - - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; + url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip"; - installPhase = '' - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/opentype - cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype - cp -v LICENSE.md README.md $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; + sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s"; + meta = with stdenv.lib; { homepage = http://overpassfont.org/; description = "Font heavily inspired by Highway Gothic"; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index 1054986288a8..109b3c3a0b3a 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "oxygenfonts-20160824"; - src = fetchFromGitHub { - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; - sha256 = "134kx3d0g3zdkw8kl8p6j37fzw3bl163jv2dx4dk1451f3ramcnh"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype/ - cp OxygenSans-version-0.4/*/*.ttf $out/share/fonts/truetype/ - cp Oxygen-Monospace/*.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype ''; + sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + meta = with stdenv.lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; longDescription = '' diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 1a9cf29c3e08..6124d0c79b66 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-mono"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTMono.zip"; - sha256 = "1wqaai7d6xh552vvr5svch07kjn1q89ab5jimi2z0sbd0rbi86vl"; - }; - - buildInputs = [unzip]; + url = "http://www.paratype.ru/uni/public/PTMono.zip"; - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 89d9e9381e76..499871a4228d 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-sans"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSans.zip"; - sha256 = "1j9gkbqyhxx8pih5agr9nl8vbpsfr9vdqmhx73ji3isahqm3bhv5"; - }; - - buildInputs = [unzip]; + url = "http://www.paratype.ru/uni/public/PTSans.zip"; - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index 323e10c8b7b8..409aaf526f81 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-serif"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - sha256 = "0x3l58c1rvwmh83bmmgqwwbw9av1mvvq68sw2hdkyyihjvamyvvs"; - }; - - buildInputs = [unzip]; + url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 7650c13961ee..b57cf22569d2 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "pecita-${version}"; +let version = "5.4"; +in fetchzip rec { + name = "pecita-${version}"; - src = fetchurl { - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; - }; - - phases = ["unpackPhase" "installPhase"]; + url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - installPhase = '' + postFetch = '' + tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf ''; + sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + meta = with stdenv.lib; { homepage = http://pecita.eu/police-en.php; description = "Handwritten font with connected glyphs"; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 7298dbb18cef..b27290707b6b 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp ${italic} $out/share/fonts/opentype/Poly-Italic.otf ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "11d7ldryfxi0wzfrg1bhw23a668a44vdb8gggxryvahmp5ahmq2h"; + meta = { description = "Medium contrast serif font"; longDescription = '' diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3140be6d0352..9f42324e6d6d 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,34 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "powerline-fonts-2017-05-25"; - src = fetchFromGitHub { - owner = "powerline"; - repo = "fonts"; - rev = "fe396ef6f6b9b315f30af7d7229ff21f67a66e12"; - sha256 = "1l72kf0zqdp52hbnphky5cl0a1p9fghldvq7ppbnnrhmcwvavprs"; - }; - - dontBuild = true; + url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v */*.otf $out/share/fonts/opentype + unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype mkdir -p $out/share/fonts/truetype - cp -v */*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype mkdir -p $out/share/fonts/bdf - cp -v */BDF/*.bdf $out/share/fonts/bdf + unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf mkdir -p $out/share/fonts/pcf - cp -v */PCF/*.pcf.gz $out/share/fonts/pcf + unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf mkdir -p $out/share/fonts/psf - cp -v */PSF/*.psf.gz $out/share/fonts/psf + unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf ''; + sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388"; + meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; description = "Patched fonts for Powerline users"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 98227605ac84..0c6eede969f1 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "profont"; - src = fetchurl { - url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; - sha256 = "19ww5iayxzxxgixa9hgb842xd970mwghxfz2vsicp8wfwjh6pawr"; - }; + url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; + + postFetch = '' + unzip -j $downloadedFile - buildInputs = [ unzip ]; + mkdir -p $out/share/doc/$name $out/share/fonts/misc - phases = [ "unpackPhase" "installPhase" ]; - installPhase = - '' - mkdir -p $out/share/doc/$name $out/share/fonts/misc + cp LICENSE $out/share/doc/$name/LICENSE - cp LICENSE $out/share/doc/$name/LICENSE + for f in *.pcf; do + gzip -c "$f" > $out/share/fonts/misc/"$f".gz + done + ''; - for f in *.pcf; do - gzip -c "$f" > $out/share/fonts/misc/"$f".gz - done - ''; + sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw"; meta = with stdenv.lib; { homepage = http://tobiasjung.name; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 9a4cfb3093bc..9637a6c85b02 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "proggyfonts-0.1"; src = fetchurl { - url = "http://kaictl.net/software/${name}.tar.gz"; + url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "06jsf3rw6q4l1jrw1161h4vxa1xbvpry5x12d8sh5g7hjk88p77g"; + meta = with stdenv.lib; { homepage = http://upperbounds.net; description = "A set of fixed-width screen fonts that are designed for code listings"; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 116fdd25a04e..34c8a74a7626 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-sans-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "quattrocento-sans-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1"; - }; - - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "quattrocento-sans-v${version}"; + url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype + unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} ''; + sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocentosans/; description = "A classic, elegant and sober sans-serif typeface"; diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 7ef62d2300c5..a78001bb4ae6 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "quattrocento-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n"; - }; - - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; + url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocento/; description = "A classic, elegant, sober and strong serif typeface"; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index e754135755a6..2ba9069d48be 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "raleway-${version}"; +let version = "2016-08-30"; +in fetchzip { + name = "raleway-${version}"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; - sha256 = "1i6a14ynm29gqjr7kfk118v69vjpd3g4ylwfvhwa66xax09jkhlr"; - }; - dontBuild = true; + url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype - find -type f -maxdepth 1 -exec cp "{}" $out/ \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*-Original.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt \*.md -d $out ''; + sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + meta = { description = "Raleway is an elegant sans-serif typeface family"; @@ -35,7 +32,7 @@ stdenv.mkDerivation rec { It also has a sister display family, Raleway Dots. ''; - homepage = src.meta.homepage; + homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; maintainers = with stdenv.lib.maintainers; [ profpatsch ]; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index e9eff414bc1d..175acb22d7b2 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Mono; description = "Google Roboto Mono fonts"; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 5a8a3f3c1201..c5ce13ad7ae4 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Slab; description = "Google Roboto Slab fonts"; diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index fbb364b9d721..00c4bb7fb886 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "roboto-${version}"; +let version = "2.136"; +in fetchzip rec { + name = "roboto-${version}"; - src = fetchurl { - url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201"; - }; - - nativeBuildInputs = [ unzip ]; + url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7"; + meta = { homepage = https://github.com/google/roboto; description = "The Roboto family of fonts"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 57639d8e6ab9..90b32f251ef6 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "sampradaya-2015-05-26" { - src = fetchurl { - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; - sha256 = "0110k1yh5kz3f04wp72bfz59pxjc7p6jv7m5p0rqn1kqbf7g3pck"; - }; +fetchzip { + name = "sampradaya-2015-05-26"; + + url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + + sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; meta = with lib; { homepage = https://bitbucket.org/OorNaattaan/sampradaya/; @@ -14,7 +17,3 @@ runCommand "sampradaya-2015-05-26" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/Sampradaya.ttf -'' diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 942a284e2c0d..034c36a63cec 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2016-03-03"; +in fetchzip { name = "shrikhand-${version}"; - src = fetchFromGitHub { - owner = "jonpinhorn"; - repo = "shrikhand"; - rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394"; - sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk"; - }; + url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf; + + postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; - installPhase = '' - install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf - ''; + sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; meta = with stdenv.lib; { homepage = https://jonpinhorn.github.io/shrikhand/; diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix index 147f4edc5198..883e43b4381f 100644 --- a/pkgs/data/fonts/signwriting/default.nix +++ b/pkgs/data/fonts/signwriting/default.nix @@ -13,6 +13,10 @@ runCommand "signwriting-1.1.4" { sha256 = "0am5wbf7jdy9szxkbsc5f3959cxvbj7mr0hy1ziqmkz02c6xjw2m"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q"; + meta = with lib; { homepage = https://github.com/Slevinski/signwriting_2010_fonts; description = "Typeface for written sign languages"; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index 382f3fa8f0fd..b695143fa592 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "siji-${date}"; +let date = "2016-05-13"; +in fetchzip { + name = "siji-${date}"; - src = fetchFromGitHub { - owner = "stark"; - repo = "siji"; - rev = "95369afac3e661cb6d3329ade5219992c88688c1"; - sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; - }; + url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; - installPhase = '' - mkdir -p $out/share/fonts/pcf - cp -v */*.pcf $out/share/fonts/pcf + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.pcf -d $out/share/fonts/pcf ''; + sha256 = "1799hs7zd8w7qyja4mii9ggmrm786az7ldsqwx9mbi51b56ym640"; + meta = { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 5dc522aac2c1..95c568821879 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-code-pro-${version}"; +let version = "2.030"; +in fetchzip { + name = "source-code-pro-${version}"; - src = fetchFromGitHub { - owner = "adobe-fonts"; - repo = "source-code-pro"; - rev = "2.030R-ro/1.050R-it"; - name = "2.030R-ro-1.050R-it"; - sha256 = "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n"; - }; - - phases = "unpackPhase installPhase"; + url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv"; + meta = { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with stdenv.lib.maintainers; [ relrod ]; diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 240f0ff5d290..dc0d31758514 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.004R"; - name = "source-han-sans-${variant}-${version}"; revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa"; + in fetchzip { + name = "source-han-sans-${variant}-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSans* ) + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype - ''; + inherit sha256; meta = { description = "${language} subset of an open source Pan-CJK sans-serif typeface"; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw"; + sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q"; + sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha"; + sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj"; + sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr"; }; } diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix index 148f5a4538f5..ac85d31d3316 100644 --- a/pkgs/data/fonts/source-han-serif/default.nix +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -1,27 +1,21 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.000R"; - name = "source-han-serif-${variant}-${version}"; revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + in fetchzip { + name = "source-han-serif-${variant}-${version}"; - buildInputs = [ unzip ]; - - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSerif* ) - ''; + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + inherit sha256; + meta = { description = "${language} subset of an open source Pan-CJK serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06"; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 83b6a3f2d578..4ae9ceac01df 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "source-sans-pro-2.010"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz"; - sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2"; - }; - phases = "unpackPhase installPhase"; + url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourcesans; description = "A set of OpenType fonts designed by Adobe for UIs"; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index 0ccb0299a364..d627d813daa7 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-serif-pro-${version}"; +let version = "1.017"; +in fetchzip { + name = "source-serif-pro-${version}"; - src = fetchurl rec { - url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz"; - sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg"; - }; - - phases = "unpackPhase installPhase"; + url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourceserifpro; description = "A set of OpenType fonts to complement Source Sans Pro"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f32d865c95c7..1ae85da3f7f3 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -1,25 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "stix-otf-${version}"; +let version = "1.1.1"; +in fetchzip rec { + name = "stix-otf-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q"; - }; - - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "Fonts/STIX-Word"; + url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index d4ec083a0708..f535c0d7e7b5 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "stix-two-${version}"; +let version = "2.0.0"; +in fetchzip { + name = "stix-two-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g"; - }; - - buildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; + url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 0b9a63f2cb38..7778c4a98b81 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -1,11 +1,14 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: { -tai-ahom = runCommand "tai-ahom-2015-07-06" { - src = fetchurl { - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; - sha256 = "0zpjsylm29qc3jdv5kv0689pcirai46j7xjp5dppi0fmzxaxqnsk"; - }; +tai-ahom = fetchzip { + name = "tai-ahom-2015-07-06"; + + url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + + sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; meta = with lib; { homepage = https://github.com/enabling-languages/tai-languages; @@ -14,11 +17,7 @@ tai-ahom = runCommand "tai-ahom-2015-07-06" { license = licenses.ofl; # See font metadata platforms = platforms.all; }; -} -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/AhomUnicode.ttf -''; +}; # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index c934bdb70e39..d0e7b89888c3 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation { mkdir -p "$out/share/fonts/opentype/public" cp ${toString srcs} "$out/share/fonts/opentype/public" ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; + meta = { description = ''Tempora font''; license = stdenv.lib.licenses.gpl2 ; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 01959f91195f..8750dfbd52d4 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "terminus-font-ttf-${version}"; +let version = "4.40.1"; +in fetchzip rec { + name = "terminus-font-ttf-${version}"; - src = fetchurl { - url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; - }; + url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - nativeBuildInputs = [ unzip ]; + postFetch = '' + unzip -j $downloadedFile - installPhase = '' for i in *.ttf; do local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" @@ -20,6 +18,8 @@ stdenv.mkDerivation rec { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; + sha256 = "0cfkpgixdz47y94s9j26pm7n4hvad23vb2q4315kgahl4294zcpg"; + meta = with stdenv.lib; { description = "A clean fixed width TTF font"; longDescription = '' diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index cd83a96a72ad..e499eb412bac 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { bdftopcf -o ''${i/bdf/pcf} $i done - gzip *.pcf + gzip -n *.pcf ''; installPhase = '' @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq"; + meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index c385c3d40a92..2dbe7e720d2f 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "theano-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "theano-${version}"; - src = fetchzip { - stripRoot = false; - url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp"; - }; - - phases = [ "unpackPhase" "installPhase" ]; + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/theano; description = "An old-style font designed from historic samples"; diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 45d88901ea77..1a4954e6ce40 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "tipa-1.3"; - + src = fetchurl { url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz"; sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m"; @@ -13,9 +13,13 @@ stdenv.mkDerivation { mkdir -p "$PREFIX" "$out/share" make install PREFIX="$PREFIX" - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1g2cclykr6ax584rlcri8w2h385n624sgfx2fm45r0cwkg1p77h2"; + meta = { description = "Phonetic font for TeX"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 0ab7657cc6f7..a4d479ea33c5 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "ttf-bitstream-vera-1.10"; - src = fetchurl { - url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; - }; - - dontBuild = true; + url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 fontDir=$out/share/fonts/truetype mkdir -p $fontDir cp *.ttf $fontDir ''; + sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 8db10d7f582c..2c58f197f188 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: + let pname = "ttf-envy-code-r"; version = "PR7"; -in -stdenv.mkDerivation rec { +in fetchzip { name = "${pname}-0.${version}"; - src = fetchurl { - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff"; - }; - - buildInputs = [unzip]; + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - installPhase = '' - for f in *.ttf; do - install -Dm 644 "$f" "$out/share/fonts/truetype/$f" - done - install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt" + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" ''; + sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; + meta = with stdenv.lib; { homepage = http://damieng.com/blog/tag/envy-code-r; description = "Free scalable coding font by DamienG"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 61e12848d97e..e78f86fede44 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ubuntu-font-family-0.83"; - buildInputs = [unzip]; - src = fetchurl { - url = "http://font.ubuntu.com/download/${name}.zip"; - sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"; - }; + url = "http://font.ubuntu.com/download/${name}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu + ''; - installPhase = - '' - mkdir -p $out/share/fonts/ubuntu - cp *.ttf $out/share/fonts/ubuntu - ''; + sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; meta = { description = "Ubuntu Font Family"; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index b9af7fad165e..75ab2f40b6f1 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; + meta = with stdenv.lib; { description = "Unicode bitmap fonts"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 63f74bb41b4a..ce18893ced7d 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7"; + meta = { description = "Unicode VGA font"; maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index bd99d20480bf..4d9f3fc71047 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1s7gpxxj760aw3rpk760s3w8qdkn819rs7si1qj4grm3s6hb2gd8"; + meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; homepage = http://unifoundry.com/unifont.html; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 7f7b53526e50..8a3fd2d60353 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "unifont_upper-${version}"; +let version = "9.0.03"; +in fetchzip rec { + name = "unifont_upper-${version}"; - ttf = fetchurl { - url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - sha256 = "015v39y6nnyz4ld006349jzk9isyaqp4cnvmz005ylfnicl4zwhi"; - }; + url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - phases = "installPhase"; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - installPhase = - '' - mkdir -p $out/share/fonts/truetype - cp -v ${ttf} $out/share/fonts/truetype/unifont_upper.ttf - ''; + sha256 = "0anja3wrdjw0czqqk6wpf9yrkp0b11hb98wzmrpyij9gfgrspd71"; meta = with stdenv.lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 5fea1f795fd3..f84d067eed83 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,24 +1,14 @@ -{stdenv, fetchurl, cabextract}: +{stdenv, fetchzip, cabextract}: -stdenv.mkDerivation { +fetchzip { name = "vista-fonts-1"; - src = fetchurl { - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; - }; - - buildInputs = [cabextract]; + url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - unpackPhase = '' - cabextract --lowercase --filter ppviewer.cab $src - cabextract --lowercase --filter '*.TTF' ppviewer.cab - sourceRoot=. - ''; + postFetch = '' + ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile + ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab - dontBuild = true; - - installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -31,6 +21,8 @@ stdenv.mkDerivation { done ''; + sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index c0665b2f0ccf..038f03169402 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "wqy-microhei-0.2.0-beta"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; + + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc + ''; - installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc''; + sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; meta = { description = "A (mainly) Chinese Unicode font"; diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 92f043c7fc07..9718763d004a 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "wqy-zenhei-${version}"; +let version = "0.9.45"; +in fetchzip rec { + name = "wqy-zenhei-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; - dontBuild = true; + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts + install -m644 *.ttc $out/share/fonts/ + ''; - installPhase = - '' - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ - ''; + sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; meta = { description = "A (mainly) Chinese Unicode font"; @@ -25,4 +23,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 83cb2d749dd2..0a0ff4263ec6 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.0"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "08pkk4299dj442dby15lwxwz7bax5d3828v1f81mbll084k7vssm"; + sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm"; }; dontBuild = true; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 3b34b664d5db..275ae6dc2d86 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, nss, python3 +{ stdenv, fetchurl, writeText, nss, python , blacklist ? [] , includeEmail ? false }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = nss.src; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ python ]; configurePhase = '' ln -s nss/lib/ckfw/builtins/certdata.txt @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF - cp ${certdata2pem} certdata2pem.py + cat ${certdata2pem} > certdata2pem.py + patch -p1 < ${./fix-unicode-ca-names.patch} ${optionalString includeEmail '' # Disable CAs used for mail signing substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] ''' diff --git a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch new file mode 100644 index 000000000000..07d3629196a7 --- /dev/null +++ b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch @@ -0,0 +1,20 @@ +--- a/certdata2pem.py 2017-08-01 23:10:00.000000000 +0300 ++++ b/certdata2pem.py 2017-08-01 23:08:21.131297636 +0300 +@@ -88,7 +88,7 @@ + \# Read blacklist. + blacklist = [] + if os.path.exists('blacklist.txt'): +- for line in open('blacklist.txt', 'r'): ++ for line in io.open('blacklist.txt', 'r', encoding='utf-8'): + line = line.strip() + if line.startswith('#') or len(line) == 0: + continue +@@ -101,7 +101,7 @@ + if obj['CKA_CLASS'] != 'CKO_NSS_TRUST': + continue + if obj['CKA_LABEL'] in blacklist: +- print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) ++ print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8')) + elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR': + trust[obj['CKA_LABEL']] = True + elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR': diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index c802f9636eb1..8da7fab90371 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, libnotify, gtkspell3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}: let majVer = gnome3.version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { libcanberra_gtk3 bogofilter gnome3.libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas dconf + gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.glib_networking openldap ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix index a827831c801c..f14a1ef3c47d 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -1,15 +1,15 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup -, gnome3, wrapGAppsHook }: +, gnome3, wrapGAppsHook, telepathy_logger }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ telepathy_idle ]; + propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas + telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix index e59df06f8a05..58d5a5b8cdc5 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, vala_0_32 , pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup +, wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11_kit, openssh }: @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg + gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr + libsecret avahi libsoup p11_kit vala_0_32 openssh ]; preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix index b67795ea59c1..c2038ecdce60 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python +{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] ++ stdenv.lib.optional valaSupport vala_0_32; @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + for f in $(find $out/libexec/ -type f -executable); do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" done ''; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix index 8097cf32ba6e..66cc2cb24c73 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix @@ -1,9 +1,9 @@ { stdenv, intltool, fetchurl, evolution_data_server, db , pkgconfig, gtk3, glib, libsecret , libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: +, libsoup, vala_0_32, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -18,19 +18,17 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify + gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.defaultIconTheme librsvg libchamplain clutter_gtk geocode_glib - vala_0_32 automake115x autoconf db ]; + vala_0_32 automake autoconf db ]; preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; patches = [ ./gio_unix.patch ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 23d32cdbac30..b116c2902da3 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { ''; preFixup = with gnome3; '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + ) for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix index d0ec2307a852..16d7151ea096 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool +, bash, wrapGAppsHook, itstool , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix index 8d3e15d00354..34f8cee625aa 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix index 8f77b7e5e3b1..2ce3f9e39271 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon - pythonEnv gobjectIntrospection ]; + pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; @@ -39,11 +39,13 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix index 50ee229cfa49..aa6f48ac420b 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix index bdbdefecf229..8c3bf86edcfe 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper + gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas ]; preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + ) ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix index 72ebd543e902..b086e3860597 100644 --- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt +, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite + gnome3.gsettings_desktop_schemas wrapGAppsHook + file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { ''; preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix index 3ceabe70ad80..37cdfc730ab8 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, +{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base, glib, gobjectIntrospection, telepathy_glib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = ''./autogen.sh''; buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool + which intltool glib gobjectIntrospection pkgconfig libtool makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index d068f432ee95..07c7d0662a97 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606"; + sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 528f792a600d..81839930664a 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -2,6 +2,8 @@ rec { atril = callPackage ./atril { }; caja = callPackage ./caja { }; + eom = callPackage ./eom { }; + pluma = callPackage ./pluma { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix new file mode 100644 index 000000000000..1c27958b0c97 --- /dev/null +++ b/pkgs/desktops/mate/eom/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "eom-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + dbus_glib + exempi + lcms2 + libexif + libjpeg + librsvg + libxml2 + shared_mime_info + gnome3.gtk + gnome3.libpeas + mate.mate-desktop + ]; + + meta = { + description = "An image viewing and cataloging program for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index ddc6d81499da..05edfc1dd6d4 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; + sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 3a2de515ba9a..239a01c759af 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm"; + sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 532e50c45495..9d620b283018 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; + sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 793c68e688a5..45be1d8710d7 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.20" = "19"; - "3.22" = "10"; + "3.20" = "22"; + "3.22" = "13"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g"; - "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb"; + "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4"; + "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"; }."${major-ver}"; }; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix new file mode 100644 index 000000000000..a290c404469c --- /dev/null +++ b/pkgs/desktops/mate/pluma/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "pluma-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + isocodes + wrapGAppsHook + ]; + + buildInputs = [ + enchant + libxml2 + python + gnome3.gtksourceview + gnome3.libpeas + gnome3.defaultIconTheme + mate.mate-desktop + ]; + + meta = { + description = "Powerful text editor for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 475b48343a57..c15ab310f47b 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/mousepad" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; meta = { diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch new file mode 100644 index 000000000000..4e1dcc1efa71 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -0,0 +1,16 @@ +--- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100 ++++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100 +@@ -24,10 +24,11 @@ + PATH=/bin:/usr/bin + export PATH + +-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running ++# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running + for lock_cmd in \ + "xscreensaver-command -lock" \ +- "gnome-screensaver-command --lock" ++ "gnome-screensaver-command --lock" \ ++ "light-locker-command -l" + do + $lock_cmd >/dev/null 2>&1 && exit + done diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a0568b0dd395..edc810d38972 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; }; + patches = [ + # Fix "lock screen" not working for light-locker + ./xfce4-light-locker.patch + ]; + buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 24d583ed8862..792ecc739a50 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { CHICKEN is a compiler for the Scheme programming language. CHICKEN produces portable and efficient C, supports almost all of the R5RS Scheme language standard, and includes many - enhancements and extensions. CHICKEN runs on Linux, MacOS X, + enhancements and extensions. CHICKEN runs on Linux, macOS, Windows, and many Unix flavours. ''; }; diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index ae7a5ce87b25..f35ca26584f1 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, ... }: let - rev = "1.37.13"; + rev = "1.37.16"; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az"; + sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw"; + sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index b39198f30a48..ae80ad6fc808 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,7 +3,7 @@ }: let - rev = "1.37.13"; + rev = "1.37.16"; appdir = "share/emscripten"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5"; + sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy"; inherit rev; }; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e95ef92c3f65..c9780077835e 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -325,7 +325,13 @@ stdenv.mkDerivation ({ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + preConfigure = + # Not sure why this is causing problems, now that the stdenv + # exports CPP=cpp the build fails with strange errors on darwin. + # https://github.com/NixOS/nixpkgs/issues/27889 + stdenv.lib.optionalString stdenv.cc.isClang '' + unset CPP + '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 5a505f39b1a7..362b4895b7e3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -5,6 +5,7 @@ # If enabled GHC will be build with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. , enableIntegerSimple ? false, gmp +, version ? "8.3.20170808" }: let @@ -12,8 +13,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20170106"; - rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; + rev = "14457cf6a50f708eecece8f286f08687791d51f7"; commonPreConfigure = '' echo ${version} >VERSION @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0"; + sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 61408c0ebb34..0eebc92ee594 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index d7a824239b84..b1230da5a142 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8e0b1c7360f5..8a675b1b7761 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index adca825b2016..cc19f7afe347 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, emscripten }: -let version = "0.8.9"; in +let version = "0.9.4"; in stdenv.mkDerivation { name = "jsonnet-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "0phk8dzby5v60r7fwd1qf4as2jdpmdmksjw3g4p3mkkr7sc81119"; + sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; }; buildInputs = [ emscripten ]; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ee0a50c93978..a3f652d783be 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { patches = [ ./D17533-1.patch ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; - # hacky fix: New LLVM releases require a newer OS X SDK than + # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/pkgs/development/compilers/ocaml/configure-3.08.0 index c62da78ab9fd..9c8705855120 100755 --- a/pkgs/development/compilers/ocaml/configure-3.08.0 +++ b/pkgs/development/compilers/ocaml/configure-3.08.0 @@ -45,7 +45,7 @@ gcc_warnings="-Wall" unset LANG unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME -# Turn off some MacOS X debugging stuff, same reason +# Turn off some macOS debugging stuff, same reason unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED # Parse command-line arguments diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index fec038199adc..2a00cf5f2d29 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -27,7 +27,8 @@ , mesa_noglu , freetype , fontconfig -, gnome2 +, gtk2 +, pango , cairo , alsaLib , atk @@ -196,7 +197,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix new file mode 100644 index 000000000000..8b5d14e7f5fb --- /dev/null +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, autoreconfHook}: + +let + version = "5.6"; +in + +stdenv.mkDerivation { + name = "polyml-${version}"; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace stdc++ c++ + ''; + + buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + src = fetchurl { + url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; + sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0"; + }; + + meta = { + description = "Standard ML compiler and interpreter"; + longDescription = '' + Poly/ML is a full implementation of Standard ML. + ''; + homepage = http://www.polyml.org/; + license = stdenv.lib.licenses.lgpl21; + platforms = with stdenv.lib.platforms; linux; + maintainers = [ #Add your name here! + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c3d9d9882074..ab7881a21514 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "175yivc5vjwfdcqcpkdqmdfy72pn4k62n4j3qagfbwya7frq2car"; + sha256 = "06g811x7vc275ypn3laqcsq7lmp2w8al6ipkpknhpq9c6lf7dvcp"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 28863e450a7a..c5767541a027 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -114,8 +114,12 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake - which libffi gdb ]; + nativeBuildInputs = + [ file python2 procps rustPlatform.rust.rustc git cmake + which libffi + ] + # Only needed for the debuginfo tests + ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains ++ optional (!forceBundledLLVM) llvmShared; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3bd1982baa59..82859a0e4298 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.19"; + version = "1.3.20"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm"; + sha256 = "0qhzrl2msdyzqp3165qlh9s6jrif5rddsmj9q50z0bxnaf0330jj"; }; patchPhase = '' diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index c1e1e2ece7a8..7145a8f2fa04 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "urweb-${version}"; - version = "20170105"; + version = "20170720"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "2ad3aea2c4851c9b18f752d38c7127af8293fbbbbdb3dd06b73a4603fe399b67"; + sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb"; }; buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index e07c7c80ac03..c3169970ad24 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-interval-3.1.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz; - sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf"; + url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2d0d0ec101db..9d916e70645e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -9,9 +9,9 @@ # # See comment at the top of configuration-nix.nix for more information about this # distinction. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -27,8 +27,10 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); + # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with + # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; }); + hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; @@ -170,25 +172,8 @@ self: super: { # https://github.com/jaspervdj/hakyll/issues/491 else dontCheck super.hakyll; - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required - # on darwin: https://github.com/NixOS/cabal2nix/issues/146. - hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - - # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues. - # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; - double-conversion = if !pkgs.stdenv.isDarwin - then addExtraLibrary - # https://github.com/bos/double-conversion/pull/17 - (appendPatch super.double-conversion (pkgs.fetchpatch { - url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch"; - sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9"; - })) - pkgs.stdenv.cc.cc.lib + then super.double-conversion else addExtraLibrary (overrideCabal super.double-conversion (drv: { postPatch = '' @@ -720,7 +705,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0"; + sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; @@ -882,4 +867,10 @@ self: super: { # https://github.com/vincenthz/hs-tls/issues/247 tls = dontCheck super.tls; + # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8 + digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; + + # missing dependencies: doctest ==0.12.* + html-entities = doJailbreak super.html-entities; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 6be7ae16572a..387754d674e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index c2a7e0014056..3edbc0d398bf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { 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 7f561133b64e..ffa7030d98b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -36,9 +36,6 @@ self: super: { unix = null; xhtml = null; - # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); - # Build jailbreak-cabal with the latest version of Cabal. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 911fb8640f42..75e0c9c0bcb2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 8a6d22bcc7ec..1b15f4f105be 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 43ec45bf8217..a096dc9ce8cd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index a97cbfde4fc9..f82bcb4e646c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index bc72ec031adb..ade4d5e915dc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { @@ -35,9 +35,6 @@ self: super: { unix = null; xhtml = null; - # cabal-install can use the native Cabal library. - cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 6f4ced675b3c..d1e22d881c35 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 6a9d15d402ef..4b7fc3d83603 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7efb75c33296..0f17f5ce707b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -2,14 +2,14 @@ # # Please insert new packages *alphabetically* # in the OTHER PACKAGES section. -{ pkgs }: +{ pkgs, haskellLib }: let removeLibraryHaskellDepends = pnames: depends: builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; in -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e861ad6d53f4..30ff85aed826 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2638,7 +2638,7 @@ dont-distribute-packages: XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] xmobar: [ x86_64-darwin ] - # Depens on shine, which is a ghcjs project. + # Depends on shine, which is a ghcjs project. shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages depend on software with an unfree license @@ -2662,12 +2662,54 @@ dont-distribute-packages: yices-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] + # these packages don't evaluate because they have broken dependencies + diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] + imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] + leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] + markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + spike: [ i686-linux, x86_64-linux, x86_64-darwin ] + tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + # soft restrictions because of build errors 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] abacate: [ i686-linux, x86_64-linux, x86_64-darwin ] - abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2679,7 +2721,6 @@ dont-distribute-packages: accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2713,7 +2754,6 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] - activehs-base: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2727,7 +2767,6 @@ dont-distribute-packages: adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2741,11 +2780,7 @@ dont-distribute-packages: aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-filthy: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-injector: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-quick: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2759,18 +2794,14 @@ dont-distribute-packages: Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] - alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2794,31 +2825,6 @@ dont-distribute-packages: alure: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-codebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-ec2: [ i686-linux ] - amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-polly: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-rekognition: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-s3: [ i686-linux ] - amazonka-s3-streaming: [ i686-linux ] - amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-shield: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-sms: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-swf: [ i686-linux ] - amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2839,7 +2845,6 @@ dont-distribute-packages: antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] - antigate: [ i686-linux, x86_64-linux, x86_64-darwin ] antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ] antisplice: [ i686-linux, x86_64-linux, x86_64-darwin ] antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2870,18 +2875,14 @@ dont-distribute-packages: AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] argon2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2891,8 +2892,6 @@ dont-distribute-packages: ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] arion: [ i686-linux, x86_64-linux, x86_64-darwin ] arith-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] - arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2915,7 +2914,6 @@ dont-distribute-packages: assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2936,7 +2934,6 @@ dont-distribute-packages: attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] - audacity: [ i686-linux, x86_64-linux, x86_64-darwin ] audiovisual: [ i686-linux, x86_64-linux, x86_64-darwin ] augeas: [ i686-linux, x86_64-linux, x86_64-darwin ] augur: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2955,6 +2952,7 @@ dont-distribute-packages: avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avl-static: [ i686-linux, x86_64-linux, x86_64-darwin ] AvlTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + avro: [ i686-linux, x86_64-linux, x86_64-darwin ] avr-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] awesome-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2976,15 +2974,11 @@ dont-distribute-packages: aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] - axiom: [ i686-linux, x86_64-linux, x86_64-darwin ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] - babl: [ i686-linux, x86_64-linux, x86_64-darwin ] - babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3006,14 +3000,11 @@ dont-distribute-packages: barley: [ i686-linux, x86_64-linux, x86_64-darwin ] Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] - basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3021,7 +3012,6 @@ dont-distribute-packages: battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] - bdd: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3030,7 +3020,6 @@ dont-distribute-packages: beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] - bench: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3041,8 +3030,6 @@ dont-distribute-packages: betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] bet: [ i686-linux, x86_64-linux, x86_64-darwin ] bff: [ i686-linux, x86_64-linux, x86_64-darwin ] - bff-mono: [ i686-linux, x86_64-linux, x86_64-darwin ] - bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3053,7 +3040,6 @@ dont-distribute-packages: billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-pane: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] - bimaps: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3077,38 +3063,31 @@ dont-distribute-packages: bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-sane: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] - BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3117,7 +3096,6 @@ dont-distribute-packages: bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitcoin-payment-channel: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3128,11 +3106,7 @@ dont-distribute-packages: bit-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitwise: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] - black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] - blacktip: [ i686-linux, x86_64-linux, x86_64-darwin ] bla: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3144,6 +3118,7 @@ dont-distribute-packages: blaze-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-html-truncate: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] ble: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3154,11 +3129,7 @@ dont-distribute-packages: blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ] Blogdown: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] - BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] - bloodhound-amazonka-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3167,8 +3138,8 @@ dont-distribute-packages: blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] BNFC-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] bno055-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] + bolt: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3177,34 +3148,28 @@ dont-distribute-packages: Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] - boomange: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - bound-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - bound: [ i686-linux, x86_64-linux, x86_64-darwin ] + braid: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] - break: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] - breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] + brittany: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bsd-sysctl: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] - bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - buffer-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] - buildbox: [ i686-linux, x86_64-linux, x86_64-darwin ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3217,40 +3182,32 @@ dont-distribute-packages: bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] - byline: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] + c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-bounds: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3262,15 +3219,11 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-test-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] - cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] - cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3280,9 +3233,9 @@ dont-distribute-packages: caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] call: [ i686-linux, x86_64-linux, x86_64-darwin ] + camfort: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3291,7 +3244,6 @@ dont-distribute-packages: cap: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3303,7 +3255,6 @@ dont-distribute-packages: casadi-bindings-snopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] - cases: [ i686-linux, x86_64-linux, x86_64-darwin ] cash: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook-html: [ i686-linux, x86_64-linux, x86_64-darwin ] casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3312,6 +3263,8 @@ dont-distribute-packages: casr-logbook-reports-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3322,7 +3275,6 @@ dont-distribute-packages: category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cautious-file: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3341,13 +3293,13 @@ dont-distribute-packages: cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cereal-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] cf: [ i686-linux, x86_64-linux, x86_64-darwin ] cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3360,14 +3312,11 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] - charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] chatwork: [ i686-linux, x86_64-linux, x86_64-darwin ] cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3410,33 +3359,22 @@ dont-distribute-packages: clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - clay: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-mailinglist: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - clean-home: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] cless: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3449,7 +3387,7 @@ dont-distribute-packages: clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] - clist: [ i686-linux, x86_64-linux, x86_64-darwin ] + clit: [ i686-linux, x86_64-linux, x86_64-darwin ] cloben: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3458,6 +3396,7 @@ dont-distribute-packages: cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloud-seeder: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clr-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3479,15 +3418,12 @@ dont-distribute-packages: cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] - codec: [ i686-linux, x86_64-linux, x86_64-darwin ] - Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - codex: [ i686-linux, x86_64-linux, x86_64-darwin ] cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3502,28 +3438,22 @@ dont-distribute-packages: collections: [ i686-linux, x86_64-linux, x86_64-darwin ] colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] - colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinat: [ i686-linux, x86_64-linux, x86_64-darwin ] + columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] - comic: [ i686-linux, x86_64-linux, x86_64-darwin ] commander: [ i686-linux, x86_64-linux, x86_64-darwin ] Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] - commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commutative: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] - compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] compact: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-mutable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3533,18 +3463,11 @@ dont-distribute-packages: compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] - complex-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ] composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3564,6 +3487,7 @@ dont-distribute-packages: condor: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3584,10 +3508,8 @@ dont-distribute-packages: consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - constrained-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3618,12 +3540,10 @@ dont-distribute-packages: copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-sbv: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-theorem: [ i686-linux, x86_64-linux, x86_64-darwin ] copr: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] - core-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3646,8 +3566,6 @@ dont-distribute-packages: cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3686,15 +3604,11 @@ dont-distribute-packages: crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-enigma: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - csp: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3703,14 +3617,11 @@ dont-distribute-packages: CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] - csv-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] - cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] - cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3720,7 +3631,6 @@ dont-distribute-packages: curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] - cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3753,18 +3663,10 @@ dont-distribute-packages: data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-case-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-new-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-default-instances-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] - dataenc: [ i686-linux, x86_64-linux, x86_64-darwin ] data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3773,15 +3675,16 @@ dont-distribute-packages: data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3791,6 +3694,7 @@ dont-distribute-packages: data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3799,7 +3703,6 @@ dont-distribute-packages: dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3809,6 +3712,7 @@ dont-distribute-packages: dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-th-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] + dcpu16: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3827,7 +3731,6 @@ dont-distribute-packages: ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - debian-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3865,7 +3768,6 @@ dont-distribute-packages: derive-enumerable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3878,41 +3780,32 @@ dont-distribute-packages: dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-rubiks-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] - dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3928,31 +3821,34 @@ dont-distribute-packages: directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - discount: [ i686-linux, x86_64-linux, x86_64-darwin ] DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-fsm: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-systest: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3971,17 +3867,14 @@ dont-distribute-packages: docker: [ i686-linux, x86_64-linux, x86_64-darwin ] doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] - doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] + DOH: [ i686-linux, x86_64-linux, x86_64-darwin ] doi: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] - dominion: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] - download-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] - download: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] dozenal: [ i686-linux, x86_64-linux, x86_64-darwin ] dozens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4019,6 +3912,8 @@ dont-distribute-packages: dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] + duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4031,8 +3926,6 @@ dont-distribute-packages: dwarfadt: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-linker-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-mvector: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4048,11 +3941,11 @@ dont-distribute-packages: easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] - easytensor: [ i686-linux ] easytensor: [ i686-linux, x86_64-linux, x86_64-darwin ] ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] + eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4068,19 +3961,15 @@ dont-distribute-packages: EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - effin: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + eigen: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] eliminators: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4099,29 +3988,20 @@ dont-distribute-packages: enchant: [ i686-linux, x86_64-linux, x86_64-darwin ] encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] - EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - envy: [ i686-linux, x86_64-linux, x86_64-darwin ] epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] epass: [ i686-linux, x86_64-linux, x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] - epub-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - equal-files: [ i686-linux, x86_64-linux, x86_64-darwin ] EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] erd: [ i686-linux, x86_64-linux, x86_64-darwin ] erf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4133,12 +4013,12 @@ dont-distribute-packages: error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] error-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] - esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4168,22 +4048,17 @@ dont-distribute-packages: exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - exception-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] exference: [ i686-linux, x86_64-linux, x86_64-darwin ] - exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ] exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] - existential: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4201,9 +4076,10 @@ dont-distribute-packages: extensible-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + extralife: [ i686-linux, x86_64-linux, x86_64-darwin ] + extrapolate: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] - factory: [ i686-linux, x86_64-linux, x86_64-darwin ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4216,13 +4092,20 @@ dont-distribute-packages: fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-geoposition: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] - fb: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4260,6 +4143,8 @@ dont-distribute-packages: file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] + FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4269,13 +4154,11 @@ dont-distribute-packages: filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] - find-clumpiness: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] - fishfood: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] fitspec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4286,10 +4169,8 @@ dont-distribute-packages: fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4310,16 +4191,12 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-statistics: [ i686-linux ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4329,7 +4206,6 @@ dont-distribute-packages: fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] - ForestStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4337,7 +4213,6 @@ dont-distribute-packages: FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] formal: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] - format-numbers: [ i686-linux ] format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] formattable: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4351,7 +4226,6 @@ dont-distribute-packages: foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] foundation-edge: [ i686-linux, x86_64-linux, x86_64-darwin ] - foundation: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4361,14 +4235,12 @@ dont-distribute-packages: franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] fraxl: [ i686-linux, x86_64-linux, x86_64-darwin ] - freddy: [ i686-linux, x86_64-linux, x86_64-darwin ] free-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] free-http: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4378,18 +4250,14 @@ dont-distribute-packages: free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4415,7 +4283,6 @@ dont-distribute-packages: fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4423,7 +4290,6 @@ dont-distribute-packages: g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4433,7 +4299,6 @@ dont-distribute-packages: gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4457,28 +4322,19 @@ dont-distribute-packages: genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] - genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] geniplate: [ i686-linux, x86_64-linux, x86_64-darwin ] geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] genprog: [ i686-linux, x86_64-linux, x86_64-darwin ] GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-time: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] - geoip2: [ i686-linux, x86_64-linux, x86_64-darwin ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4502,11 +4358,7 @@ dont-distribute-packages: ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4518,30 +4370,17 @@ dont-distribute-packages: ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-syb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gsttag: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gstvideo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gtksource: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - ginger: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pangocairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4553,18 +4392,13 @@ dont-distribute-packages: git-freq: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] - github: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-tools: [ i686-linux ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-mediate: [ i686-linux, x86_64-linux, x86_64-darwin ] git-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4572,22 +4406,13 @@ dont-distribute-packages: gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] - givegif: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit2webextension: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] - glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] gli: [ i686-linux, x86_64-linux, x86_64-darwin ] glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] gll: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4600,19 +4425,11 @@ dont-distribute-packages: GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-raster: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-example: [ i686-linux, x86_64-linux, x86_64-darwin ] glue: [ i686-linux, x86_64-linux, x86_64-darwin ] - gluturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4630,40 +4447,20 @@ dont-distribute-packages: goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] goat: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-manufacturers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-sheets: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-shopping-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2-for-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-static-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleSuggest: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] - gore-and-ash-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4672,8 +4469,6 @@ dont-distribute-packages: gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4683,13 +4478,7 @@ dont-distribute-packages: grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] - Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] graphene: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4698,18 +4487,11 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-visit: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4722,17 +4504,9 @@ dont-distribute-packages: grenade: [ i686-linux, x86_64-linux, x86_64-darwin ] gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - grid: [ i686-linux, x86_64-linux, x86_64-darwin ] - gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-th: [ i686-linux, x86_64-linux, x86_64-darwin ] group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] growler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4741,10 +4515,8 @@ dont-distribute-packages: gruff: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4775,22 +4547,16 @@ dont-distribute-packages: h2c: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] habit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hablog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-whatsnew: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4811,10 +4577,10 @@ dont-distribute-packages: hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] + hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4831,21 +4597,14 @@ dont-distribute-packages: hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halive: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - halma: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4867,6 +4626,7 @@ dont-distribute-packages: HAppS-IxSet: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Server: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-State: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4883,9 +4643,7 @@ dont-distribute-packages: happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-server-tls-cryptonite: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-server-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-static-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4893,13 +4651,11 @@ dont-distribute-packages: happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - happy-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] - har: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4908,9 +4664,8 @@ dont-distribute-packages: haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascar: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4923,13 +4678,11 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskakafka: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskades: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4943,7 +4696,6 @@ dont-distribute-packages: haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4965,12 +4717,11 @@ dont-distribute-packages: haskelldb: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-lsp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4991,21 +4742,12 @@ dont-distribute-packages: haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5037,26 +4779,19 @@ dont-distribute-packages: HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-cabal-install: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - hastily: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] - hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5066,11 +4801,8 @@ dont-distribute-packages: hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Hawk: [ i686-linux, x86_64-linux, x86_64-darwin ] hax: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxl-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5085,8 +4817,6 @@ dont-distribute-packages: hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hburg: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] hcc: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5115,16 +4845,12 @@ dont-distribute-packages: hdis86: [ i686-linux, x86_64-linux, x86_64-darwin ] hdiscount: [ i686-linux, x86_64-linux, x86_64-darwin ] hdm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdo: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] hdr-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] headergen: [ i686-linux, x86_64-linux, x86_64-darwin ] - heaps: [ i686-linux, x86_64-linux, x86_64-darwin ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] - heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5140,7 +4866,6 @@ dont-distribute-packages: hellage: [ i686-linux, x86_64-linux, x86_64-darwin ] hell: [ i686-linux, x86_64-linux, x86_64-darwin ] hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - helm: [ i686-linux, x86_64-linux, x86_64-darwin ] help-esb: [ i686-linux, x86_64-linux, x86_64-darwin ] hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] hemokit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5166,12 +4891,8 @@ dont-distribute-packages: hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5211,7 +4932,6 @@ dont-distribute-packages: hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] hgis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5220,27 +4940,21 @@ dont-distribute-packages: hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgrev: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] hi3status: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hidapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hifi: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] - higher-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson-swagger: [ i686-linux ] - highjson-th: [ i686-linux ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] hi: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5248,13 +4962,12 @@ dont-distribute-packages: hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hip: [ i686-linux, x86_64-linux, x86_64-darwin ] HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5280,10 +4993,7 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5299,17 +5009,13 @@ dont-distribute-packages: hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5364,12 +5070,10 @@ dont-distribute-packages: hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] - hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] - hora: [ i686-linux ] ho-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] + horname: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5378,16 +5082,13 @@ dont-distribute-packages: hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpath: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5406,9 +5107,9 @@ dont-distribute-packages: hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hquery: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] - hreader-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5421,11 +5122,9 @@ dont-distribute-packages: HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - hruby: [ i686-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hS3: [ i686-linux, x86_64-linux, x86_64-darwin ] hsass: [ i686-linux, x86_64-linux, x86_64-darwin ] hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5433,7 +5132,6 @@ dont-distribute-packages: hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5455,13 +5153,11 @@ dont-distribute-packages: hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] hscope: [ i686-linux, x86_64-linux, x86_64-darwin ] hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsemail-ns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5474,7 +5170,6 @@ dont-distribute-packages: hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gen-iface: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gizapp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5482,10 +5177,9 @@ dont-distribute-packages: hsgsom: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHaruPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSH: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5494,7 +5188,6 @@ dont-distribute-packages: hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogger-template: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5509,19 +5202,14 @@ dont-distribute-packages: hsnsq: [ i686-linux, x86_64-linux, x86_64-darwin ] hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoM: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsOpenSSL: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoz: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5529,11 +5217,9 @@ dont-distribute-packages: hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5552,8 +5238,6 @@ dont-distribute-packages: hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5569,7 +5253,6 @@ dont-distribute-packages: hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5591,30 +5274,22 @@ dont-distribute-packages: http-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-client-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-link-header: [ i686-linux ] - http-pony: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] - hub: [ i686-linux, x86_64-linux, x86_64-darwin ] - hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] - huff: [ i686-linux, x86_64-linux, x86_64-darwin ] hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5622,7 +5297,6 @@ dont-distribute-packages: hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - HUnit-Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5635,32 +5309,20 @@ dont-distribute-packages: huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxt-expat: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5684,12 +5346,9 @@ dont-distribute-packages: hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyper-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5701,14 +5360,12 @@ dont-distribute-packages: ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] - identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] iException: [ i686-linux, x86_64-linux, x86_64-darwin ] ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] - iff: [ i686-linux, x86_64-linux, x86_64-darwin ] IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] ig: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5746,15 +5403,12 @@ dont-distribute-packages: implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] - imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] - indentation: [ i686-linux, x86_64-linux, x86_64-darwin ] - indentation-trifecta: [ i686-linux, x86_64-linux, x86_64-darwin ] indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5766,11 +5420,8 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] - influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5779,26 +5430,19 @@ dont-distribute-packages: instant-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - int-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] - integer-logarithms: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - interlude-l: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - intro: [ i686-linux, x86_64-linux, x86_64-darwin ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] ion: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5815,9 +5459,6 @@ dont-distribute-packages: iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5826,14 +5467,11 @@ dont-distribute-packages: ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - is: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] - isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] - itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5845,14 +5483,8 @@ dont-distribute-packages: ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] ixmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5870,7 +5502,6 @@ dont-distribute-packages: jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5879,30 +5510,21 @@ dont-distribute-packages: jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] - jenga: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] - jni: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] - jose-jwt: [ i686-linux ] - jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] json2: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] json-autotype: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5911,6 +5533,7 @@ dont-distribute-packages: JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5919,27 +5542,19 @@ dont-distribute-packages: json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonschema-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] - juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5960,7 +5575,6 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - katip: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5987,7 +5601,6 @@ dont-distribute-packages: keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6003,7 +5616,6 @@ dont-distribute-packages: knots: [ i686-linux, x86_64-linux, x86_64-darwin ] koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] - kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6023,9 +5635,7 @@ dont-distribute-packages: lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6044,10 +5654,7 @@ dont-distribute-packages: Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdatex: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6072,16 +5679,12 @@ dont-distribute-packages: language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] - large-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6113,19 +5716,14 @@ dont-distribute-packages: legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lentil: [ i686-linux, x86_64-linux, x86_64-darwin ] - lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6145,7 +5743,6 @@ dont-distribute-packages: libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] libgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] - libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6155,20 +5752,14 @@ dont-distribute-packages: libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] librandomorg: [ i686-linux, x86_64-linux, x86_64-darwin ] - librato: [ i686-linux, x86_64-linux, x86_64-darwin ] - libroman: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - libvorbis: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6179,25 +5770,19 @@ dont-distribute-packages: Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] limp: [ i686-linux, x86_64-linux, x86_64-darwin ] - lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linden: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] - linebreak: [ i686-linux, x86_64-linux, x86_64-darwin ] - LinguisticsTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] - linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6210,20 +5795,17 @@ dont-distribute-packages: lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-libcurl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] - live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] llsd: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6233,11 +5815,9 @@ dont-distribute-packages: llvm-data-interop: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general-darwin: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6245,16 +5825,12 @@ dont-distribute-packages: lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] - lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6264,17 +5840,19 @@ dont-distribute-packages: Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - logsink: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] lojysamban: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-apps: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-benches: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-cpp: [ i686-linux, x86_64-linux, x86_64-darwin ] lol: [ i686-linux, x86_64-linux, x86_64-darwin ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6287,15 +5865,12 @@ dont-distribute-packages: lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] loup: [ i686-linux, x86_64-linux, x86_64-darwin ] lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltext: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltiv1p1: [ i686-linux, x86_64-linux, x86_64-darwin ] ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6313,21 +5888,16 @@ dont-distribute-packages: lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - lzma-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] - lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] - madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] - MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] magma: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6341,9 +5911,7 @@ dont-distribute-packages: makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-all: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6354,7 +5922,6 @@ dont-distribute-packages: manatee-mplayer: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-pdfviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-processmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-template: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6363,19 +5930,13 @@ dont-distribute-packages: manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] - map-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] - marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] - marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6395,7 +5956,6 @@ dont-distribute-packages: MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] mcl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6416,12 +5976,9 @@ dont-distribute-packages: mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediabus: [ i686-linux ] - mediabus-rtp: [ i686-linux ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6443,28 +6000,23 @@ dont-distribute-packages: metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] - microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - microlens-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - milena: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] minecraft-data: [ i686-linux, x86_64-linux, x86_64-darwin ] minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6482,7 +6034,6 @@ dont-distribute-packages: mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] - mix-arrows: [ i686-linux, x86_64-linux, x86_64-darwin ] mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6490,11 +6041,8 @@ dont-distribute-packages: mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] - modbus-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - modify-fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6503,7 +6051,6 @@ dont-distribute-packages: modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] - moesocks: [ i686-linux, x86_64-linux, x86_64-darwin ] mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] mole: [ i686-linux, x86_64-linux, x86_64-darwin ] mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6514,8 +6061,7 @@ dont-distribute-packages: MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6534,8 +6080,6 @@ dont-distribute-packages: monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6543,7 +6087,6 @@ dont-distribute-packages: monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-st: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-task: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6556,7 +6099,6 @@ dont-distribute-packages: mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] money: [ i686-linux, x86_64-linux, x86_64-darwin ] - mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6582,8 +6124,6 @@ dont-distribute-packages: mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6608,8 +6148,8 @@ dont-distribute-packages: mud: [ i686-linux, x86_64-linux, x86_64-darwin ] mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6637,7 +6177,6 @@ dont-distribute-packages: musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6652,15 +6191,11 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] - mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6681,7 +6216,6 @@ dont-distribute-packages: native: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - NaturalLanguageAlphabets: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6709,9 +6243,6 @@ dont-distribute-packages: nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6720,15 +6251,12 @@ dont-distribute-packages: network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dbus: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] - networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] network-protocol-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6739,6 +6267,7 @@ dont-distribute-packages: network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-zeromq: [ i686-linux, x86_64-linux, x86_64-darwin ] network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6749,7 +6278,6 @@ dont-distribute-packages: newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] newt: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-deriving: [ i686-linux, x86_64-linux, x86_64-darwin ] - newtype-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] nfc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6762,39 +6290,31 @@ dont-distribute-packages: nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nlopt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] - n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] noether: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] - nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] + nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] + nonlinear-optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] - normalization-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6806,28 +6326,24 @@ dont-distribute-packages: NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ode: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] + obdd: [ i686-linux, x86_64-linux, x86_64-darwin ] obd: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] Object: [ i686-linux, x86_64-linux, x86_64-darwin ] objectid: [ i686-linux, x86_64-linux, x86_64-darwin ] ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] obj: [ i686-linux, x86_64-linux, x86_64-darwin ] - octane: [ i686-linux ] octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6848,15 +6364,13 @@ dont-distribute-packages: omnifmt: [ i686-linux, x86_64-linux, x86_64-darwin ] on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] onama: [ i686-linux, x86_64-linux, x86_64-darwin ] - one-liner: [ i686-linux, x86_64-linux, x86_64-darwin ] oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] online: [ i686-linux, x86_64-linux, x86_64-darwin ] OnRmt: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6869,24 +6383,17 @@ dont-distribute-packages: opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLRaw21: [ i686-linux, x86_64-linux, x86_64-darwin ] open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - openid: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-Crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] opensoundcontrol-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - openssl-createkey: [ i686-linux, x86_64-linux, x86_64-darwin ] - openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] - operational-alacarte: [ i686-linux, x86_64-linux, x86_64-darwin ] opn: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6903,23 +6410,24 @@ dont-distribute-packages: ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] - orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] orgstat: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] + orizentic: [ i686-linux, x86_64-linux, x86_64-darwin ] OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ] osc: [ i686-linux, x86_64-linux, x86_64-darwin ] + oscpacking: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] + otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] pack: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] - packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6928,22 +6436,17 @@ dont-distribute-packages: panda: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude-semigroupoids: [ i686-linux, x86_64-linux, x86_64-darwin ] - papillon: [ i686-linux, x86_64-linux, x86_64-darwin ] pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] + paprika: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6954,7 +6457,6 @@ dont-distribute-packages: parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6965,9 +6467,7 @@ dont-distribute-packages: parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] partage: [ i686-linux, x86_64-linux, x86_64-darwin ] partial: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-isomorphisms: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6991,12 +6491,9 @@ dont-distribute-packages: PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pdfname: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-slave-template: [ i686-linux, x86_64-linux, x86_64-darwin ] pdfsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] - peano: [ i686-linux, x86_64-linux, x86_64-darwin ] PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7013,23 +6510,18 @@ dont-distribute-packages: perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] perf: [ i686-linux, x86_64-linux, x86_64-darwin ] - period: [ i686-linux, x86_64-linux, x86_64-darwin ] periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] perm: [ i686-linux, x86_64-linux, x86_64-darwin ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] persona: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7037,7 +6529,6 @@ dont-distribute-packages: peyotls-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] peyotls: [ i686-linux, x86_64-linux, x86_64-darwin ] pez: [ i686-linux, x86_64-linux, x86_64-darwin ] - pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7062,11 +6553,9 @@ dont-distribute-packages: pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7076,7 +6565,6 @@ dont-distribute-packages: pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7088,10 +6576,8 @@ dont-distribute-packages: pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] - Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7102,18 +6588,14 @@ dont-distribute-packages: plat: [ i686-linux, x86_64-linux, x86_64-darwin ] platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] - playlists: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] - ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7123,26 +6605,22 @@ dont-distribute-packages: pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - poker-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] pokitdok: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-shader: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] polimorf: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ i686-linux, x86_64-linux, x86_64-darwin ] - poly-arity: [ i686-linux, x86_64-linux, x86_64-darwin ] poly-control: [ i686-linux, x86_64-linux, x86_64-darwin ] polynom: [ i686-linux, x86_64-linux, x86_64-darwin ] polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] - pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-xpmn: [ i686-linux, x86_64-linux, x86_64-darwin ] pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pool: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7153,7 +6631,6 @@ dont-distribute-packages: porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7161,9 +6638,6 @@ dont-distribute-packages: postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7172,13 +6646,9 @@ dont-distribute-packages: postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - powermate: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] - pptable: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7188,24 +6658,18 @@ dont-distribute-packages: prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] - pregame: [ i686-linux, x86_64-linux, x86_64-darwin ] - preliminaries: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-generalize: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] - present: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] + prettyprinter-convert-ansi-wl-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] print-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7240,27 +6704,20 @@ dont-distribute-packages: property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] - proteaaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-protoc: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] - pub: [ i686-linux, x86_64-linux, x86_64-darwin ] publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugixml: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-HsSyck: [ i686-linux, x86_64-linux, x86_64-darwin ] Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7268,14 +6725,13 @@ dont-distribute-packages: punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] - pure-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + pursuit-client: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pusher-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7293,8 +6749,8 @@ dont-distribute-packages: qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] qif: [ i686-linux, x86_64-linux, x86_64-darwin ] - QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] + qm-interpolated-string: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7315,8 +6771,6 @@ dont-distribute-packages: queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7324,16 +6778,13 @@ dont-distribute-packages: quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-special: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickterm: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7341,21 +6792,19 @@ dont-distribute-packages: quiver-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-groups: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] qux: [ i686-linux, x86_64-linux, x86_64-darwin ] - rabocsv2qif: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - radium: [ i686-linux, x86_64-linux, x86_64-darwin ] radix: [ i686-linux, x86_64-linux, x86_64-darwin ] rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raft: [ i686-linux, x86_64-linux, x86_64-darwin ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7368,7 +6817,6 @@ dont-distribute-packages: random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-variates: [ i686-linux, x86_64-linux, x86_64-darwin ] rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7389,13 +6837,11 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] - rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] raz: [ i686-linux, x86_64-linux, x86_64-darwin ] razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - rbpcp-api: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7403,21 +6849,15 @@ dont-distribute-packages: react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ReadArgs: [ i686-linux, x86_64-linux, x86_64-darwin ] - read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] read-io: [ i686-linux, x86_64-linux, x86_64-darwin ] readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7430,45 +6870,30 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] - records-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] - Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] - references: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] - refty: [ i686-linux, x86_64-linux, x86_64-darwin ] - refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7479,7 +6904,6 @@ dont-distribute-packages: regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-with-pcre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] regions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7495,10 +6919,7 @@ dont-distribute-packages: reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] - rei: [ i686-linux, x86_64-linux, x86_64-darwin ] - reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] - relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7512,18 +6933,18 @@ dont-distribute-packages: remote-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-io: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-linear-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-scalar: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7536,7 +6957,6 @@ dont-distribute-packages: req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] req: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] resin: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7566,6 +6986,7 @@ dont-distribute-packages: ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] riff: [ i686-linux, x86_64-linux, x86_64-darwin ] + ring-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7577,7 +6998,6 @@ dont-distribute-packages: RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] - rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7585,16 +7005,15 @@ dont-distribute-packages: RNAdraw: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFold: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] - RNAlien: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - rocksdb-haskell: [ i686-linux ] + roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7605,8 +7024,6 @@ dont-distribute-packages: rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] route-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7620,15 +7037,11 @@ dont-distribute-packages: rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] + rubberband: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] ruin: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7637,14 +7050,12 @@ dont-distribute-packages: rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] SableCC2Hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-access: [ i686-linux, x86_64-linux, x86_64-darwin ] safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7675,15 +7086,13 @@ dont-distribute-packages: sat: [ i686-linux, x86_64-linux, x86_64-darwin ] sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbp2udp: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] + scat: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7714,11 +7123,9 @@ dont-distribute-packages: scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7726,11 +7133,9 @@ dont-distribute-packages: sec: [ i686-linux, x86_64-linux, x86_64-darwin ] seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] - secure-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7748,52 +7153,43 @@ dont-distribute-packages: sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] - separated: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] - seqalign: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqid-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] - serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-docs: [ i686-linux ] + servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-zeppelin-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] services: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7802,16 +7198,12 @@ dont-distribute-packages: ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] - setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] - sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sext: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7829,7 +7221,6 @@ dont-distribute-packages: shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] shakers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7842,9 +7233,8 @@ dont-distribute-packages: she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] + shell-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] - shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - shellmate: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7854,21 +7244,17 @@ dont-distribute-packages: showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] - sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - sigma-ij: [ i686-linux ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] simd: [ i686-linux, x86_64-linux, x86_64-darwin ] simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7878,7 +7264,6 @@ dont-distribute-packages: simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7889,18 +7274,15 @@ dont-distribute-packages: simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleTableGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] - sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + sitemap: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7909,14 +7291,11 @@ dont-distribute-packages: skell: [ i686-linux, x86_64-linux, x86_64-darwin ] skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - slack-api: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] slack-web: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] - sloane: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7931,7 +7310,6 @@ dont-distribute-packages: sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7941,7 +7319,6 @@ dont-distribute-packages: smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snake: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7994,8 +7371,6 @@ dont-distribute-packages: snappy-framing: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8010,19 +7385,15 @@ dont-distribute-packages: snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] - soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] solr: [ i686-linux, x86_64-linux, x86_64-darwin ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] Sonnex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8031,12 +7402,10 @@ dont-distribute-packages: sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] sorting: [ i686-linux, x86_64-linux, x86_64-darwin ] sorty: [ i686-linux, x86_64-linux, x86_64-darwin ] - sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] soyuz: [ i686-linux, x86_64-linux, x86_64-darwin ] - SpaceInvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ] spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8052,23 +7421,18 @@ dont-distribute-packages: sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] - spike: [ i686-linux, x86_64-linux, x86_64-darwin ] SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] spir-v: [ i686-linux, x86_64-linux, x86_64-darwin ] splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] spline3: [ i686-linux, x86_64-linux, x86_64-darwin ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] - split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlcipher: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8079,27 +7443,23 @@ dont-distribute-packages: sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] - squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] + sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] - SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8109,7 +7469,6 @@ dont-distribute-packages: state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] state: [ i686-linux, x86_64-linux, x86_64-darwin ] - state-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8117,25 +7476,21 @@ dont-distribute-packages: statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - staversion: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] - steeloverseer: [ i686-linux, x86_64-linux, x86_64-darwin ] + stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] - StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - store: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8148,18 +7503,14 @@ dont-distribute-packages: stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] str: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-identity: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-io: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] - StringUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8171,7 +7522,6 @@ dont-distribute-packages: stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] - styx: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8185,8 +7535,8 @@ dont-distribute-packages: sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8196,48 +7546,40 @@ dont-distribute-packages: svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger2: [ i686-linux ] - swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] swift-lda: [ i686-linux, x86_64-linux, x86_64-darwin ] - swish: [ i686-linux, x86_64-linux, x86_64-darwin ] SWMMoutGetMB: [ i686-linux, x86_64-linux, x86_64-darwin ] sws: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + symantic-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + symengine: [ i686-linux, x86_64-linux, x86_64-darwin ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntaxnet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] - sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-info: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-linux-proc: [ i686-linux, x86_64-linux, x86_64-darwin ] system-locale: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8255,6 +7597,8 @@ dont-distribute-packages: tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] + taggy: [ i686-linux, x86_64-linux, x86_64-darwin ] + taggy-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] taglib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] tagset-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8262,7 +7606,6 @@ dont-distribute-packages: tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] Tahin: [ i686-linux, x86_64-linux, x86_64-darwin ] ta: [ i686-linux, x86_64-linux, x86_64-darwin ] - tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8274,27 +7617,20 @@ dont-distribute-packages: task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] - TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - tdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] teams: [ i686-linux, x86_64-linux, x86_64-darwin ] - teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8321,7 +7657,6 @@ dont-distribute-packages: tensorflow-records: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8329,7 +7664,6 @@ dont-distribute-packages: terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] - TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8343,22 +7677,15 @@ dont-distribute-packages: testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ] - texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-lips: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8367,8 +7694,6 @@ dont-distribute-packages: text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-render: [ i686-linux, x86_64-linux, x86_64-darwin ] text-short: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] textual: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8378,8 +7703,6 @@ dont-distribute-packages: tga: [ i686-linux, x86_64-linux, x86_64-darwin ] th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] - THEff: [ i686-linux, x86_64-linux, x86_64-darwin ] - themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8391,52 +7714,38 @@ dont-distribute-packages: th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] - tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] - TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] tightrope: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] - timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8449,7 +7758,6 @@ dont-distribute-packages: Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] - tld: [ i686-linux, x86_64-linux, x86_64-darwin ] tldr: [ i686-linux, x86_64-linux, x86_64-darwin ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] tmp-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8462,29 +7770,23 @@ dont-distribute-packages: tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] - toolshed: [ i686-linux, x86_64-linux, x86_64-darwin ] - top: [ i686-linux, x86_64-linux, x86_64-darwin ] Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] torch: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - total: [ i686-linux, x86_64-linux, x86_64-darwin ] touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] - tower: [ i686-linux ] toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] - tpb: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] - tracetree: [ i686-linux, x86_64-linux, x86_64-darwin ] tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] - tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8493,22 +7795,18 @@ dont-distribute-packages: TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - transformers-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - treemap: [ i686-linux, x86_64-linux, x86_64-darwin ] treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8527,7 +7825,6 @@ dont-distribute-packages: tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] - tslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8541,7 +7838,6 @@ dont-distribute-packages: turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] - twee: [ i686-linux, x86_64-linux, x86_64-darwin ] tweet-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8550,32 +7846,25 @@ dont-distribute-packages: twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] twentyseven: [ i686-linux, x86_64-linux, x86_64-darwin ] - twfy-api-client: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8590,7 +7879,7 @@ dont-distribute-packages: type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-of-html: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8612,16 +7901,14 @@ dont-distribute-packages: udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] - uhttpc: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] - uid: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + unagi-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-show: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8634,15 +7921,12 @@ dont-distribute-packages: universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - unjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] - unused: [ i686-linux, x86_64-linux, x86_64-darwin ] update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8652,9 +7936,9 @@ dont-distribute-packages: uri-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] + url-decoders: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8672,6 +7956,7 @@ dont-distribute-packages: utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8693,12 +7978,12 @@ dont-distribute-packages: vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-bytes-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8716,10 +8001,8 @@ dont-distribute-packages: verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - ViennaRNA-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8732,7 +8015,6 @@ dont-distribute-packages: visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8746,10 +8028,7 @@ dont-distribute-packages: wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-app-file-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8762,7 +8041,6 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-auth: [ i686-linux ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8771,14 +8049,13 @@ dont-distribute-packages: wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-json-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-static: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8791,42 +8068,31 @@ dont-distribute-packages: warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] - watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] - wave: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + web3: [ i686-linux, x86_64-linux, x86_64-darwin ] webapi: [ i686-linux, x86_64-linux, x86_64-darwin ] webapp: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] webcloud: [ i686-linux, x86_64-linux, x86_64-darwin ] WebCont: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] - webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8834,9 +8100,6 @@ dont-distribute-packages: web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] - websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] wedged: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8859,9 +8122,7 @@ dont-distribute-packages: windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] - wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] - wiringPi: [ i686-linux, x86_64-linux, x86_64-darwin ] + wires: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8871,13 +8132,12 @@ dont-distribute-packages: wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] - word24: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordpass: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - word-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8886,8 +8146,9 @@ dont-distribute-packages: wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] + wreq-stringless: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] - writer-cps-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8897,15 +8158,10 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxc: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] - wx: [ i686-linux, x86_64-linux, x86_64-darwin ] wxSimpleCanvas: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8913,13 +8169,10 @@ dont-distribute-packages: X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] - x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] - xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8929,7 +8182,6 @@ dont-distribute-packages: xhb: [ i686-linux, x86_64-linux, x86_64-darwin ] xine: [ i686-linux, x86_64-linux, x86_64-darwin ] xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8940,17 +8192,16 @@ dont-distribute-packages: xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8973,9 +8224,6 @@ dont-distribute-packages: xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - xtc: [ i686-linux, x86_64-linux, x86_64-darwin ] - xturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] - xxhash: [ i686-linux, x86_64-linux, x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8990,13 +8238,10 @@ dont-distribute-packages: yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-union: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] - YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] yap: [ i686-linux, x86_64-linux, x86_64-darwin ] yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9012,8 +8257,6 @@ dont-distribute-packages: yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9030,19 +8273,16 @@ dont-distribute-packages: yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-csp: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paypal-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9051,7 +8291,6 @@ dont-distribute-packages: yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9064,26 +8303,17 @@ dont-distribute-packages: yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] - yet-another-logger: [ i686-linux ] YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] yi: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ] - yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9092,7 +8322,6 @@ dont-distribute-packages: yst: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] - yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9115,14 +8344,12 @@ dont-distribute-packages: zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zip: [ i686-linux ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] - zm: [ i686-linux, x86_64-linux, x86_64-darwin ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix index cd7857e23de9..be90794f58d9 100644 --- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix +++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix @@ -1,6 +1,6 @@ -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7b9dbcdaa792..77e57ed7324b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -25,9 +25,9 @@ # * enabling/disabling certain features in packages # # If you have an override of this kind, see configuration-common.nix instead. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; # All of the overrides in this set should look like: # @@ -64,8 +64,19 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' - unset CC # unconfuse the haskell-cuda configure script - sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + nvvm = overrideCabal super.nvvm (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + cufft = overrideCabal super.cufft (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} ''; }); @@ -408,6 +419,17 @@ self: super: builtins.intersectAttrs super { testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; }); + # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required + # on darwin: https://github.com/NixOS/cabal2nix/issues/146. + hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; + + # FSEvents API is very buggy and tests are unreliable. See + # http://openradar.appspot.com/10207999 and similar issues. + # https://github.com/haskell-fswatch/hfsnotify/issues/62 + fsnotify = if pkgs.stdenv.isDarwin + then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa + else dontCheck super.fsnotify; + hidapi = addExtraLibrary super.hidapi pkgs.libudev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 32fa46f111dd..1658ce793936 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc, all-cabal-hashes +{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -9,16 +9,16 @@ let - inherit (stdenv.lib) extends makeExtensible; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet; + inherit (lib) extends makeExtensible; + inherit (haskellLib) overrideCabal makePackageSet; - haskellPackages = makePackageSet { + haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit ghc extensible-self; + inherit stdenv haskellLib ghc extensible-self; }; - commonConfiguration = configurationCommon { inherit pkgs; }; - nixConfiguration = configurationNix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; + nixConfiguration = configurationNix { inherit pkgs haskellLib; }; extensible-self = makeExtensible (extends overrides diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7e99300a41e1..9c1e75232d7d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -231,10 +231,10 @@ stdenv.mkDerivation ({ fi done '' + (optionalString stdenv.isDarwin '' - # Work around a limit in the Mac OS X Sierra linker on the number of paths + # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # - # Create a local directory with symlinks of the *.dylib (Mac OS X shared + # Create a local directory with symlinks of the *.dylib (macOS shared # libraries) from all the dependencies. local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1b8b00a10ad8..3590fed19d25 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -269,7 +269,6 @@ self: { homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ADPfusionSet" = callPackage @@ -726,8 +725,8 @@ self: { pname = "Agda"; version = "2.5.2"; sha256 = "0f8ld7sqkfhirhs886kp090iaq70qxsj8ms8farc80vzpz1ww4nq"; - revision = "2"; - editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d"; + revision = "3"; + editedCabalFile = "10j2hf2g9vv2xibywgd8s96x05clfxr4wli00011vkhblr4p9br8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1392,7 +1391,6 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -1440,7 +1438,6 @@ self: { homepage = "https://github.com/choener/BiobaseBlast"; description = "BLAST-related tools"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseDotP" = callPackage @@ -1572,7 +1569,6 @@ self: { homepage = "https://github.com/choener/BiobaseNewick"; description = "Newick file format parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseTrainingData" = callPackage @@ -1638,7 +1634,6 @@ self: { homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1685,7 +1680,6 @@ self: { homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1813,7 +1807,6 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1834,7 +1827,6 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blogdown" = callPackage @@ -2712,7 +2704,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -2929,7 +2920,6 @@ self: { librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; "Combinatorrent" = callPackage @@ -3552,6 +3542,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "DOH" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , filepath, http-client, http-client-tls, http-types + , interpolatedstring-perl6, lens, mtl, QuickCheck + , quickcheck-instances, text, time, unordered-containers, uri + }: + mkDerivation { + pname = "DOH"; + version = "0.1.2.0"; + sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types lens mtl text time unordered-containers + uri + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring containers filepath http-client + http-client-tls http-types interpolatedstring-perl6 lens mtl + QuickCheck quickcheck-instances text time unordered-containers uri + ]; + description = "Complete API bindings for DigitalOcean API V2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DOM" = callPackage ({ mkDerivation, base, mtl, WebBits }: mkDerivation { @@ -3955,16 +3970,18 @@ self: { }) {}; "DeepDarkFantasy" = callPackage - ({ mkDerivation, base, bimap, constraints, containers, mtl, random + ({ mkDerivation, base, bimap, constraints, containers, mtl + , QuickCheck, random, recursion-schemes, template-haskell }: mkDerivation { pname = "DeepDarkFantasy"; - version = "0.2017.4.19"; - sha256 = "19fr67fkn4z47a27nbcqh1a24jh2ir32d6fzvjdmj7d0maman2rz"; + version = "0.2017.8.11"; + sha256 = "14ibpvqy8awv6mcdm7ywybq5pk6wf6hwqq18mq8l116jgi7c9vvr"; libraryHaskellDepends = [ - base bimap constraints containers mtl random + base bimap constraints containers mtl random recursion-schemes + template-haskell ]; - testHaskellDepends = [ base constraints mtl random ]; + testHaskellDepends = [ base constraints mtl QuickCheck random ]; description = "A DSL for creating neural network"; license = stdenv.lib.licenses.asl20; }) {}; @@ -4580,6 +4597,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Earley_0_12_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , unordered-containers + }: + mkDerivation { + pname = "Earley"; + version = "0.12.0.1"; + sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ListLike ]; + executableHaskellDepends = [ base unordered-containers ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -4764,6 +4805,23 @@ self: { homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; + }) {}; + + "EntrezHTTP_1_0_4" = callPackage + ({ mkDerivation, base, biocore, bytestring, conduit, HTTP + , http-conduit, hxt, mtl, network, Taxonomy, text, transformers + }: + mkDerivation { + pname = "EntrezHTTP"; + version = "1.0.4"; + sha256 = "1gp5g3r05rwayk1gdb9dfzjmywwlr5d236dygryzmga9q13gwvxq"; + libraryHaskellDepends = [ + base biocore bytestring conduit HTTP http-conduit hxt mtl network + Taxonomy text transformers + ]; + homepage = "https://github.com/eggzilla/EntrezHTTP"; + description = "Libary to interface with the NCBI Entrez REST service"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -5329,6 +5387,7 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -5563,7 +5622,6 @@ self: { homepage = "https://github.com/choener/ForestStructures"; description = "Tree- and forest structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForkableT" = callPackage @@ -5705,6 +5763,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Frames_0_2_1" = callPackage + ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml + , HUnit, pipes, pretty, primitive, readable, regex-applicative + , template-haskell, temporary, text, transformers + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "Frames"; + version = "0.2.1"; + sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc-prim pipes primitive readable template-haskell text + transformers vector vinyl + ]; + testHaskellDepends = [ + base directory hspec htoml HUnit pipes pretty regex-applicative + template-haskell temporary text unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion pipes transformers ]; + description = "Data frames For working with tabular data files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -6028,7 +6112,6 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -6074,6 +6157,19 @@ self: { homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; + }) {}; + + "GPipe-GLFW_1_4_1_1" = callPackage + ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: + mkDerivation { + pname = "GPipe-GLFW"; + version = "1.4.1.1"; + sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; + homepage = "https://github.com/plredmond/GPipe-GLFW"; + description = "GLFW OpenGL context creation for GPipe"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -6118,8 +6214,8 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.1"; - sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd"; + version = "0.5.2"; + sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory @@ -6176,7 +6272,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6578,7 +6673,6 @@ self: { ]; description = "Interface to Google Suggest API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleTranslate" = callPackage @@ -6720,7 +6814,6 @@ self: { ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Grempa" = callPackage @@ -6898,7 +6991,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HARM" = callPackage @@ -8300,7 +8392,6 @@ self: { homepage = "http://software.complete.org/hsh"; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSHHelpers" = callPackage @@ -8483,6 +8574,40 @@ self: { license = "LGPL"; }) {}; + "HTF_0_13_2_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, containers, cpphs, Diff, directory + , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl + , old-time, pretty, process, QuickCheck, random, regex-compat + , template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.13.2.2"; + sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + homepage = "https://github.com/skogsbaer/HTF/"; + description = "The Haskell Test Framework"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl @@ -8618,7 +8743,6 @@ self: { homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-approx" = callPackage @@ -8966,28 +9090,24 @@ self: { "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff - , directory, filepath, ghc-prim, HarmTrace-Base, HCodecs, hmatrix - , hmatrix-gsl-stats, instant-generics, ListLike, mtl, parallel - , parseargs, process, sox, template-haskell, uu-parsinglib, vector + , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics + , ListLike, matrix, mtl, parallel, process, sox, template-haskell + , uu-parsinglib, vector }: mkDerivation { pname = "HarmTrace"; - version = "2.2.0"; - sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v"; - isLibrary = true; + version = "2.2.1"; + sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj"; + revision = "1"; + editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - array base binary deepseq Diff directory filepath ghc-prim - HarmTrace-Base HCodecs hmatrix hmatrix-gsl-stats instant-generics - ListLike mtl parallel parseargs process template-haskell - uu-parsinglib vector - ]; executableHaskellDepends = [ array base binary cmdargs deepseq Diff directory filepath ghc-prim - HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike - mtl parallel process sox template-haskell uu-parsinglib vector + HarmTrace-Base instant-generics ListLike matrix mtl parallel + process sox template-haskell uu-parsinglib vector ]; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace"; + homepage = "https://github.com/haas/harmtrace"; description = "Harmony Analysis and Retrieval of Music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9176,6 +9296,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HaskellNet-SSL_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, connection, data-default + , HaskellNet, network, tls + }: + mkDerivation { + pname = "HaskellNet-SSL"; + version = "0.3.4.0"; + sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring connection data-default HaskellNet network tls + ]; + homepage = "https://github.com/dpwright/HaskellNet-SSL"; + description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaskellTorrent" = callPackage ({ mkDerivation, base, bytestring, cereal, cml, containers , directory, hopenssl, hslogger, HTTP, HUnit, mtl, network, parsec @@ -9760,14 +9898,15 @@ self: { }: mkDerivation { pname = "HsHTSLib"; - version = "1.3.2.0"; - sha256 = "0mambd3iimll6v2wv616qdai31r4kcj12401afq148h47fq2qk6m"; + version = "1.3.2.1"; + sha256 = "03qxsld5rw3j5wqm9zqfb51msyw22976ga0zibmaxc9slm684lyk"; libraryHaskellDepends = [ base bytestring bytestring-lexing conduit-combinators containers inline-c mtl template-haskell ]; description = "High level bindings to htslib"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsHaruPDF" = callPackage @@ -9834,7 +9973,6 @@ self: { homepage = "https://github.com/vshabanov/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL_0_11_4_10" = callPackage @@ -9867,7 +10005,6 @@ self: { homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsParrot" = callPackage @@ -10611,7 +10748,6 @@ self: { homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -10625,7 +10761,6 @@ self: { ]; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-scale-dct" = callPackage @@ -10635,6 +10770,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; + revision = "1"; + editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -11220,17 +11357,20 @@ self: { }) {}; "Lazy-Pbkdf2" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , cryptonite, memory + ({ mkDerivation, base, base16-bytestring, binary, byteable + , bytestring, criterion, cryptonite, memory }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "2.1.2"; - sha256 = "18x1md6ljxksqfp2336bk8l7fhw2rgafa0kqg8x1lskml9xkjfca"; + version = "3.0.0"; + sha256 = "0rcbsjypr4k5s8jsw1wchl9y3v7b9nvy92046hvzah69rd2hcqj1"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory ]; + benchmarkHaskellDepends = [ + base binary byteable bytestring criterion cryptonite memory + ]; description = "Lazy PBKDF2 generator"; license = stdenv.lib.licenses.mit; }) {}; @@ -11362,7 +11502,6 @@ self: { homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LinkChecker" = callPackage @@ -11430,7 +11569,6 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListWriter" = callPackage @@ -11691,7 +11829,6 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -11788,8 +11925,8 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.6.1"; - sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz"; + version = "0.9.6.7"; + sha256 = "0cl0lq45x8pxsbdiqg9sx39jvs8h2h32mni5zq2jb61ac7wim9g1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11807,7 +11944,6 @@ self: { homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html"; description = "Automatic inductive functional programmer by systematic search"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MailchimpSimple" = callPackage @@ -12308,7 +12444,6 @@ self: { libraryHaskellDepends = [ base MonadRandom mtl random ]; description = "Lazy monad for psuedo random-number generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadStack" = callPackage @@ -12745,7 +12880,6 @@ self: { homepage = "https://github.com/choener/NaturalLanguageAlphabets"; description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NaturalSort" = callPackage @@ -13411,7 +13545,6 @@ self: { homepage = "https://github.com/audreyt/openafp/"; description = "IBM AFP document format parser and generator"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAFP-Utils" = callPackage @@ -13432,7 +13565,6 @@ self: { ]; description = "Assorted utilities to work with AFP data streams"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenAL" = callPackage @@ -14139,7 +14271,6 @@ self: { homepage = "https://github.com/MedeaMelana/Piso"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlayHangmanGame" = callPackage @@ -14308,7 +14439,6 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PrimitiveArray-Pretty" = callPackage @@ -14528,7 +14658,6 @@ self: { homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QLearn" = callPackage @@ -14686,7 +14815,6 @@ self: { homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-safe" = callPackage @@ -14992,7 +15120,6 @@ self: { ]; description = "Unsupervized construction of RNA family models"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RNAwolf" = callPackage @@ -15199,7 +15326,6 @@ self: { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Redmine" = callPackage @@ -15224,7 +15350,6 @@ self: { homepage = "https://github.com/lookunder/RedmineHs"; description = "Library to access Redmine's REST services"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ref" = callPackage @@ -15726,8 +15851,8 @@ self: { ({ mkDerivation, base, containers, ghc, ghc-paths }: mkDerivation { pname = "SSTG"; - version = "0.1.0.8"; - sha256 = "1qnjskpwf4zxzcf443qq31zm7rc6p4ch46p1mh19vm4hq2bnkcfl"; + version = "0.1.1.5"; + sha256 = "06rc050abq6vfgn0ylfrycp6m3631ji0mq9jwz5cnlhnrhpzfn5j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ghc ghc-paths ]; @@ -15736,7 +15861,6 @@ self: { homepage = "https://github.com/AntonXue/SSTG#readme"; description = "STG Symbolic Execution"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STL" = callPackage @@ -16559,7 +16683,6 @@ self: { homepage = "http://www.haskell.org/yampa/"; description = "Video game"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SpacePrivateers" = callPackage @@ -16739,7 +16862,6 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-lucid" = callPackage @@ -16754,6 +16876,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spock-lucid_0_4_0_1" = callPackage + ({ mkDerivation, base, lucid, Spock, transformers }: + mkDerivation { + pname = "Spock-lucid"; + version = "0.4.0.1"; + sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii"; + libraryHaskellDepends = [ base lucid Spock transformers ]; + homepage = "http://github.com/aelve/Spock-lucid"; + description = "Lucid support for Spock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-worker" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector @@ -16875,7 +17010,6 @@ self: { ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -17004,7 +17138,6 @@ self: { libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SuffixStructures" = callPackage @@ -17152,7 +17285,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TTTAS" = callPackage @@ -17314,6 +17446,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "Taxonomy_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl + , graphviz, parsec, text, vector + }: + mkDerivation { + pname = "Taxonomy"; + version = "1.0.3"; + sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; + libraryHaskellDepends = [ + aeson base bytestring either-unwrap fgl graphviz parsec text vector + ]; + description = "Libary for parsing, processing and vizualization of taxonomy data"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "TaxonomyTools" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs , directory, either-unwrap, EntrezHTTP, fgl, hxt, parsec, process @@ -17331,7 +17479,6 @@ self: { ]; description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TeX-my-math" = callPackage @@ -17417,7 +17564,6 @@ self: { homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Theora" = callPackage @@ -17513,7 +17659,6 @@ self: { libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TimePiece" = callPackage @@ -18059,7 +18204,6 @@ self: { homepage = "http://github.com/grwlf/vkhs"; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Validation" = callPackage @@ -18170,7 +18314,6 @@ self: { homepage = "https://github.com/choener/ViennaRNA-bindings"; description = "ViennaRNA v2 bindings"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ViennaRNAParser" = callPackage @@ -18190,23 +18333,25 @@ self: { }) {}; "Villefort" = callPackage - ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random - , scotty, split, text, time + ({ mkDerivation, base, directory, filepath, FindBin, HDBC + , HDBC-sqlite3, mtl, process, QuickCheck, random, scotty, split + , strict, text, time, transformers, unix }: mkDerivation { pname = "Villefort"; - version = "0.1.0.8"; - sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35"; + version = "0.1.1.1"; + sha256 = "0zba13j6va4bnyxgkp7yq5y7mvyw94x0932kf75b33bw3pan04hz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base FindBin HDBC HDBC-sqlite3 mtl random split time + base directory filepath FindBin HDBC HDBC-sqlite3 mtl process + random scotty split strict text time transformers unix ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 scotty split text time + base HDBC HDBC-sqlite3 random scotty split text time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base HDBC HDBC-sqlite3 QuickCheck ]; homepage = "https://github.com/Chrisr850/Villefort#readme"; description = "Villefort is a task manager and time tracker written in haskell"; license = stdenv.lib.licenses.bsd3; @@ -18601,6 +18746,8 @@ self: { pname = "Win32-extras"; version = "0.2.0.1"; sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h"; + revision = "1"; + editedCabalFile = "0gxp1a5sk9jb7x1mvz5jk68n8npvh8b9nlqcw9s2dn4wlyicm4mp"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ imm32 msimg32 ]; homepage = "http://hub.darcs.net/shelarcy/Win32-extras/"; @@ -18964,7 +19111,6 @@ self: { homepage = "xy30.com"; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "XMMS" = callPackage @@ -19188,7 +19334,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yampa-core" = callPackage @@ -19224,7 +19369,6 @@ self: { homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze"; description = "Software synthesizer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yocto" = callPackage @@ -19452,7 +19596,6 @@ self: { ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {abc = null;}; "abcnotation" = callPackage @@ -19900,7 +20043,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm" = callPackage @@ -20706,26 +20848,28 @@ self: { }) {}; "activehs" = callPackage - ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring - , cmdargs, containers, data-pprint, deepseq, dia-base - , dia-functions, directory, filepath, haskell-src-exts - , highlighting-kate, hint, hoogle, mtl, old-locale, old-time - , pandoc, process, pureMD5, QuickCheck, simple-reflect, snap-core - , snap-server, split, syb, text, time, utf8-string, xhtml + ({ mkDerivation, activehs-base, array, base, blaze-html + , blaze-markup, bytestring, cmdargs, containers, data-pprint + , deepseq, dia-base, dia-functions, directory, exceptions, filepath + , haskell-src-exts, highlighting-kate, hint, hoogle, mtl + , old-locale, old-time, pandoc, process, pureMD5, QuickCheck + , simple-reflect, snap-core, snap-server, split, syb, text, time + , utf8-string, xhtml }: mkDerivation { pname = "activehs"; - version = "0.3.1"; - sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc"; + version = "0.3.2"; + sha256 = "0n5bb5bdigf3b0016ljv5r3bki3fq6j5dv7csvkdq7pdvghzw3gp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - activehs-base array base blaze-html bytestring cmdargs containers - data-pprint deepseq dia-base dia-functions directory filepath - haskell-src-exts highlighting-kate hint hoogle mtl old-locale - old-time pandoc process pureMD5 QuickCheck simple-reflect snap-core - snap-server split syb text time utf8-string xhtml + activehs-base array base blaze-html blaze-markup bytestring cmdargs + containers data-pprint deepseq dia-base dia-functions directory + exceptions filepath haskell-src-exts highlighting-kate hint hoogle + mtl old-locale old-time pandoc process pureMD5 QuickCheck + simple-reflect snap-core snap-server split syb text time + utf8-string xhtml ]; description = "Haskell code presentation tool"; license = stdenv.lib.licenses.bsd3; @@ -20738,10 +20882,11 @@ self: { pname = "activehs-base"; version = "0.3.0.4"; sha256 = "0gmixyawdl0kk351k8n5g7k3cfxv1qlbish750kv5kip6xc1dmcj"; + revision = "1"; + editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd"; libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "activitystreams-aeson" = callPackage @@ -20794,6 +20939,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_3_4" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.3.4"; + sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz"; + revision = "1"; + editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21297,7 +21466,6 @@ self: { homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-extra" = callPackage @@ -21326,7 +21494,6 @@ self: { homepage = "https://github.com/phadej/aeson-extra#readme"; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-extra_0_4_1_0" = callPackage @@ -21373,7 +21540,6 @@ self: { homepage = "https://github.com/deviant-logic/aeson-filthy"; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flat" = callPackage @@ -21389,7 +21555,6 @@ self: { homepage = "https://github.com/seanhess/aeson-flat#readme"; description = "Tools for creating flat JSON serializations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flatten" = callPackage @@ -21410,23 +21575,24 @@ self: { "aeson-flowtyped" = callPackage ({ mkDerivation, aeson, base, containers, free, recursion-schemes , reflection, scientific, tasty, tasty-hunit, text, time - , unordered-containers, vector, wl-pprint + , transformers, unordered-containers, vector, wl-pprint }: mkDerivation { pname = "aeson-flowtyped"; - version = "0.7.5"; - sha256 = "1hhg3fai44i506d7iphi8xl2lzqr14rbc1f96wc3gayyv96ia8az"; + version = "0.9.1"; + sha256 = "0fp5a4r7nvwqsyq8f17afqpdw59n6sf0wj7z83rhq8n149673rsg"; libraryHaskellDepends = [ aeson base containers free recursion-schemes reflection scientific - text time unordered-containers vector wl-pprint + text time transformers unordered-containers vector wl-pprint ]; testHaskellDepends = [ - aeson base recursion-schemes tasty tasty-hunit text + aeson base containers recursion-schemes tasty tasty-hunit text unordered-containers vector ]; homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme"; description = "Create Flow type definitions from Haskell data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-generic-compat" = callPackage @@ -21460,7 +21626,6 @@ self: { ]; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage @@ -21950,7 +22115,6 @@ self: { homepage = "http://github.com/liamoc/agda-snippets#readme"; description = "Render just the Agda snippets of a literate Agda file to HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-snippets-hakyll" = callPackage @@ -21968,7 +22132,6 @@ self: { homepage = "https://github.com/liamoc/agda-snippets#readme"; description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agentx" = callPackage @@ -22204,6 +22367,7 @@ self: { homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment" = callPackage @@ -22398,12 +22562,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_4_0_3" = callPackage + ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: + mkDerivation { + pname = "alarmclock"; + version = "0.4.0.3"; + sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + homepage = "https://bitbucket.org/davecturner/alarmclock"; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { pname = "alea"; - version = "0.5.2.0"; - sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09"; + version = "0.5.3.0"; + sha256 = "0b8b7ncdn9as8y2m4dk4wwk7gjh79yvr9q3jlw6khdsqh266jq1q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -22431,7 +22610,6 @@ self: { homepage = "https://github.com/mjhopkins/alerta-client"; description = "Bindings to the alerta REST API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex" = callPackage @@ -22471,7 +22649,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-tools" = callPackage @@ -22501,7 +22678,6 @@ self: { ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -22637,6 +22813,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs_0_0_5" = callPackage + ({ mkDerivation, array, base, containers, criterion, extra + , QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.0.5"; + sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx"; + libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers extra QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -23189,7 +23382,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon API Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-application-autoscaling" = callPackage @@ -23226,7 +23418,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon AppStream SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling" = callPackage @@ -23263,7 +23454,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Budgets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-certificatemanager" = callPackage @@ -23462,7 +23652,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeBuild SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage @@ -23781,7 +23970,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-ecr" = callPackage @@ -23944,7 +24132,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -24017,7 +24204,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Health APIs and Notifications SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam" = callPackage @@ -24144,7 +24330,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -24199,7 +24384,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -24218,7 +24402,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lightsail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -24309,7 +24492,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks for Chef Automate SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pinpoint" = callPackage @@ -24328,7 +24510,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Pinpoint SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-polly" = callPackage @@ -24347,7 +24528,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Polly SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -24366,7 +24546,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage @@ -24403,7 +24582,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Rekognition SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -24458,7 +24636,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-s3-streaming" = callPackage @@ -24485,7 +24662,6 @@ self: { homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-sdb" = callPackage @@ -24522,7 +24698,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -24559,7 +24734,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Shield SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sms" = callPackage @@ -24578,7 +24752,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Server Migration Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-snowball" = callPackage @@ -24597,7 +24770,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -24634,7 +24806,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage @@ -24671,7 +24842,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Step Functions SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway" = callPackage @@ -24744,7 +24914,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "amazonka-test" = callPackage @@ -24821,7 +24990,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon X-Ray SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amby" = callPackage @@ -24911,6 +25079,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_16_0" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.16.0"; + sha256 = "100krph1yaazxcs74r6v5785l50886rsbip98w8p4rzqgcya311a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + homepage = "https://github.com/hreinhardt/amqp"; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -25364,6 +25561,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-wl-pprint_0_6_8_1" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.8.1"; + sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + executableHaskellDepends = [ ansi-terminal base ]; + homepage = "http://github.com/ekmett/ansi-wl-pprint"; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { @@ -25480,7 +25693,6 @@ self: { homepage = "https://github.com/exbb2/antigate"; description = "Interface for antigate.com captcha recognition API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antimirov" = callPackage @@ -26261,7 +26473,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "applicative-splice" = callPackage @@ -26409,6 +26620,29 @@ self: { homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "approximate_0_3_1" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, directory, doctest, filepath, ghc-prim + , hashable, lens, log-domain, pointed, safecopy, semigroupoids + , semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "approximate"; + version = "0.3.1"; + sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base directory doctest filepath semigroups simple-reflect + ]; + homepage = "http://github.com/analytics/approximate/"; + description = "Approximate discrete values and numbers"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -26509,7 +26743,6 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -26611,7 +26844,6 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arena" = callPackage @@ -26861,7 +27093,6 @@ self: { ]; description = "Natural number arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arithmoi" = callPackage @@ -26889,7 +27120,6 @@ self: { homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arithmoi_0_5_0_1" = callPackage @@ -27029,8 +27259,8 @@ self: { }: mkDerivation { pname = "array-primops"; - version = "0.2.0.0"; - sha256 = "02ln59zhkgi1l1zbci2zxyyidhlxmz22csky1y0zdx119nsnhsza"; + version = "0.2.0.1"; + sha256 = "0kdf88xs6aplxah90pl2r94fgfl58a4fmpxjcbvb9996823q54qg"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck @@ -27770,7 +28000,6 @@ self: { homepage = "http://github.com/jfischoff/async-extras"; description = "Extra Utilities for the Async Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-io-either" = callPackage @@ -28143,6 +28372,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_1" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.1"; + sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -28336,6 +28578,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.0"; + sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -28593,7 +28865,6 @@ self: { homepage = "http://hub.darcs.net/thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -29022,8 +29293,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "14"; - editedCabalFile = "1xmpf1r6lm3j577svyg43520f3sv838p711s46xh7f6ch4qgdx0i"; + revision = "15"; + editedCabalFile = "06vhxs4172liq6ayf2cg3b45hk3jkcxbgz1ilwqrw9bbn8lfgq6s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -29166,6 +29437,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avro" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, data-binary-ieee754, entropy, extra, fail + , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific + , semigroups, tagged, template-haskell, text, unordered-containers + , vector + }: + mkDerivation { + pname = "avro"; + version = "0.1.0.1"; + sha256 = "0pn3pll7yjkfiqllndsn5mcm07my6mgjzd7amncvl3pykw75w0jq"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific + semigroups tagged template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + entropy extra fail hashable hspec mtl pure-zlib QuickCheck + scientific semigroups tagged template-haskell text + unordered-containers vector + ]; + homepage = "https://github.com/GaloisInc/avro.git"; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -29737,7 +30036,6 @@ self: { homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sns" = callPackage @@ -29780,7 +30078,6 @@ self: { homepage = "https://github.com/transient-haskell/axiom"; description = "Web EDSL for running in browsers and server nodes using transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "axiomatic-classes" = callPackage @@ -29977,7 +30274,6 @@ self: { homepage = "http://github.com/nek0/babl#readme"; description = "Haskell bindings to BABL library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -29994,7 +30290,6 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -30342,6 +30637,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_1_0_6" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.1.0.6"; + sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + homepage = "https://bitbucket.org/davecturner/bank-holidays-england"; + description = "Calculation of bank holidays in England and Wales"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -30461,7 +30770,6 @@ self: { homepage = "https://github.com/philopon/barrier"; description = "Shields.io style badge generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barrier-monad" = callPackage @@ -30773,6 +31081,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basement" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.0"; + sha256 = "1agqj5yp0nf7117qx62xp5mncans5szscbp6gz6ifhhsl6lng3k1"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -30839,7 +31159,6 @@ self: { homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basic-sop" = callPackage @@ -30853,7 +31172,6 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "baskell" = callPackage @@ -31062,7 +31380,6 @@ self: { homepage = "http://github.com/humane-software/haskell-bdd"; description = "Behavior-Driven Development DSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bdelta" = callPackage @@ -31270,7 +31587,6 @@ self: { homepage = "https://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bench_1_0_6" = callPackage @@ -31557,7 +31873,6 @@ self: { homepage = "https://bitbucket.org/kztk/bff-mono/"; description = "\"Bidirectionalization for Free\" for Monomorphic Transformations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgmax" = callPackage @@ -31570,7 +31885,6 @@ self: { homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgzf" = callPackage @@ -31885,7 +32199,6 @@ self: { homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary_0_7_6_1" = callPackage @@ -31986,6 +32299,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-conduit_1_2_5" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, hspec + , QuickCheck, quickcheck-assertions, resourcet, vector + }: + mkDerivation { + pname = "binary-conduit"; + version = "1.2.5"; + sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11"; + libraryHaskellDepends = [ + base binary bytestring conduit resourcet vector + ]; + testHaskellDepends = [ + base binary bytestring conduit hspec QuickCheck + quickcheck-assertions resourcet + ]; + homepage = "http://github.com/qnikst/binary-conduit/"; + description = "data serialization/deserialization conduit library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-derive" = callPackage ({ mkDerivation, base, binary, ghc-prim }: mkDerivation { @@ -32272,6 +32606,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-serialise-cbor" = callPackage + ({ mkDerivation, base, bytestring, cborg, serialise }: + mkDerivation { + pname = "binary-serialise-cbor"; + version = "0.1.1.0"; + sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg"; + libraryHaskellDepends = [ base bytestring cborg serialise ]; + description = "Yet Another Binary Serialisation Library (compatibility shim)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-shared" = callPackage ({ mkDerivation, base, binary, bytestring, containers, mtl }: mkDerivation { @@ -32391,6 +32736,8 @@ self: { pname = "binary-typed"; version = "1.0"; sha256 = "02ans3vny69qfsmwlgri7v31rpff0h3mdp2zpikclay50a471ww5"; + revision = "1"; + editedCabalFile = "1jnmdi3bnyiyvqlmgh5k8cdcbnl594yq3wrs6cjipw0ik06ar0y2"; libraryHaskellDepends = [ base binary bytestring murmur-hash ]; testHaskellDepends = [ base binary bytestring tasty tasty-hunit tasty-quickcheck @@ -32477,7 +32824,6 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -32848,7 +33194,6 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -32889,6 +33234,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + "bindings-libg15" = callPackage + ({ mkDerivation, base, bindings-DSL, g15 }: + mkDerivation { + pname = "bindings-libg15"; + version = "0.1.0.0"; + sha256 = "0vaayi9vnis9d35yrym67ihghfqyz4d13h86m3b27znwk7fqsz0d"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ g15 ]; + homepage = "https://github.com/Xandaros/bindings-libg15#readme"; + description = "Bindings to libg15"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {g15 = null;}; + "bindings-librrd" = callPackage ({ mkDerivation, base, bindings-DSL, librrd }: mkDerivation { @@ -33132,7 +33491,6 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -33332,6 +33690,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bio-sequence" = callPackage + ({ mkDerivation, array, base, bytestring, hspec, parsec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "bio-sequence"; + version = "0.1.0.0"; + sha256 = "0x9il05qdzmj6ka0pr8nbjg8zi073f52lpfd0dhzxy2f15zdralc"; + libraryHaskellDepends = [ + array base bytestring parsec template-haskell text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/biocad/bio-sequence"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bioace" = callPackage ({ mkDerivation, base, bioalign, biocore, bytestring, parsec }: mkDerivation { @@ -33567,16 +33942,16 @@ self: { }) {}; "bit-stream" = callPackage - ({ mkDerivation, base, criterion, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, vector + ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector }: mkDerivation { pname = "bit-stream"; - version = "0.1.0.0"; - sha256 = "1nn7yb15a1nlqjjmz0i4r53gh5wravp07faygn0hrvzvhwghgx1s"; + version = "0.1.0.2"; + sha256 = "1x4vcg2y2il540syqdzk2wdixs8g672lhzjm46y40x4299yjw7w1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base vector ]; + libraryHaskellDepends = [ base ghc-prim vector ]; executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -33584,7 +33959,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/Bodigrim/bit-stream#readme"; - description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing"; + description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -33604,7 +33979,6 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitarray" = callPackage @@ -33752,7 +34126,6 @@ self: { homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {blockchain-restful-address-index-api = null;}; @@ -33906,6 +34279,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; + revision = "2"; + editedCabalFile = "1c209vyxxafr1pf1zqcydy85w9v5gvfjy64i5i6v9asfld6jppig"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -34125,13 +34500,14 @@ self: { pname = "bitwise"; version = "0.1.1.1"; sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; + revision = "1"; + editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; - homepage = "http://code.mathr.co.uk/bitwise"; + homepage = "https://code.mathr.co.uk/bitwise"; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitx-bitcoin" = callPackage @@ -34253,7 +34629,6 @@ self: { homepage = "http://git.kaction.name/black-jewel"; description = "The pirate bay client"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blacktip" = callPackage @@ -34276,7 +34651,6 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blake2" = callPackage @@ -34594,6 +34968,7 @@ self: { homepage = "http://github.com/mruegenberg/blaze-html-truncate"; description = "A truncator for blaze-html"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-json" = callPackage @@ -34951,7 +35326,6 @@ self: { homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme"; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -35014,7 +35388,6 @@ self: { homepage = "http://github.com/GregorySchwartz/blosum#readme"; description = "BLOSUM generator"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloxorz" = callPackage @@ -35200,7 +35573,6 @@ self: { homepage = "http://code.haskell.org/~thielema/games/"; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogocopy" = callPackage @@ -35264,6 +35636,7 @@ self: { homepage = "https://github.com/bflyblue/bolt#readme"; description = "Bolt driver for Neo4j"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boltzmann-samplers" = callPackage @@ -35425,6 +35798,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bookkeeping_0_2_1_4" = callPackage + ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: + mkDerivation { + pname = "bookkeeping"; + version = "0.2.1.4"; + sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz"; + libraryHaskellDepends = [ base dlist mtl text time ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; + description = "A module for bookkeeping by double entry"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bookkeeping-jp" = callPackage ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable , text, time @@ -35553,7 +35940,6 @@ self: { ]; description = "A Bookmarks manager with a HTML generator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boombox" = callPackage @@ -35583,6 +35969,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boomerang_1_4_5_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell, text }: + mkDerivation { + pname = "boomerang"; + version = "1.4.5.3"; + sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; + libraryHaskellDepends = [ base mtl template-haskell text ]; + description = "Library for invertible parsing and printing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "boomslang" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-template, font-opengl-basic4x6, GLFW-b, MonadRandom @@ -35742,6 +36140,32 @@ self: { homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "bound_2_0_1" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest + , functor-classes-compat, hashable, mmorph, profunctors + , template-haskell, transformers, transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.1"; + sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; + revision = "1"; + editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat doctest functor-classes-compat transformers + transformers-compat vector void + ]; + homepage = "http://github.com/ekmett/bound/"; + description = "Making de Bruijn Succ Less"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -35754,7 +36178,6 @@ self: { libraryHaskellDepends = [ base bound monad-gen mtl ]; description = "Unwrap Scope's with globally fresh values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bounded-tchan" = callPackage @@ -35872,6 +36295,7 @@ self: { homepage = "http://github.com/githubuser/braid#readme"; description = "Types and functions to work with braids and Khovanov homology"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brain-bleep" = callPackage @@ -35933,8 +36357,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.3"; - sha256 = "0b153bjibqm6qicnh3r42fcv4w2c4qagllg0f1k5gxg903954xma"; + version = "0.1.0.4"; + sha256 = "0jar6jlid339k9rimlawah9800nqdybbr3l2k44y6i7q5pb656by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35956,7 +36380,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Break from a loop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "breakout" = callPackage @@ -35996,7 +36419,6 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -36038,7 +36460,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_20_1" = callPackage + "brick_0_23" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36046,8 +36468,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.20.1"; - sha256 = "1yhxs2p83nrv9b5lw9cd21f6r735sjxkamhmc2vv8d63z2fncz0f"; + version = "0.23"; + sha256 = "1izw1gj38z6d8wnakpdqvsqx49gpgg5wm95hkbc75fvxshngxiwm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36056,7 +36478,7 @@ self: { transformers vector vty word-wrap ]; executableHaskellDepends = [ - base microlens microlens-th text text-zipper vector vty + base microlens microlens-th text text-zipper vector vty word-wrap ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; @@ -36085,6 +36507,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brittany" = callPackage + ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs + , containers, czipwith, data-tree-print, deepseq, directory, either + , extra, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths + , hspec, monad-memo, mtl, multistate, neat-interpolation, parsec + , pretty, safe, semigroups, strict, syb, text, transformers + , uniplate, unsafe, yaml + }: + mkDerivation { + pname = "brittany"; + version = "0.8.0.2"; + sha256 = "001nfcdj366avjcjz199s630v3z6r9mrj22b16qcixnwm3pzpxr7"; + revision = "1"; + editedCabalFile = "16ks5wxyjlgh7krvkr072pkhj4f5sa8bpnw1y15swx5d8xinp40w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory either extra ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory either extra filepath ghc + ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl + multistate neat-interpolation pretty safe semigroups strict syb + text transformers uniplate unsafe yaml + ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory either extra ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation parsec pretty safe semigroups strict syb text + transformers uniplate unsafe yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "broadcast-chan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -36223,7 +36688,6 @@ self: { ]; description = "Mapping between BSON and algebraic data types"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bspack" = callPackage @@ -36384,7 +36848,6 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder-aeson" = callPackage @@ -36512,7 +36975,6 @@ self: { homepage = "http://code.ouroborus.net/buildbox"; description = "Rehackable components for writing buildbots and test harnesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buildbox-tools" = callPackage @@ -36743,8 +37205,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.1.0.0"; - sha256 = "0z80gkx1b69742a784d95864rf9kqww702xcg9hfl8ra1ah45d96"; + version = "1.1.0.1"; + sha256 = "0j2qknsgq11nc3n0hjx9ck76014sg7if0d75vjjsw1kjlr3rykn5"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -36813,7 +37275,6 @@ self: { homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -36878,6 +37339,8 @@ self: { pname = "bytes"; version = "0.15.3"; sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; + revision = "2"; + editedCabalFile = "07j20bmhysp4dawy8am1j4lhg21s5c2i8ckqby0iykmfgrlsrcv0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -36938,7 +37401,6 @@ self: { homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-builder" = callPackage @@ -37120,7 +37582,6 @@ self: { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-read" = callPackage @@ -37213,7 +37674,6 @@ self: { homepage = "https://github.com/nikita-volkov/bytestring-strict-builder"; description = "An efficient strict bytestring builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-time" = callPackage @@ -37532,6 +37992,7 @@ self: { homepage = "https://github.com/jwiegley/c2hsc"; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cab" = callPackage @@ -37599,8 +38060,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.1.0"; - sha256 = "12p5k0b4q66lbcsc59nvn7pnvwf627hfyrnl1p5nymirwkb4w4bl"; + version = "1.2.0"; + sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37613,7 +38074,6 @@ self: { ]; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -37623,8 +38083,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.11"; - sha256 = "0xvjnl59zx424wyqcknzsma467a8bgg9588smqifk3qa390l838n"; + version = "0.8.1"; + sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37636,7 +38096,6 @@ self: { testHaskellDepends = [ base filepath tasty tasty-golden ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-constraints" = callPackage @@ -37706,7 +38165,6 @@ self: { homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -37893,35 +38351,36 @@ self: { homepage = "https://github.com/barrucadu/cabal-info"; description = "Read information from cabal files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, directory - , filepath, hackage-security, hashable, HTTP, mtl, network - , network-uri, pretty, process, QuickCheck, random, regex-posix - , stm, tagged, tar, tasty, tasty-hunit, tasty-quickcheck, time - , unix, zlib + , bytestring, Cabal, containers, cryptohash-sha256, deepseq + , directory, echo, edit-distance, filepath, hackage-security + , hashable, HTTP, mtl, network, network-uri, pretty, pretty-show + , process, QuickCheck, random, stm, tagged, tar, tasty, tasty-hunit + , tasty-quickcheck, time, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.2"; - sha256 = "1q0gl3i9cpg854lcsiifxxginnvhp2bpx19wkkzpzrd072983j1a"; + version = "2.0.0.0"; + sha256 = "0b9b0sx2nxas894ns1sjyirhvra8y8ixfcsya9pxkw0q5yn0ndsz"; revision = "1"; - editedCabalFile = "0v112hvvppa31sklpzg54vr0hfidy1334kg5p3jc0gbgl8in1n90"; + editedCabalFile = "047bf57sxaajaa0wi7v3bg6kq19ngfpw5n4cc46zlbqqjbvvq1d5"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 directory filepath hackage-security - hashable HTTP mtl network network-uri pretty process random stm tar - time unix zlib + containers cryptohash-sha256 deepseq directory echo edit-distance + filepath hackage-security hashable HTTP mtl network network-uri + pretty process random stm tar time unix zlib ]; testHaskellDepends = [ - array async base binary bytestring Cabal containers directory + array async base base16-bytestring binary bytestring Cabal + containers cryptohash-sha256 deepseq directory edit-distance filepath hackage-security hashable HTTP mtl network network-uri - pretty process QuickCheck random regex-posix stm tagged tar tasty + pretty pretty-show process QuickCheck random stm tagged tar tasty tasty-hunit tasty-quickcheck time unix zlib ]; doCheck = false; @@ -38020,8 +38479,8 @@ self: { }: mkDerivation { pname = "cabal-macosx"; - version = "0.2.4.0"; - sha256 = "1yl8fwbqgdp4hsd5hsgrrzvh1px79nxfsvs9nip6fq3q68qm5ys1"; + version = "0.2.4.1"; + sha256 = "01l0m11q5knq1n9vx73515dpzw1mwxf7qin8qfb5ci21yxg91mww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38038,7 +38497,6 @@ self: { homepage = "http://github.com/danfran/cabal-macosx"; description = "Cabal support for creating Mac OSX application bundles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-meta" = callPackage @@ -38172,6 +38630,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_11_2" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.11.2"; + sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal directory filepath old-locale process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38308,13 +38785,12 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.8"; - sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x"; + version = "0.1.8.1"; + sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -38426,8 +38902,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.4"; - sha256 = "0nmvfg1fdmkibr7c0jk68mbinvqjr91c0lh1xzrd0g1kz576y703"; + version = "2.4.1"; + sha256 = "0dplmm32kckb5mk2gfkw63qkakzbgz7f4j0scaj74ncga4vjkzxg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -38657,7 +39133,6 @@ self: { executableHaskellDepends = [ base ]; description = "A simple library to cache a single IO action with timeout"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-traversable" = callPackage @@ -38685,6 +39160,8 @@ self: { pname = "cacophony"; version = "0.10.0"; sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; + revision = "1"; + editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38701,7 +39178,6 @@ self: { homepage = "https://github.com/centromere/cacophony#readme"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caf" = callPackage @@ -38801,7 +39277,6 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake3" = callPackage @@ -39018,19 +39493,19 @@ self: { }) {}; "call-haskell-from-anything" = callPackage - ({ mkDerivation, base, bytestring, msgpack, mtl, template-haskell - , vector + ({ mkDerivation, base, bytestring, data-msgpack, mtl + , storable-endian, template-haskell }: mkDerivation { pname = "call-haskell-from-anything"; - version = "1.0.1.0"; - sha256 = "1z5zyyara0g6inyjqhq26zvln926kln29avvllsg94agdwdbqcqs"; + version = "1.1.0.0"; + sha256 = "1ys5xjf1jvrr2nybv5lw36x59n4jnxwqfkf3hdmrdz770y08gp0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring msgpack mtl template-haskell vector + base bytestring data-msgpack mtl storable-endian template-haskell ]; - executableHaskellDepends = [ base bytestring msgpack mtl ]; + executableHaskellDepends = [ base bytestring data-msgpack mtl ]; homepage = "https://github.com/nh2/call-haskell-from-anything"; description = "Call Haskell functions from other languages via serialization and dynamic libraries"; license = stdenv.lib.licenses.mit; @@ -39078,6 +39553,7 @@ self: { homepage = "https://camfort.github.io"; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "camh" = callPackage @@ -39157,7 +39633,6 @@ self: { homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-listen-http" = callPackage @@ -39414,7 +39889,6 @@ self: { homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carray" = callPackage @@ -39711,7 +40185,6 @@ self: { homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cash" = callPackage @@ -40074,6 +40547,7 @@ self: { homepage = "https://github.com/stackbuilders/cassava-megaparsec"; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-streams" = callPackage @@ -40098,6 +40572,7 @@ self: { homepage = "https://github.com/pjones/cassava-streams"; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassette" = callPackage @@ -40140,6 +40615,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cast" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cast"; + version = "0.1.0.2"; + sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-patterns/cast#readme"; + description = "Abstact cast pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "castle" = callPackage ({ mkDerivation, base, containers, optparse-applicative, shelly , system-fileio, system-filepath, text @@ -40312,7 +40799,6 @@ self: { ]; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -40372,6 +40858,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cbor-tool" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg + , cborg-json, filepath, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "cbor-tool"; + version = "0.1.0.0"; + sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cborg cborg-json filepath + scientific text unordered-containers vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A tool for manipulating CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , half, integer-gmp, primitive, text + }: + mkDerivation { + pname = "cborg"; + version = "0.1.1.0"; + sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj"; + revision = "1"; + editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim half integer-gmp + primitive text + ]; + description = "Concise Binary Object Representation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cborg-json" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cborg-json"; + version = "0.1.0.0"; + sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz"; + libraryHaskellDepends = [ + aeson aeson-pretty base cborg scientific text unordered-containers + vector + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A library for encoding JSON as CBOR"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cci" = callPackage ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers , filepath, mtl, pretty, process, random, time @@ -40543,6 +41084,7 @@ self: { homepage = "https://github.com/ogma-project/celtchar#readme"; description = "A tool to build a novel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cerberus" = callPackage @@ -40718,7 +41260,6 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -41106,7 +41647,6 @@ self: { homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "charsetdetect-ae" = callPackage @@ -41159,6 +41699,7 @@ self: { homepage = "https://github.com/tonyday567/chart-unit"; description = "Native haskell charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chaselev-deque" = callPackage @@ -41236,7 +41777,6 @@ self: { homepage = "http://hub.darcs.net/enum/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-text" = callPackage @@ -41262,7 +41802,6 @@ self: { homepage = "http://hub.darcs.net/enum/chatty-utils"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatwork" = callPackage @@ -41272,12 +41811,18 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.0"; - sha256 = "0xslzn94qhzidayv0nd8rfm9jvfi38dygvwd1lj7vwjgd4yrxy1m"; + version = "0.1.1.2"; + sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class http-api-data http-client http-client-tls http-types req text ]; + executableHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; testHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class hspec http-api-data http-client http-client-tls http-types req @@ -41314,6 +41859,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cheapskate_0_1_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize + }: + mkDerivation { + pname = "cheapskate"; + version = "0.1.1"; + sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html containers data-default deepseq mtl syb text + uniplate xss-sanitize + ]; + executableHaskellDepends = [ base blaze-html bytestring text ]; + homepage = "http://github.com/jgm/cheapskate"; + description = "Experimental markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate-highlight" = callPackage ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate , text @@ -41322,6 +41888,8 @@ self: { pname = "cheapskate-highlight"; version = "0.1.0.0"; sha256 = "0w6k694gmnx7h8ix79z8scsdl65zbilxni1vjr90ka2fdfrazxss"; + revision = "1"; + editedCabalFile = "1c8kxqdqf0j962xjdrrjfcbjsl0c1kax31rjykymv7w16d6hmlj4"; libraryHaskellDepends = [ base blaze-html cheapskate highlighting-kate text ]; @@ -42476,7 +43044,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-lib" = callPackage @@ -42503,7 +43070,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-multisignal" = callPackage @@ -42519,7 +43085,6 @@ self: { ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage @@ -42548,7 +43113,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -42580,7 +43144,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-verilog" = callPackage @@ -42599,7 +43162,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-vhdl" = callPackage @@ -42618,7 +43180,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -42694,7 +43255,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-prelude-conduit" = callPackage @@ -42716,7 +43276,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-prelude-yesod" = callPackage @@ -42736,7 +43295,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classyplate" = callPackage @@ -42761,7 +43319,6 @@ self: { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -42916,6 +43473,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "mailing list plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-media" = callPackage @@ -43051,7 +43609,6 @@ self: { homepage = "https://github.com/ivanperez-keera/clean-home"; description = "Keep your home dir clean by finding old conf files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clean-unions" = callPackage @@ -43299,7 +43856,6 @@ self: { homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clit" = callPackage @@ -43323,6 +43879,7 @@ self: { homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Post tweets from stdin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloben" = callPackage @@ -43488,6 +44045,7 @@ self: { homepage = "https://github.com/cjdev/cloud-seeder#readme"; description = "A tool for interacting with AWS CloudFormation"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudfront-signer" = callPackage @@ -43552,8 +44110,8 @@ self: { }: mkDerivation { pname = "clr-bindings"; - version = "0.1.0.0"; - sha256 = "1rqj81bzqhfz32sf6yningzpd4xp32myknnv0c1vbzkz19cklma1"; + version = "0.2.0"; + sha256 = "1q2s4bg4lilcn9pfp14vj11m67l4f3lpqr5h1j17mklzp5cbhv85"; libraryHaskellDepends = [ base clr-host clr-marshal clr-typed pipes template-haskell text ]; @@ -43585,6 +44143,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + "clr-host_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory + , file-embed, filepath, glib, mono, text, transformers + }: + mkDerivation { + pname = "clr-host"; + version = "0.2.0"; + sha256 = "0x40zbdzj6zkb3k41z1ncdphnny4wyxlbw9n734h4qdqw093vcvv"; + setupHaskellDepends = [ + base Cabal directory filepath transformers + ]; + libraryHaskellDepends = [ + base bytestring clr-marshal file-embed text + ]; + librarySystemDepends = [ glib mono ]; + testHaskellDepends = [ base ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; + description = "Hosting the Common Language Runtime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, clr-host, clr-marshal , containers, criterion, directory, extra, filepath, here, hspec @@ -43609,6 +44189,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clr-inline_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , clr-host, clr-marshal, containers, criterion, directory, extra + , filepath, here, hspec, lens, parsec, process, split + , template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "clr-inline"; + version = "0.2.0"; + sha256 = "0s9f2y5ykfsq3sw52mxmvwih946ah9gv48pqma8nql9k0xx905ww"; + libraryHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers directory extra filepath here lens parsec process split + template-haskell temporary text transformers + ]; + testHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers directory extra filepath here hspec lens parsec process + split template-haskell temporary text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal case-insensitive clr-host clr-marshal + containers criterion directory extra filepath here lens parsec + process split template-haskell temporary text transformers + ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell"; + description = "Quasiquoters for inline C# and F#"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clr-marshal" = callPackage ({ mkDerivation, base, clr-host, text }: mkDerivation { @@ -43621,16 +44232,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clr-marshal_0_2_0_0" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "clr-marshal"; + version = "0.2.0.0"; + sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1"; + libraryHaskellDepends = [ base text ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal"; + description = "Marshaling for the clr"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clr-typed" = callPackage - ({ mkDerivation, base, clr-marshal, ghc-prim, text, tuple }: + ({ mkDerivation, base, clr-marshal, ghc-prim, hspec, text, tuple }: mkDerivation { pname = "clr-typed"; - version = "0.1.0.0"; - sha256 = "07qi8g7lh8h9lph088p5zx4qjp6na1239pwjr5s8lgiq069gmn99"; - revision = "1"; - editedCabalFile = "02fsha9hir0yqnn9b9dgpg345313n660j9mhdmsya0r3k8fhmn2b"; + version = "0.2.0"; + sha256 = "1ay3970fccvr4hbmv5dah2qdxv51q09n1v3m9wkj62mbpsp3zk2y"; libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base clr-marshal hspec text ]; homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed"; description = "A strongly typed Haskell interface to the CLR type system"; license = stdenv.lib.licenses.bsd3; @@ -43809,6 +44431,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark_0_5_6" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark"; + version = "0.5.6"; + sha256 = "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + homepage = "https://github.com/jgm/cmark-hs"; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cmark-gfm" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.3"; + sha256 = "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + homepage = "https://github.com/kivikakk/cmark-gfm-hs"; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -43816,6 +44475,8 @@ self: { pname = "cmark-highlight"; version = "0.2.0.0"; sha256 = "0aw1y0bl7ddvm4ai66x7apdijw6mza272ir8jkbdbz6k0gbrqxny"; + revision = "1"; + editedCabalFile = "1zdxr3bfj9bn2yclm5m17aa7wid6zwhvg6mj245wd2y34p696znw"; libraryHaskellDepends = [ base blaze-html cmark highlighting-kate text ]; @@ -43838,6 +44499,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-patterns" = callPackage + ({ mkDerivation, base, cmark }: + mkDerivation { + pname = "cmark-patterns"; + version = "0.1.0.0"; + sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f"; + libraryHaskellDepends = [ base cmark ]; + homepage = "http://github.com/aelve/cmark-patterns"; + description = "Pattern synonyms for cmark"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark-sections" = callPackage ({ mkDerivation, base, base-prelude, cmark, containers, hspec , microlens, QuickCheck, split, text @@ -44154,7 +44827,6 @@ self: { homepage = "https://github.com/chpatrick/codec"; description = "Simple bidirectional serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codec-libevent" = callPackage @@ -44316,7 +44988,6 @@ self: { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -44565,14 +45236,20 @@ self: { }) {}; "collection-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, text }: + ({ mkDerivation, aeson, base, network-uri, QuickCheck + , quickcheck-instances, test-invariant, text + }: mkDerivation { pname = "collection-json"; - version = "0.1.0.0"; - sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; - libraryHaskellDepends = [ aeson base bytestring text ]; - homepage = "https://github.com/danchoi/collection-json.hs"; - description = "Collection+JSON hypermedia type tools"; + version = "1.0.1.0"; + sha256 = "1vq21mjc0zfn1q1mwscq3m5j3dls8dsfcanc9n8kp3sz4lz2f3zw"; + libraryHaskellDepends = [ aeson base network-uri text ]; + testHaskellDepends = [ + aeson base network-uri QuickCheck quickcheck-instances + test-invariant text + ]; + homepage = "https://github.com/alunduil/collection-json.hs"; + description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -44755,7 +45432,6 @@ self: { homepage = "https://github.com/tmcdonell/colour-accelerate"; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colour-space" = callPackage @@ -44794,6 +45470,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "columbia" = callPackage + ({ mkDerivation, array, base, bytestring, containers, contravariant + , data-endian, directory, filelock, invariant, mmap, mmorph + , monad-loops, mtl, parallel, pointless-haskell, syb-with-class + , transformers + }: + mkDerivation { + pname = "columbia"; + version = "0.1.0.2"; + sha256 = "152f43s2dm81amag28kav9a1gfyg97rxhd2dm3ivip98j8p1d6j0"; + libraryHaskellDepends = [ + array base bytestring containers contravariant data-endian + directory filelock invariant mmap mmorph monad-loops mtl parallel + pointless-haskell syb-with-class transformers + ]; + description = "Enhanced serialization for media that support seeking"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "com" = callPackage ({ mkDerivation }: mkDerivation { @@ -44824,7 +45520,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinat-diagrams" = callPackage @@ -44842,7 +45537,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Graphical representations for various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinator-interactive" = callPackage @@ -44931,7 +45625,6 @@ self: { homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comic" = callPackage @@ -44944,7 +45637,6 @@ self: { homepage = "https://oss.xkcd.com/"; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comma" = callPackage @@ -45025,7 +45717,6 @@ self: { ]; description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "commsec" = callPackage @@ -45102,6 +45793,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.2"; + sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; + revision = "1"; + editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/comonad/"; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -45261,7 +45975,6 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compactmap" = callPackage @@ -45409,6 +46122,29 @@ self: { homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "compensated_0_7_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest + , generic-deriving, hashable, lens, log-domain, safecopy + , semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.7.2"; + sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/analytics/compensated/"; + description = "Compensated floating-point arithmetic"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -45460,11 +46196,12 @@ self: { pname = "complex-generic"; version = "0.1.1.1"; sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; + revision = "1"; + editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "complex-integrate" = callPackage @@ -45563,8 +46300,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.4.2.0"; - sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; + version = "0.5.0.0"; + sha256 = "1h8kn3isnxx1qqd50h5af8rk9i88nfb7iiqjfy1kwszvjq6qap3p"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -45580,7 +46317,6 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "JSON for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-aeson-refined" = callPackage @@ -45589,15 +46325,14 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.4.2.0"; - sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5"; + version = "0.5.0.0"; + sha256 = "0s09qmr6rjkm28jz78cg9bz1zqhv0mlp7g5wpy9c7cblwz5wf4qd"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "composite-aeson support for Refined from the refined package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-base" = callPackage @@ -45607,8 +46342,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.4.2.0"; - sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; + version = "0.5.0.0"; + sha256 = "18fqmawlh5i4j04vj5kfqhb7cqlzfvv9326fqs3m4yzwh7zrmiqk"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -45620,7 +46355,6 @@ self: { homepage = "https://github.com/ConferHealth/composite#readme"; description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-ekg" = callPackage @@ -45629,34 +46363,37 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.4.2.0"; - sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; + version = "0.5.0.0"; + sha256 = "0q74j2jnzdj79srziz1ldpjs4xcysjr1dp9b8fsg4bghwfnkc7sc"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "EKG Metrics for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composite-opaleye" = callPackage - ({ mkDerivation, base, bytestring, composite-base, lens, opaleye - , postgresql-simple, product-profunctors, profunctors - , template-haskell, text, vinyl + ({ mkDerivation, base, bytestring, composite-base, hspec, lens + , opaleye, postgresql-simple, product-profunctors, profunctors + , QuickCheck, template-haskell, text, vinyl }: mkDerivation { pname = "composite-opaleye"; - version = "0.4.2.0"; - sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; + version = "0.5.0.0"; + sha256 = "0s9nf2nyz7knpcx0x1y0ck8x1cjxdmsdrc1nvqyb1264lkd863cj"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl ]; + testHaskellDepends = [ + base bytestring composite-base hspec lens opaleye postgresql-simple + product-profunctors profunctors QuickCheck template-haskell text + vinyl + ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "Opaleye SQL for Frames records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composition" = callPackage @@ -45680,6 +46417,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "0.1.0.1"; + sha256 = "0a020wl2i84f30y21yywdb4qhr3a1lrjmmcw25kfjg011gdxggf4"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/composition-prelude#readme"; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -45968,34 +46717,42 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, bytestring, bzlib, containers, directory - , filepath, hashable, megaparsec, mtl, network, optparse-generic - , path-io, process, QuickCheck, scientific, tar, text, thrift, time - , unordered-containers, uuid, vector, zip, zlib + ({ mkDerivation, base, binary, bytestring, bzlib + , concrete-haskell-autogen, containers, directory, filepath + , hashable, megaparsec, monad-extras, mtl, network + , optparse-generic, path, path-io, process, QuickCheck, scientific + , tar, text, thrift, time, unordered-containers, uuid, vector, zip + , zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.11"; - sha256 = "12kvwxngsnh3lhp1q415ga8apkadfb8cxzvrlmlvrjdk6p5aczza"; + version = "0.1.0.14"; + sha256 = "1qmnmwdk1gz6kn35j150xgdz3fiz895l3qn1km11i6g3ns46rjvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; executableHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; testHaskellDepends = [ - base bytestring bzlib containers directory filepath hashable - megaparsec mtl network optparse-generic path-io process QuickCheck - scientific tar text thrift time unordered-containers uuid vector - zip zlib + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib + ]; + benchmarkHaskellDepends = [ + base binary bytestring bzlib concrete-haskell-autogen containers + directory filepath hashable megaparsec monad-extras mtl network + optparse-generic path path-io process QuickCheck scientific tar + text thrift time unordered-containers uuid vector zip zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -46091,21 +46848,22 @@ self: { "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns - , hashable, hspec, iproute, network, stm, time + , hspec, iproute, lifted-base, monad-control, network, psqueues + , stm, time, transformers }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.0.1"; - sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2"; + version = "0.1.0"; + sha256 = "0bi3mlv2gi8adgh8zmh51idrnbsap15f2kybligccf9b6pcvpljr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; executableHaskellDepends = [ - array async base bytestring containers dns hashable iproute network - stm time + array async base bytestring containers dns iproute lifted-base + monad-control network psqueues stm time transformers ]; testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; @@ -46400,6 +47158,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, containers, deepseq + , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans + , stm-conduit, test-framework, test-framework-hunit + , test-framework-th, transformers, unix + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.2.0"; + sha256 = "17b2j4pm6d2r80q0f33sa1iyfxszmk5lgf94qdw9hbwhs6g7rfjb"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory filepath mtl resourcet + stm stm-chans stm-conduit transformers unix + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory filepath HUnit mtl + resourcet stm stm-chans stm-conduit test-framework + test-framework-hunit test-framework-th transformers unix + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -46611,6 +47396,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-iconv_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, mtl + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "conduit-iconv"; + version = "0.1.1.2"; + sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; + libraryHaskellDepends = [ base bytestring conduit ]; + testHaskellDepends = [ + base bytestring conduit mtl QuickCheck test-framework + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mtl text + ]; + homepage = "https://github.com/sdroege/conduit-iconv"; + description = "Conduit for character encoding conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-merge" = callPackage ({ mkDerivation, base, conduit, mtl }: mkDerivation { @@ -46934,6 +47741,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_3_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, text, tls + , transformers, unordered-containers, wai, warp, warp-tls, x509 + , x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.3.0"; + sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors text tls + transformers unordered-containers x509 x509-system x509-validation + yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + homepage = "https://github.com/alephcloud/hs-configuration-tools"; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -47005,8 +47846,8 @@ self: { }: mkDerivation { pname = "confsolve"; - version = "0.5.5"; - sha256 = "0wwrjrjp3biai2sg8aylqbw7nv2sd41xnqy6826i2knmjj3inqrg"; + version = "0.5.6"; + sha256 = "0bsribar35vrq1q22nijxgnymkbrfa49vyvfa60ink8wj7q47jzp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47198,7 +48039,6 @@ self: { homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-dynamic" = callPackage @@ -47302,7 +48142,6 @@ self: { homepage = "http://andersk.mit.edu/haskell/constructible/"; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructive-algebra" = callPackage @@ -48201,7 +49040,6 @@ self: { ]; description = "A compiler for CoPilot targeting SBV"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-theorem" = callPackage @@ -48261,8 +49099,8 @@ self: { }: mkDerivation { pname = "core-compiler"; - version = "0.1.0.1"; - sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns"; + version = "0.1.0.2"; + sha256 = "1bz7lxklbsw12y0v89nvrcyy7m35zb0cldn0wzyxz4h5szx5cji6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48273,7 +49111,6 @@ self: { homepage = "https://github.com/aneksteind/Core#readme"; description = "compile your own mini functional language with Core"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -48841,7 +49678,6 @@ self: { homepage = "https://gitlab.com/twittner/cql/"; description = "Cassandra CQL binary protocol"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cql-io" = callPackage @@ -48864,7 +49700,6 @@ self: { homepage = "https://gitlab.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs" = callPackage @@ -49278,8 +50113,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.18"; - sha256 = "0w0vrgqiwpy3s3saqjwqy15vky3y1vvhb3ncq1sy52y4csszzmh5"; + version = "5.9.19"; + sha256 = "1ar2zbjan63bcwinp3vxxgbpvlr2vffk26b3vr479gdw0mngwa91"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -49499,7 +50334,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_1_0" = callPackage + "criterion_1_2_2_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -49510,8 +50345,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.1.0"; - sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r"; + version = "1.2.2.0"; + sha256 = "0cc95hp5l7srjs5471lpdvx9hihvvi5rabrqqpy6blnrhpf9jwfz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -49928,14 +50763,13 @@ self: { pname = "crypto-enigma"; version = "0.0.2.8"; sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q"; - revision = "1"; - editedCabalFile = "0zm90nv4asr28pbwl2x96hbr50v0d4y3zjsmlz80gsm7cqj6hz3s"; + revision = "4"; + editedCabalFile = "1rvcphwavb3ns46fankpdlkz8rwl3rn591zlkmx0zdy3vygpwsfg"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -49957,7 +50791,6 @@ self: { homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash"; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-numbers" = callPackage @@ -50505,7 +51338,6 @@ self: { homepage = "https://github.com/anton-k/csound-catalog"; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -50605,7 +51437,6 @@ self: { testHaskellDepends = [ base nondeterminism tasty tasty-hunit ]; description = "Discrete constraint satisfaction problem (CSP) solver"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cspmchecker" = callPackage @@ -50658,6 +51489,8 @@ self: { pname = "css-syntax"; version = "0.0.5"; sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r"; + revision = "1"; + editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap"; libraryHaskellDepends = [ attoparsec base bytestring scientific text ]; @@ -50722,7 +51555,6 @@ self: { homepage = "http://github.com/ozataman/csv-conduit"; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csv-enumerator" = callPackage @@ -50958,7 +51790,6 @@ self: { executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cuda" = callPackage @@ -51015,6 +51846,29 @@ self: { homepage = "https://github.com/mrkkrp/cue-sheet"; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "cue-sheet_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cue-sheet"; + version = "1.0.0"; + sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-default-class exceptions megaparsec + mtl QuickCheck text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec megaparsec + QuickCheck text + ]; + homepage = "https://github.com/mrkkrp/cue-sheet"; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -51286,7 +52140,6 @@ self: { libraryHaskellDepends = [ arithmoi base containers ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -51315,6 +52168,8 @@ self: { pname = "czipwith"; version = "1.0.0.0"; sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5"; + revision = "1"; + editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; homepage = "https://github.com/lspitzner/czipwith/"; @@ -52024,6 +52879,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-accessor-template_0_2_1_14" = callPackage + ({ mkDerivation, base, data-accessor, template-haskell, utility-ht + }: + mkDerivation { + pname = "data-accessor-template"; + version = "0.2.1.14"; + sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4"; + libraryHaskellDepends = [ + base data-accessor template-haskell utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Record_access"; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-accessor-transformers" = callPackage ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { @@ -52274,7 +53145,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "A class for types with a default value"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-generics" = callPackage @@ -52321,7 +53191,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-case-insensitive" = callPackage @@ -52336,7 +53205,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instance for CI type from case-insensitive package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-containers" = callPackage @@ -52371,7 +53239,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types in newer versions of base package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-old-locale" = callPackage @@ -52397,7 +53264,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) Text and Text Builder"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-unordered-containers" = callPackage @@ -52414,7 +53280,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for unordered-containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-vector" = callPackage @@ -52429,7 +53294,6 @@ self: { homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types defined in vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-dispersal" = callPackage @@ -52473,6 +53337,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse_0_9_0_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "0.9.0.1"; + sha256 = "155zq4pn68wxw096i7w6k68rpaxhcyjqjhhc89yvky22nvv67yq4"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/louispan/data-diverse#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-diverse-lens" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { @@ -52709,8 +53592,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "data-flags"; - version = "0.0.3.3"; - sha256 = "1aps6v8kl168k211gm96mm7i07zkmm5j9j4kl7wwaicblpb91qx1"; + version = "0.0.3.4"; + sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/mvv/data-flags"; description = "A package for working with bit masks and flags in general"; @@ -52924,6 +53807,7 @@ self: { homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-fd" = callPackage @@ -52938,6 +53822,7 @@ self: { homepage = "http://github.com/roconnor/data-lens-fd/"; description = "Lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-ixset" = callPackage @@ -52976,6 +53861,7 @@ self: { homepage = "http://github.com/roconnor/data-lens-template/"; description = "Utilities for Data.Lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-list-sequences" = callPackage @@ -53053,7 +53939,6 @@ self: { homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-msgpack-types" = callPackage @@ -53190,10 +54075,11 @@ self: { pname = "data-pprint"; version = "0.2.4.1"; sha256 = "10qg7sa64l7sjm6f9xx00nqddmxccj4h1apv4wwqhh8y7vlal1hc"; + revision = "1"; + editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-quotientref" = callPackage @@ -53441,6 +54327,7 @@ self: { homepage = "http://github.com/alistra/data-structure-inferrer"; description = "Program that infers the fastest data structure available for your program"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-sword" = callPackage @@ -53449,8 +54336,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.2.0.1"; - sha256 = "1l84ygal3zr9s8g8jshckgn922fjn06n9191v5k4hj2sa798wd6j"; + version = "0.2.0.2"; + sha256 = "1m14vxfx5raiy5b6w3602hkqywc0gj4yv38mjbwncbic86g6rgn2"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -53526,6 +54413,8 @@ self: { pname = "data-tree-print"; version = "0.1.0.0"; sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; + revision = "1"; + editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436"; libraryHaskellDepends = [ base pretty syb ]; homepage = "https://github.com/lspitzner/data-tree-print"; description = "Print Data instances as a nested tree"; @@ -53642,7 +54531,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataflow" = callPackage @@ -53722,13 +54610,13 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.4"; - sha256 = "1l5djdv1fvqymkc5q10zwzhjwphxpw1wpr5d8rqf3z2kym3k0h2r"; + version = "0.2.5"; + sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs"; libraryHaskellDepends = [ aeson attoparsec base bytestring cassava directory file-embed filepath hashable microlens stringsearch text time vector wreq ]; - homepage = "https://github.com/filopodia/open/datasets"; + homepage = "https://github.com/diffusionkinetics/open/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; }) {}; @@ -53887,8 +54775,8 @@ self: { ({ mkDerivation, base, hspec, postgresql-simple, text }: mkDerivation { pname = "dbcleaner"; - version = "0.1.1"; - sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc"; + version = "0.1.3"; + sha256 = "0d8ghd4i7qq3zp1vmxvsx7s66ip3qqfzacfnb2n4i3cdd7hv05q8"; libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; description = "Clean database tables automatically around hspec tests"; @@ -53975,7 +54863,6 @@ self: { ]; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-mysql" = callPackage @@ -54200,6 +55087,7 @@ self: { homepage = "https://github.com/anatolat/dcpu16#readme"; description = "DCPU-16 Emulator & Assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddate" = callPackage @@ -54602,7 +55490,6 @@ self: { libraryHaskellDepends = [ base directory filepath HSH ]; description = "Utilities to work with debian binary packages"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debian-build" = callPackage @@ -54646,8 +55533,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20170510"; - sha256 = "0lxzy58a1qyl3vwhn9faiibsfrkaqxylvsdxhfki1x03amwzwnyw"; + version = "1.20170810"; + sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55120,6 +56007,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_0_7_1_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, mtl, random, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.7.1.0"; + sha256 = "058vdwsjjh5pbjbnsr8jfx7n84d4w79r7fkavlzy0a9a2cvb3nia"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions leancheck mtl random + ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -55516,6 +56422,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "derive_2_6_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , haskell-src-exts, pretty, process, syb, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "derive"; + version = "2.6.3"; + sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath haskell-src-exts + pretty process syb template-haskell transformers uniplate + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/derive#readme"; + description = "A program and library to derive instances for data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derive-IG" = callPackage ({ mkDerivation, base, instant-generics, template-haskell }: mkDerivation { @@ -55578,7 +56506,6 @@ self: { homepage = "https://github.com/sboosali/derive-monoid#readme"; description = "derive Semigroup/Monoid/IsList"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-storable" = callPackage @@ -55894,8 +56821,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.5.0"; - sha256 = "13s98jjhibm9p0hd9y9fbj0a1il4mwcp2v9mi9j0zrpn6vr4h00p"; + version = "1.5.1"; + sha256 = "0hrxrchcs7853gys85niqmngvpd3fla59ca11npw5h0aznbj6ymk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55930,6 +56857,7 @@ self: { ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-check" = callPackage @@ -55969,6 +56897,7 @@ self: { ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -55989,6 +56918,7 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-text" = callPackage @@ -56002,6 +56932,7 @@ self: { executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhcp-lease-parser" = callPackage @@ -56047,6 +56978,8 @@ self: { pname = "dia-base"; version = "0.1.1.4"; sha256 = "09lyzl0ppgk7izmsb3hq86dfmyb31w866h582vazpphbyvrbpihz"; + revision = "1"; + editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w"; libraryHaskellDepends = [ base deepseq ]; description = "An EDSL for teaching Haskell with diagrams - data types"; license = stdenv.lib.licenses.bsd3; @@ -56060,12 +56993,13 @@ self: { pname = "dia-functions"; version = "0.2.1.5"; sha256 = "1q9jywy6rmh5wkd8z5rw9rkilbh9jxd4py2w4xxqz93rzz2gzy5g"; + revision = "1"; + editedCabalFile = "0zyg7mrnp8qp9v0hm1188n4xqp223g6wqdnz43dw3dchqs2qpwbx"; libraryHaskellDepends = [ base containers data-pprint deepseq dia-base mtl xhtml ]; description = "An EDSL for teaching Haskell with diagrams - functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams" = callPackage @@ -56083,6 +57017,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -56128,7 +57063,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -56171,7 +57105,6 @@ self: { 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 @@ -56199,6 +57132,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -56280,7 +57214,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -56417,7 +57350,6 @@ self: { homepage = "http://github.com/cchalmers/diagrams-pgf"; description = "PGF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-postscript" = callPackage @@ -56509,7 +57441,6 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage @@ -56712,6 +57643,34 @@ self: { ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "dictionaries_0_2_0_3" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, data-default, deepseq, directory, exceptions, filepath + , hspec, QuickCheck, random, random-shuffle, tagged, text, time + , transformers, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.2.0.3"; + sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default deepseq + directory exceptions filepath tagged text time transformers zlib + ]; + executableHaskellDepends = [ + base bytestring containers criterion deepseq directory exceptions + filepath random random-shuffle tagged text transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec QuickCheck + random tagged text time + ]; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -56968,7 +57927,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -56991,7 +57949,6 @@ self: { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -57025,7 +57982,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -57070,7 +58026,6 @@ self: { homepage = "https://github.com/athanclark/digestive-functors-lucid"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -57090,7 +58045,6 @@ self: { homepage = "https://github.com/mmartin/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -57108,7 +58062,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage @@ -57538,7 +58491,6 @@ self: { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dirfiles" = callPackage @@ -57703,7 +58655,6 @@ self: { homepage = "http://github.com/lightquake/discount"; description = "Haskell bindings to the discount Markdown library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {markdown = null;}; "discrete-space-map" = callPackage @@ -57732,8 +58683,8 @@ self: { pname = "discrimination"; version = "0.2.1"; sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl"; - revision = "1"; - editedCabalFile = "1wshnljdvzj4ka4h571a187b0fks7b0izic4yk29l187ipdi7pva"; + revision = "2"; + editedCabalFile = "0byjk3k7f7jvx8kd2y2mi8fl93p85rbn2ycmg0yhb7wlyi7hzyfp"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -57777,7 +58728,6 @@ self: { homepage = "https://github.com/clintonmead/disjoint-set-stateful"; description = "Monadic disjoint set"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "disjoint-sets-st" = callPackage @@ -57932,6 +58882,7 @@ self: { homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-async" = callPackage @@ -58032,6 +58983,7 @@ self: { ]; description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -58136,6 +59088,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-fsm"; description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-lifted" = callPackage @@ -58180,6 +59133,7 @@ self: { homepage = "http://haskell-distributed.github.io"; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-p2p" = callPackage @@ -58201,6 +59155,7 @@ self: { homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/"; description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-platform" = callPackage @@ -58345,6 +59300,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-systest"; description = "Cloud Haskell Test Support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task" = callPackage @@ -58527,6 +59483,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_5_3" = callPackage + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest + , generic-deriving, hspec, tagged, transformers + , transformers-compat + }: + mkDerivation { + pname = "distributive"; + version = "0.5.3"; + sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; + revision = "1"; + editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans tagged transformers transformers-compat + ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; + homepage = "http://github.com/ekmett/distributive/"; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diversity" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -58701,6 +59679,31 @@ self: { pname = "dlist-nonempty"; version = "0.1"; sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8"; + revision = "1"; + editedCabalFile = "1nvxf1dyqvanx7vfr4q7li2jj5vr543lc2fkkwajsm0z75vcibz4"; + libraryHaskellDepends = [ + base base-compat deepseq dlist semigroupoids + ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + benchmarkHaskellDepends = [ + base base-compat criterion dlist dlist-instances + ]; + homepage = "https://github.com/phadej/dlist-nonempty"; + description = "Non-empty difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dlist-nonempty_0_1_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq + , dlist, dlist-instances, QuickCheck, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "dlist-nonempty"; + version = "0.1.1"; + sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -58713,6 +59716,7 @@ self: { homepage = "https://github.com/phadej/dlist-nonempty"; description = "Non-empty difference lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmc" = callPackage @@ -58823,6 +59827,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_12" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.12"; + sha256 = "0c5w2s8cvid9nk9ldd759k0p54pnb10ld3iin1w1b4lqi08cnnwk"; + libraryHaskellDepends = [ + attoparsec base binary bytestring conduit conduit-extra containers + iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -59119,7 +60147,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_12_0" = callPackage + "doctest_0_13_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -59127,8 +60155,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.12.0"; - sha256 = "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a"; + version = "0.13.0"; + sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59168,7 +60196,6 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -59351,7 +60378,6 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "domplate" = callPackage @@ -59453,6 +60479,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dotenv_0_4_0_0" = callPackage + ({ mkDerivation, base, base-compat, exceptions, hspec + , hspec-megaparsec, megaparsec, optparse-applicative, process, text + , transformers + }: + mkDerivation { + pname = "dotenv"; + version = "0.4.0.0"; + sha256 = "0f9c5p1nm7zdwz55wlgm56fb2xvyra0f4i37rfj7bb5kdhncqphg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat exceptions megaparsec text transformers + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers + ]; + testHaskellDepends = [ + base base-compat exceptions hspec hspec-megaparsec megaparsec text + transformers + ]; + homepage = "https://github.com/stackbuilders/dotenv-hs"; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -59612,7 +60666,6 @@ self: { homepage = "https://github.com/psibi/download"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-curl" = callPackage @@ -59627,7 +60680,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-media-content" = callPackage @@ -59964,6 +61016,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "drifter_0_2_3" = callPackage + ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "drifter"; + version = "0.2.3"; + sha256 = "0f16v4v0ff27qk71a6fsrcwy02nc53g9q1qrfscn8q3swi3rslyz"; + libraryHaskellDepends = [ base containers fgl text ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/AndrewRademacher/drifter"; + description = "Simple schema management for arbitrary databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "drifter-postgresql" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl , postgresql-simple, tasty, tasty-hunit, text, time @@ -60294,6 +61364,7 @@ self: { ]; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -60343,6 +61414,7 @@ self: { homepage = "https://github.com/facebookincubator/duckling#readme"; description = "A Haskell library for parsing text into structured data"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dumb-cas" = callPackage @@ -60701,7 +61773,6 @@ self: { homepage = "http://github.com/hsyl20/dynamic-linker-template"; description = "Automatically derive dynamic linking methods from a data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-loader" = callPackage @@ -60731,7 +61802,6 @@ self: { homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-object" = callPackage @@ -60816,6 +61886,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dynamic-state_0_3" = callPackage + ({ mkDerivation, base, binary, bytestring, hashable + , unordered-containers + }: + mkDerivation { + pname = "dynamic-state"; + version = "0.3"; + sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv"; + libraryHaskellDepends = [ + base binary bytestring hashable unordered-containers + ]; + description = "Optionally serializable dynamic state keyed by type"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion @@ -61179,6 +62265,7 @@ self: { ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ecdsa" = callPackage @@ -61569,7 +62656,6 @@ self: { libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems into Haskell using graded monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effective-aspects" = callPackage @@ -61650,6 +62736,18 @@ self: { homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "effin_0_3_0_3" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "effin"; + version = "0.3.0.3"; + sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x"; + libraryHaskellDepends = [ base mtl ]; + homepage = "https://github.com/YellPika/effin"; + description = "A Typeable-free implementation of extensible effects"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61804,6 +62902,7 @@ self: { homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either" = callPackage @@ -61867,6 +62966,27 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "ekg_0_4_0_14" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "ekg"; + version = "0.4.0.14"; + sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + revision = "1"; + editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath network snap-core + snap-server text time transformers unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61903,7 +63023,6 @@ self: { homepage = "http://github.com/ocharles/ekg-carbon"; description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-cloudwatch" = callPackage @@ -61944,6 +63063,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-core_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, ghc-prim, text + , unordered-containers + }: + mkDerivation { + pname = "ekg-core"; + version = "0.1.1.2"; + sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm"; + libraryHaskellDepends = [ + base containers ghc-prim text unordered-containers + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-elastic" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname , http-client, lens, text, time, unordered-containers, wreq @@ -62010,6 +63147,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-json_0_1_0_6" = callPackage + ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers + }: + mkDerivation { + pname = "ekg-json"; + version = "0.1.0.6"; + sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; + libraryHaskellDepends = [ + aeson base ekg-core text unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-json"; + description = "JSON encoding of ekg metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-log" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, ekg-core , fast-logger, filepath, text, time, unix, unordered-containers @@ -62104,6 +63257,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-statsd_0_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.1.1"; + sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k"; + libraryHaskellDepends = [ + base bytestring ekg-core network text time unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-statsd"; + description = "Push metrics to statsd"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-wai" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers @@ -62133,7 +63303,6 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elenco-albero" = callPackage @@ -62728,6 +63897,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.1"; + sha256 = "0fzbaxshhlg97pm66yjhz7fxxq9j1m3k0sqslzngh36r8aw9l66j"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -62955,17 +64142,22 @@ self: { }) {}; "encoding" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , extensible-exceptions, filepath, ghc-prim, HaXml, HUnit, mtl + , QuickCheck, regex-compat }: mkDerivation { pname = "encoding"; - version = "0.8.1"; - sha256 = "1fddj2m3xv8zfz6bmgks3ynib6hk7bzq2j3bsazr71m769a9hvyr"; + version = "0.8.2"; + sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353"; + setupHaskellDepends = [ + base Cabal containers filepath ghc-prim HaXml + ]; libraryHaskellDepends = [ array base binary bytestring containers extensible-exceptions - ghc-prim HaXml mtl regex-compat + ghc-prim mtl regex-compat ]; + testHaskellDepends = [ base bytestring HUnit QuickCheck ]; homepage = "http://code.haskell.org/encoding/"; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; @@ -63021,7 +64213,6 @@ self: { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -63059,7 +64250,6 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-wai" = callPackage @@ -63078,7 +64268,6 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -63170,7 +64359,6 @@ self: { homepage = "https://github.com/sboosali/enumerate"; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enumerate-function" = callPackage @@ -63406,7 +64594,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -63519,7 +64706,6 @@ self: { homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epub-tools" = callPackage @@ -63542,7 +64728,6 @@ self: { homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epubname" = callPackage @@ -63592,7 +64777,6 @@ self: { homepage = "http://code.haskell.org/~thielema/equal-files/"; description = "Shell command for finding equal files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equational-reasoning" = callPackage @@ -63840,8 +65024,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "error-util"; - version = "0.0.1.1"; - sha256 = "14z1yffg0lxyjqf5zpfcz493zh8y4p9d2abmdzvf56qx47r37lb8"; + version = "0.0.1.2"; + sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; @@ -63926,6 +65110,35 @@ self: { homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ersatz_0_4_1" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest + , filepath, lens, mtl, parsec, process, temporary, transformers + , unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.1"; + sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + homepage = "http://github.com/ekmett/ersatz"; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersatz-toysat" = callPackage @@ -64038,7 +65251,6 @@ self: { homepage = "https://github.com/bitemyapp/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -64589,6 +65801,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-core_0_2_0" = callPackage + ({ mkDerivation, aeson, base, containers, contravariant, hspec + , http-api-data, HUnit, path-pieces, sum-type-boilerplate + , template-haskell, text, transformers, uuid + }: + mkDerivation { + pname = "eventful-core"; + version = "0.2.0"; + sha256 = "06chbjrxfxk0fr9lgdic6bmylnv3kz398l9drqr85r6qk1s5xxg0"; + libraryHaskellDepends = [ + aeson base containers contravariant http-api-data path-pieces + sum-type-boilerplate template-haskell text transformers uuid + ]; + testHaskellDepends = [ + aeson base containers contravariant hspec http-api-data HUnit + path-pieces sum-type-boilerplate template-haskell text transformers + uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Core module for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base , bytestring, conduit, eventful-core, eventful-test-helpers, hlint @@ -64615,6 +65851,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventful-dynamodb_0_2_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base + , bytestring, conduit, eventful-core, eventful-test-helpers, hspec + , HUnit, lens, QuickCheck, quickcheck-instances, safe, text + , unordered-containers, vector + }: + mkDerivation { + pname = "eventful-dynamodb"; + version = "0.2.0"; + sha256 = "17ip1dr1jqrzy0hg5yjnv4a8qkgsab02jcbswlxfd3q7xx3d473b"; + libraryHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core lens safe text unordered-containers vector + ]; + testHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core eventful-test-helpers hspec HUnit lens QuickCheck + quickcheck-instances safe text unordered-containers vector + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Library for eventful DynamoDB event stores"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-memory" = callPackage ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm @@ -64635,6 +65896,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-memory_0_2_0" = callPackage + ({ mkDerivation, base, containers, eventful-core + , eventful-test-helpers, hspec, HUnit, mtl, safe, stm + }: + mkDerivation { + pname = "eventful-memory"; + version = "0.2.0"; + sha256 = "1fdd2z13lnk1zxhylriwblz96x90v4504abrj9rfbi732853wz3a"; + libraryHaskellDepends = [ + base containers eventful-core mtl safe stm + ]; + testHaskellDepends = [ + base containers eventful-core eventful-test-helpers hspec HUnit mtl + safe stm + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "In-memory implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-postgresql" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit @@ -64659,6 +65941,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventful-postgresql_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl + , persistent, persistent-postgresql, text + }: + mkDerivation { + pname = "eventful-postgresql"; + version = "0.2.0"; + sha256 = "05syf8ychcnyl4q1q3afn4nqp4sw38y4c3p97b1h5gdanbsnis3b"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hspec HUnit mtl persistent + persistent-postgresql text + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Postgres implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-sql-common" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl , persistent, persistent-template, text, uuid @@ -64676,6 +65982,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-sql-common_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl + , persistent, persistent-template, text, uuid + }: + mkDerivation { + pname = "eventful-sql-common"; + version = "0.2.0"; + sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core mtl persistent + persistent-template text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Common library for SQL event stores"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit @@ -64699,6 +66023,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-sqlite_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl + , persistent, persistent-sqlite, text, uuid + }: + mkDerivation { + pname = "eventful-sqlite"; + version = "0.2.0"; + sha256 = "1vyz8401n63gqwgl1fa9dw1ar1dgki4hy6ably8lh2hzpl7fmfy0"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text uuid + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hspec HUnit mtl persistent persistent-sqlite + text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "SQLite implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventful-test-helpers" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra , hspec, monad-logger, text @@ -64715,6 +66063,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventful-test-helpers_0_2_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra + , hspec, monad-logger, text + }: + mkDerivation { + pname = "eventful-test-helpers"; + version = "0.2.0"; + sha256 = "1q5z9rf5hxwpsyvm28hfnkr72zfsg7h5kz648bass9irvq69v7x9"; + libraryHaskellDepends = [ + aeson aeson-casing base eventful-core extra hspec monad-logger text + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Common module used for eventful tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eventloop" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-utilities , deepseq, network, stm, suspend, text, timers, websockets @@ -65055,7 +66420,6 @@ self: { ]; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mtl" = callPackage @@ -65189,8 +66553,8 @@ self: { pname = "exference"; version = "1.6.0.0"; sha256 = "1lnalnsn3zjcwhl8p1035ckjgp4kpjv6kfai4dqqji2rpbm1sgrh"; - revision = "3"; - editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3"; + revision = "4"; + editedCabalFile = "1yrc2p8p48cx8qjpyvfqpbvs8dcv2m5k5x89s04jk9ic26wdwk9k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65223,7 +66587,6 @@ self: { homepage = "http://github.com/ocharles/exhaustive"; description = "Compile time checks that a computation considers producing data through all possible constructors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exherbo-cabal" = callPackage @@ -65285,7 +66648,6 @@ self: { homepage = "https://github.com/k0001/exinst"; description = "Recover type indexes and instances for your existentialized types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-aeson" = callPackage @@ -65364,7 +66726,6 @@ self: { ]; description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -65393,17 +66754,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exitcode" = callPackage + ({ mkDerivation, base, checkers, lens, mtl, QuickCheck + , semigroupoids, semigroups, tasty, tasty-hunit, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "exitcode"; + version = "0.1.0.0"; + sha256 = "0nkb1mbgmb67qc57s2ypcpg8ky905bqy8ns9y7zq6hmizmyn34f3"; + revision = "1"; + editedCabalFile = "077gibwagbkr07lgj8gy2bziam9zb320ry6z889zkqpg74fskbi1"; + libraryHaskellDepends = [ + base lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck + transformers + ]; + homepage = "https://github.com/qfpl/exitcode"; + description = "Monad transformer for exit codes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exp-extended" = callPackage ({ mkDerivation, base, compensated, log-domain }: mkDerivation { pname = "exp-extended"; version = "0.1.1.2"; sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r"; + revision = "1"; + editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr"; libraryHaskellDepends = [ base compensated log-domain ]; - homepage = "http://code.mathr.co.uk/exp-extended"; + homepage = "https://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-pairs" = callPackage @@ -65734,6 +67119,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_3" = callPackage + ({ mkDerivation, base, comonad, constraints, criterion, deepseq + , effin, extensible-effects, freer-effects, ghc-prim, lens + , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar + , tagged, template-haskell, transformers + }: + mkDerivation { + pname = "extensible"; + version = "0.4.3"; + sha256 = "0ix1dran0s17jpdzcwai79snfmls8al7a34b0sysgkp75g8lrgca"; + libraryHaskellDepends = [ + base comonad constraints deepseq ghc-prim monad-skeleton mtl + primitive profunctors semigroups StateVar tagged template-haskell + transformers + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion effin extensible-effects freer-effects lens mtl + ]; + homepage = "https://github.com/fumieval/extensible"; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -65915,6 +67325,23 @@ self: { homepage = "https://github.com/wuest/haskell-extralife-api"; description = "API Client for ExtraLife team and user data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "extrapolate" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.2.1"; + sha256 = "0bb02q5pb3lx5ass9265qb25fn0g30drv0b5250njagc1gi69nrl"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate template-haskell ]; + homepage = "https://github.com/rudymatela/extrapolate#readme"; + description = "generalize counter-examples of test properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -65979,7 +67406,6 @@ self: { homepage = "http://functionalley.eu/Factory/factory.html"; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "factual-api" = callPackage @@ -66331,7 +67757,6 @@ self: { homepage = "https://github.com/elaforge/fast-tags"; description = "Fast incremental vi and emacs tags"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tagsoup" = callPackage @@ -66448,18 +67873,18 @@ self: { "fastparser" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, containers - , microlens, thyme, vector-space + , criterion, kan-extensions, microlens, thyme, transformers + , vector-space }: mkDerivation { pname = "fastparser"; - version = "0.3.0"; - sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4"; - revision = "1"; - editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi"; + version = "0.3.0.1"; + sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15"; libraryHaskellDepends = [ - base bytestring bytestring-lexing containers microlens thyme - vector-space + base bytestring bytestring-lexing containers kan-extensions + microlens thyme transformers vector-space ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/bartavelle/fastparser#readme"; description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; @@ -66545,19 +67970,21 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.20.0.1"; - sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr"; + version = "0.21.0.0"; + sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -66575,6 +68002,7 @@ self: { ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -66588,6 +68016,7 @@ self: { homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-geoposition" = callPackage @@ -66601,6 +68030,7 @@ self: { homepage = "https://github.com/victoredwardocallaghan/fay-geoposition"; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -66628,6 +68058,7 @@ self: { homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -66641,6 +68072,7 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-simplejson" = callPackage @@ -66668,6 +68100,7 @@ self: { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -66681,6 +68114,7 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -66712,7 +68146,6 @@ self: { homepage = "https://github.com/psibi/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -66905,13 +68338,19 @@ self: { }) {}; "feature-flipper" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, text }: + ({ mkDerivation, base, bytestring, containers, digest, hspec, mtl + , text + }: mkDerivation { pname = "feature-flipper"; - version = "0.2.0.1"; - sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ base containers hspec mtl ]; + version = "0.2.1.2"; + sha256 = "18g90xvbgxzj2in8v3y7s6p305h0rg5p5163262vi9cdi7lrvvc8"; + libraryHaskellDepends = [ + base bytestring containers digest mtl text + ]; + testHaskellDepends = [ + base bytestring containers digest hspec mtl text + ]; homepage = "https://github.com/toddmohney/flipper#readme"; description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; @@ -66924,8 +68363,8 @@ self: { }: mkDerivation { pname = "feature-flipper-postgres"; - version = "0.1.0.1"; - sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95"; + version = "0.1.1.1"; + sha256 = "186khsn3gqxqhxlah6m8fgl4qlwf3pgmqagvr8rnfv44vzynw8by"; libraryHaskellDepends = [ base bytestring containers feature-flipper monad-logger mtl persistent persistent-postgresql persistent-template text time @@ -67455,6 +68894,25 @@ self: { pname = "fgl"; version = "5.5.3.1"; sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; + revision = "1"; + editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fgl_5_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.6.0.0"; + sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -67462,6 +68920,7 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -67797,6 +69256,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_2" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.2"; + sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + homepage = "http://github.com/takano-akio/filelock"; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -67865,6 +69338,7 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -68047,6 +69521,30 @@ self: { homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; + }) {}; + + "find-clumpiness_0_2_2_0" = callPackage + ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness + , containers, listsafe, mtl, optparse-applicative, text, text-show + , tree-fun, unordered-containers, vector + }: + mkDerivation { + pname = "find-clumpiness"; + version = "0.2.2.0"; + sha256 = "174i1yhd7z884xfci8ml9kbcm0qpnsbryj8vchrd7rwi63ya0rbw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers listsafe + mtl text text-show tree-fun unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + optparse-applicative text tree-fun unordered-containers + ]; + homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; + description = "Find the clumpiness of labels in a tree"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68235,7 +69733,6 @@ self: { homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fit" = callPackage @@ -68277,8 +69774,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.1"; - sha256 = "0smv851kg4p4qfp29h85zm87x5y3qmqd3hxmznnf7cdp7arxgc74"; + version = "0.4.3"; + sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -68309,7 +69806,6 @@ self: { ]; description = "Program to manage the imports of a haskell module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fix-parser-simple" = callPackage @@ -68497,6 +69993,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-vector-hetero_0_3_1_2" = callPackage + ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive + , transformers + }: + mkDerivation { + pname = "fixed-vector-hetero"; + version = "0.3.1.2"; + sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd"; + libraryHaskellDepends = [ + base deepseq fixed-vector ghc-prim primitive transformers + ]; + homepage = "http://github.org/Shimuuar/fixed-vector-hetero"; + description = "Generic heterogeneous vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-width" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68656,7 +70169,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fizzbuzz" = callPackage @@ -69096,6 +70608,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flow_1_0_8" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.8"; + sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + homepage = "https://github.com/tfausak/flow#readme"; + description = "Write more understandable Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -69275,8 +70801,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.4"; - sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; + version = "0.5.3.9"; + sha256 = "1cvrknfg6h9w6njyx7w87qw19nd3n5615qxaf25fygd5yggydb19"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -69462,6 +70988,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt_0_4_0_0" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, containers, criterion, deepseq, formatting, hspec + , interpolate, microlens, neat-interpolation, text, text-format + , time, time-locale-compat, vector + }: + mkDerivation { + pname = "fmt"; + version = "0.4.0.0"; + sha256 = "0ksc8nx3v26y7k25a4x0knbmy9f5c9sa7j54b6fp4xb93bcdn76h"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring containers + microlens text text-format time time-locale-compat + ]; + testHaskellDepends = [ + base bytestring containers hspec neat-interpolation text vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text text-format vector + ]; + homepage = "http://github.com/aelve/fmt"; + description = "A new formatting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai @@ -69516,6 +71069,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "focus_0_1_5_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "focus"; + version = "0.1.5.2"; + sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/focus"; + description = "A general abstraction for manipulating elements of container data structures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fold-debounce" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time @@ -69636,7 +71202,6 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "foldl-transduce" = callPackage @@ -69712,6 +71277,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "folds_0_7_4" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal + , cabal-doctest, comonad, constraints, contravariant, data-reify + , deepseq, directory, distributive, doctest, filepath, lens, mtl + , pointed, profunctors, reflection, semigroupoids, semigroups + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "folds"; + version = "0.7.4"; + sha256 = "0wj5fd3icj05w3lziv4rmqahsh42kzckxybjacyvwb45kiy6yvjw"; + configureFlags = [ "-f-test-hlint" ]; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids transformers unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory doctest filepath mtl semigroups + ]; + homepage = "http://github.com/ekmett/folds"; + description = "Beautiful Folding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "folds-common" = callPackage ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck }: @@ -70066,7 +71658,6 @@ self: { homepage = "https://github.com/agrafix/format-numbers#readme"; description = "Various number formatting functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "format-status" = callPackage @@ -70248,6 +71839,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "forward-chan" = callPackage + ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: + mkDerivation { + pname = "forward-chan"; + version = "0.0.0.0"; + sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f"; + libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ]; + homepage = "http://github.com/mmirman/forward-chan"; + description = "Concurrent channels with a forwarding primitive"; + license = stdenv.lib.licenses.asl20; + }) {}; + "foscam-directory" = callPackage ({ mkDerivation, base, directory, doctest, filepath , foscam-filename, lens, pretty, QuickCheck, template-haskell @@ -70334,7 +71937,6 @@ self: { homepage = "https://github.com/haskell-foundation/foundation"; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -70634,7 +72236,6 @@ self: { homepage = "https://github.com/salemove/freddy-hs"; description = "RabbitMQ Messaging API supporting request-response"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free" = callPackage @@ -70851,7 +72452,6 @@ self: { homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -70931,7 +72531,6 @@ self: { homepage = "https://gitlab.com/queertypes/freer"; description = "Implementation of the Freer Monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-converse" = callPackage @@ -71105,7 +72704,6 @@ self: { homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -71141,7 +72739,6 @@ self: { homepage = "https://github.com/TomMD/friday-juicypixels"; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-scale-dct" = callPackage @@ -71487,7 +73084,6 @@ self: { homepage = "https://github.com/ixmatus/fswait"; description = "Wait and observe events on the filesystem for a path, with a timeout"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatcher" = callPackage @@ -71534,8 +73130,8 @@ self: { }: mkDerivation { pname = "ftp-client"; - version = "0.4.0.1"; - sha256 = "0k0vyyaqkpmz4znc6gvdjk3g5qfximgdac9qh252icz30fhr3bn4"; + version = "0.5.0.0"; + sha256 = "17i6jml4v88wy456p3gjzc93db1sr0p5q19vb3jw61648nmswvgb"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -71552,8 +73148,8 @@ self: { }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.4.0.1"; - sha256 = "17rrirya6bk17qprzrjl6ndsyszqvwz5bya7l68wyqr4715gbaxs"; + version = "0.5.0.0"; + sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06"; libraryHaskellDepends = [ base bytestring conduit-combinators connection exceptions ftp-client resourcet @@ -72166,7 +73762,6 @@ self: { ]; description = "A 'ten past six' style clock"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fwgl" = callPackage @@ -72292,7 +73887,6 @@ 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 @@ -72420,8 +74014,8 @@ self: { }: mkDerivation { pname = "gc"; - version = "0.0.1"; - sha256 = "15jz191njpd1jfx2x2xvqpvsz81mifspj37xhgqsxlk6vb2a3xb1"; + version = "0.0.2"; + sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ @@ -72721,6 +74315,7 @@ self: { homepage = "https://github.com/anfelor/gen-passwd#readme"; description = "Create wordlist-based passwords easily"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gencheck" = callPackage @@ -72981,12 +74576,18 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors + , QuickCheck + }: mkDerivation { pname = "generic-lens"; - version = "0.2.0.0"; - sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.1"; + sha256 = "0wkshjzwvlpmxbfr96l1c485rwn21zfgcngkchj2c04amq1fiqs8"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; homepage = "https://github.com/kcsongor/generic-lens"; description = "Generic data-structure operations exposed as lenses"; license = stdenv.lib.licenses.bsd3; @@ -73353,7 +74954,6 @@ self: { homepage = "https://github.com/danr/genifunctors"; description = "Generate generalized fmap, foldMap and traverse"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geniplate" = callPackage @@ -73444,6 +75044,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-aeson" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, genvalidity-vector, hspec + , QuickCheck, validity, validity-aeson + }: + mkDerivation { + pname = "genvalidity-aeson"; + version = "0.0.0.0"; + sha256 = "0pb84fg17vwmy95naaw1bl77pjvs9rzwgqnp8p0abh04qr9bxgh2"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring @@ -73480,7 +75103,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -73500,7 +75122,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -73522,7 +75143,6 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -73557,7 +75177,6 @@ self: { homepage = "http://cs-syd.eu"; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -73596,7 +75215,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -73616,6 +75234,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-scientific" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, scientific, validity, validity-scientific + }: + mkDerivation { + pname = "genvalidity-scientific"; + version = "0.0.0.0"; + sha256 = "1s4gca2nkfhs5yzp0xnjy0fbadg4bphfd533z8zachh2ycwi69kh"; + libraryHaskellDepends = [ + base genvalidity QuickCheck scientific validity validity-scientific + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck scientific + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text @@ -73633,7 +75270,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -73651,7 +75287,46 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "genvalidity-unordered-containers" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "1yvav983wq3rff5k9fpjw6m8hsn3jxymfqklw4vc5m0g5v4al8f9"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-vector" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.0.0.0"; + sha256 = "032dkx4wzla7aap31122f0cw31h8f5j36dq7xmvd2q9ssrcr39h7"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; }) {}; "geo-resolver" = callPackage @@ -73757,7 +75432,6 @@ self: { homepage = "https://github.com/PaulJohnson/geodetics"; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -73785,7 +75459,6 @@ self: { ]; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geojson" = callPackage @@ -74552,6 +76225,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_0_2" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.0.2"; + sha256 = "0qcz4283gm9hxnqx462rdn1r3q9jmad19b3y8n0z4lsrpfziynq1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + executableHaskellDepends = [ base containers scientific text ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + homepage = "https://github.com/maoe/ghc-prof"; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -74653,7 +76350,6 @@ self: { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -75011,7 +76707,6 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -75048,7 +76743,6 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-jsffi" = callPackage @@ -75263,6 +76957,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_14" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.14"; + sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, text, transformers @@ -75287,6 +77003,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.14"; + sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + doHaddock = false; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -75306,6 +77048,29 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; + }) {gtk3 = pkgs.gnome3.gtk;}; + + "gi-gdk_3_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.14"; + sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gdk bindings"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; @@ -75330,6 +77095,50 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gdkpixbuf_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.14"; + sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gdk_pixbuf;}; + + "gi-ggit" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libgit2-glib, text, transformers + }: + mkDerivation { + pname = "gi-ggit"; + version = "1.0.1"; + sha256 = "08jfsfjvdbyd1m1si2r50frc4s3x5x9710r2np6wl1p0y3pk20cf"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libgit2-glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "libgit2-glib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) libgit2-glib;}; + "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers @@ -75350,26 +77159,47 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.14"; + sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , gobjectIntrospection, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.12"; - sha256 = "1fbyr65pc1i264f0cn43g1cbdzkvc5m0cdd997m2sx77nlc481m8"; + version = "1.0.14"; + sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base - text transformers + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage @@ -75392,6 +77222,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.14"; + sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, text, transformers @@ -75412,86 +77264,106 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.14"; + sha256 = "12w4fph341b6gxp6bd6xnrc4cs8bxhwkz33z4ndlkrb75a0289lg"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text - , transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gst"; - version = "1.0.12"; - sha256 = "08131f3smycwdpgpx2gkyb3aq3hi1g9gr4zx3isqi2pff7z2qrnb"; + version = "1.0.14"; + sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.12"; - sha256 = "1aidn8kc3i81hdh1xpiyv0nh4n0ncwdfyigv5n64jdf9j7faqp3z"; + version = "1.0.14"; + sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.13"; - sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b"; + version = "1.0.15"; + sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo - , gstreamer-pbutils, haskell-gi, haskell-gi-base, text - , transformers + , gstreamer-pbutils, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.12"; - sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3"; + version = "1.0.14"; + sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio - gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers + gi-gsttag gi-gstvideo haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; doHaddock = false; @@ -75504,16 +77376,16 @@ self: { "gi-gsttag" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.12"; - sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2"; + version = "1.0.14"; + sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-tag ]; doHaddock = false; @@ -75526,23 +77398,22 @@ self: { "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.12"; - sha256 = "0vi9c6bbqdl0x58nykmqyiffdvcs2mcgnd02kdpb2a7x2plfnvxs"; + version = "1.0.14"; + sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -75565,6 +77436,29 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; + }) {gtk3 = pkgs.gnome3.gtk;}; + + "gi-gtk_3_0_17" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.17"; + sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; @@ -75575,8 +77469,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.4.3"; - sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda"; + version = "0.3.5.0"; + sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -75584,22 +77478,21 @@ self: { homepage = "https://github.com/haskell-gi/gi-gtk-hs"; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi - , haskell-gi-base, text, transformers + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.12"; - sha256 = "0agqq13nc73c8m0cbk0c3gx5jdgmwv6kzpmiai33qyhyva7jn2jx"; + version = "2.0.14"; + sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; doHaddock = false; @@ -75613,24 +77506,23 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , text, transformers + , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.13"; - sha256 = "0fg6pzrs1r43gfcsmah7rm3p03pry84nryjv1p0ckd5g083pln6z"; + version = "3.0.15"; + sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtksourceview3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage @@ -75654,18 +77546,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; - "gi-javascriptcore_4_0_12" = callPackage + "gi-javascriptcore_4_0_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, text, transformers, webkitgtk + , haskell-gi-base, haskell-gi-overloading, text, transformers + , webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.12"; - sha256 = "1wwpapn0w461njr13raws2i7aazkrsw1254aim0a2lc6h0xapbg3"; + version = "4.0.14"; + sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75677,17 +77570,17 @@ self: { "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libnotify, text, transformers }: mkDerivation { pname = "gi-notify"; - version = "0.7.12"; - sha256 = "0rc9frrg43blwsxpjyqjrrrjgq10p1hpnfrp1vd6jq3prbh0pp36"; + version = "0.7.14"; + sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libnotify ]; doHaddock = false; @@ -75699,17 +77592,17 @@ self: { "gi-ostree" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, ostree, text, transformers }: mkDerivation { pname = "gi-ostree"; - version = "1.0.3"; - sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj"; + version = "1.0.5"; + sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ ostree ]; doHaddock = false; @@ -75742,22 +77635,48 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; + + "gi-pango_1_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.15"; + sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + doHaddock = false; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, pango, text, transformers + , haskell-gi-base, haskell-gi-overloading, pango, text + , transformers }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.13"; - sha256 = "0gs9cpd1a8imkqcd995hp6kjk6v8ai6mlqc9rm5jv0hvicjr948g"; + version = "1.0.15"; + sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; @@ -75768,22 +77687,21 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler - , text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, poppler, text, transformers }: mkDerivation { pname = "gi-poppler"; - version = "0.18.12"; - sha256 = "04dza9hh8bbn5i6qhk5140ii5nxd9xpz6xfcfd8a08r0bsav35zp"; + version = "0.18.14"; + sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject - haskell-gi haskell-gi-base text transformers + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ poppler ]; doHaddock = false; @@ -75795,17 +77713,17 @@ self: { "gi-secret" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text - , transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsecret, text, transformers }: mkDerivation { pname = "gi-secret"; - version = "0.0.2"; - sha256 = "18f2nyx79bk9mixmi5xbzmvylb4q1gxgqzynl2y77zhd3q3fcgzc"; + version = "0.0.4"; + sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsecret ]; doHaddock = false; @@ -75835,19 +77753,42 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) libsoup;}; + "gi-soup_2_4_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsoup, text, transformers + }: + mkDerivation { + pname = "gi-soup"; + version = "2.4.14"; + sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libsoup ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Libsoup bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome2) libsoup;}; + "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, text, transformers, vte + , haskell-gi-base, haskell-gi-overloading, text, transformers, vte }: mkDerivation { pname = "gi-vte"; - version = "2.91.14"; - sha256 = "1xvv91q99918rbbkk3q2vy8sg22dh835ih51mibmz994r4pgh82s"; + version = "2.91.16"; + sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base text transformers + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers ]; libraryPkgconfigDepends = [ vte ]; doHaddock = false; @@ -75881,21 +77822,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "gi-webkit_3_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3 + }: + mkDerivation { + pname = "gi-webkit"; + version = "3.0.14"; + sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "WebKit bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; + "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk - , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkitgtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.12"; - sha256 = "1c392g4gk8mzrkr6d4rw6nbriyqc41nzl8svwpg0xa2bwpakz33z"; + version = "4.0.14"; + sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi - haskell-gi-base text transformers + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; @@ -75908,16 +77873,18 @@ self: { "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkitgtk-web-extension + , haskell-gi-overloading, text, transformers + , webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.12"; - sha256 = "0xyaxm0b9kijzpxf3dn0x6s9k0shkj7la7nyc4f5a04nkndv0gsi"; + version = "4.0.14"; + sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi haskell-gi-base text transformers + gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text + transformers ]; libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; @@ -75990,7 +77957,6 @@ self: { homepage = "https://bitbucket.org/tdammers/ginger"; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ginsu" = callPackage @@ -76057,6 +78023,7 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "giphy-api" = callPackage @@ -76084,7 +78051,6 @@ self: { homepage = "http://github.com/passy/giphy-api#readme"; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -76383,7 +78349,6 @@ self: { homepage = "https://github.com/Peaker/git-mediate"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-monitor" = callPackage @@ -76597,7 +78562,6 @@ self: { homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -76666,7 +78630,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -76687,7 +78650,6 @@ self: { homepage = "https://toktok.github.io/"; description = "Various Github helper utilities"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "github-types" = callPackage @@ -76729,6 +78691,8 @@ self: { pname = "github-webhook-handler"; version = "0.0.8"; sha256 = "1sjgnc1zl3xsv25nc71bw0dmj8z7iacf6b8cf8vc50v6c1a8i40x"; + revision = "1"; + editedCabalFile = "1nhwindcplcyyffvzw0cig1p0m8165laq3hv94s596rsi3b5pgqr"; libraryHaskellDepends = [ aeson base bytestring cryptohash github-types text transformers uuid vector @@ -76745,13 +78709,14 @@ self: { pname = "github-webhook-handler-snap"; version = "0.0.7"; sha256 = "149c40rp2r7ib6x256rpnfg56hhp1kxznmglppciq33s0bs2dxfl"; + revision = "1"; + editedCabalFile = "1l0c2xn41pylap7vw33r67pmmcafr1fdm04l9b8h206c270bsinm"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid ]; description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -77070,7 +79035,6 @@ self: { homepage = "http://github.com/passy/givegif#readme"; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gjk" = callPackage @@ -77286,7 +79250,6 @@ self: { homepage = "https://github.com/louispan/glazier-react#readme"; description = "ReactJS binding using Glazier and Pipes.Fluid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react-examples" = callPackage @@ -77310,7 +79273,6 @@ self: { homepage = "https://github.com/louispan/glazier-react#readme"; description = "Examples of using glazier-react"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react-widget" = callPackage @@ -77330,7 +79292,6 @@ self: { homepage = "https://github.com/louispan/glazier-react-widget#readme"; description = "Generic widget library using glazier-react"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gli" = callPackage @@ -77391,7 +79352,6 @@ self: { testHaskellDepends = [ base data-default hspec lens QuickCheck ]; description = "Glicko-2 implementation in Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glider-nlp" = callPackage @@ -77405,7 +79365,6 @@ self: { homepage = "https://github.com/klangner/glider-nlp"; description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glintcollider" = callPackage @@ -77604,6 +79563,8 @@ self: { pname = "gloss"; version = "1.11.1.1"; sha256 = "0lyns4jzh4najgbavlhalix6br1dc0smqrakj46ls30jp909bq0l"; + revision = "1"; + editedCabalFile = "1bxdf2kmdcqndg25jgh0l1bmr39795gxrcx0rgzcich4n8l88pvb"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -77621,7 +79582,6 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -77634,7 +79594,6 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-banana" = callPackage @@ -77673,6 +79632,8 @@ self: { pname = "gloss-examples"; version = "1.11.1.1"; sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1"; + revision = "1"; + editedCabalFile = "1l7hkyrl535wmw8afafsq3hj6b02zmm4skv1739h8wbpdc6255al"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77725,13 +79686,14 @@ self: { pname = "gloss-raster"; version = "1.11.1.1"; sha256 = "0ikwg3ckq82qysbc3jisvxylcq13x7cnwyci6gi6dys64vmrfy17"; + revision = "1"; + editedCabalFile = "1kx0n4kwy5xdg4b5b79a815y8yqcsld8s5p784qhgg92s0cmnsjf"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage @@ -77839,7 +79801,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-core" = callPackage @@ -77863,7 +79824,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-ekg" = callPackage @@ -77887,7 +79847,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-example" = callPackage @@ -77908,7 +79867,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gluturtle" = callPackage @@ -77922,7 +79880,6 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gmap" = callPackage @@ -77947,8 +79904,8 @@ self: { }: mkDerivation { pname = "gmndl"; - version = "0.4.0.2"; - sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8"; + version = "0.4.0.4"; + sha256 = "041g7mlgwk6yb3814cy93yvwfhk5gzdkms7d8dg312vnpykp2kl1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78013,30 +79970,29 @@ self: { }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, base, basic-prelude, binary, binary-conduit - , bytestring, conduit, conduit-extra, exceptions, extra - , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp - , tasty, tasty-hunit, text, time, transformers-base - , unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary + , binary-conduit, bytestring, conduit, conduit-extra, exceptions + , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty + , tasty-golden, tasty-hunit, text, time, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "gnss-converters"; - version = "0.3.3"; - sha256 = "1rhy280c6dx5s31maia9la6j3y62v4fjwbwhr26n5cg4xl1n3p5g"; + version = "0.3.11"; + sha256 = "0f6953pp35rgy2x51db3faawmnr7lsbrdihyi16kcqbffdwcni9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude conduit-extra exceptions extra lens - monad-control mtl resourcet rtcm sbp time transformers-base - unordered-containers + base basic-prelude conduit exceptions extra lens monad-control mtl + resourcet rtcm sbp time transformers-base vector ]; executableHaskellDepends = [ - base basic-prelude binary-conduit conduit conduit-extra resourcet + base basic-prelude binary-conduit conduit conduit-extra ]; testHaskellDepends = [ - base basic-prelude binary binary-conduit bytestring conduit - conduit-extra HUnit-approx lens resourcet rtcm sbp tasty - tasty-hunit text unordered-containers + aeson aeson-pretty base basic-prelude binary binary-conduit + bytestring conduit conduit-extra lens resourcet rtcm sbp tasty + tasty-golden tasty-hunit text unordered-containers ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -78089,6 +80045,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gnuplot_0_5_4_2" = callPackage + ({ mkDerivation, array, base, containers, data-accessor + , data-accessor-transformers, deepseq, filepath, process, temporary + , time, transformers, utility-ht + }: + mkDerivation { + pname = "gnuplot"; + version = "0.5.4.2"; + sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers data-accessor data-accessor-transformers + deepseq filepath process temporary time transformers utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; + description = "2D and 3D plots using gnuplot"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gnutls" = callPackage ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers }: @@ -78687,7 +80665,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-core" = callPackage @@ -78735,7 +80712,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataproc" = callPackage @@ -78868,7 +80844,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage @@ -79025,7 +81000,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-identity-toolkit" = callPackage @@ -79062,7 +81036,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-latencytest" = callPackage @@ -79099,7 +81072,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage @@ -79148,7 +81120,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-monitoring" = callPackage @@ -79353,7 +81324,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage @@ -79366,7 +81336,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-script" = callPackage @@ -79391,7 +81360,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage @@ -79417,7 +81385,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-shopping-content" = callPackage @@ -79430,7 +81397,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-siteverification" = callPackage @@ -79455,7 +81421,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-spectrum" = callPackage @@ -79600,7 +81565,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage @@ -79648,6 +81612,8 @@ self: { pname = "google-cloud"; version = "0.0.4"; sha256 = "16pv4iiladfsq92xnpj46xa91x5svk6qsmz5szwwb83fhkk7r9q9"; + revision = "1"; + editedCabalFile = "0512swl7ydlcjdbvcb2xm59q97yr3wxgh3sfdsz3zdm1y88qi18c"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types mtl random scientific stm text time unordered-containers @@ -79743,7 +81709,6 @@ self: { homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -79798,7 +81763,6 @@ self: { homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; description = "Get a signed JWT for Google Service Accounts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-search" = callPackage @@ -79832,7 +81796,6 @@ self: { homepage = "https://github.com/mpilgrem/google-static-maps#readme"; description = "Bindings to the Google Static Maps API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-translate" = callPackage @@ -79841,15 +81804,14 @@ self: { }: mkDerivation { pname = "google-translate"; - version = "0.4"; - sha256 = "0aa9prwp3sdai75dbywsq4qb96crz9dk6dkp7vl7ixbl2q1zxldc"; + version = "0.4.1"; + sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers ]; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "googleplus" = callPackage @@ -80078,7 +82040,6 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging"; description = "Core module for gore-and-ash with logging utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-network" = callPackage @@ -80145,6 +82106,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gotta-go-fast" = callPackage + ({ mkDerivation, base, brick, cmdargs, directory, random, text + , time, vty, word-wrap + }: + mkDerivation { + pname = "gotta-go-fast"; + version = "0.1.4.0"; + sha256 = "15gip4nggw3wxa3k546sqqbiqzhkw5acxwmwy3iv911d61s89gvb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick cmdargs directory random text time vty word-wrap + ]; + homepage = "https://github.com/hot-leaf-juice/gotta-go-fast"; + description = "A command line utility for practicing typing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gpah" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv , deepseq, directory, filepath, haskell-src-exts, hint, HTTP @@ -80372,7 +82351,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Examples using the Grapefruit library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-frp" = callPackage @@ -80389,7 +82367,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Functional Reactive Programming core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-records" = callPackage @@ -80402,7 +82379,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "A record system for Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-ui" = callPackage @@ -80420,7 +82396,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "Declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-ui-gtk" = callPackage @@ -80439,7 +82414,6 @@ self: { homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-core" = callPackage @@ -80511,7 +82485,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-cl" = callPackage @@ -80550,7 +82523,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -80573,7 +82545,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-layout" = callPackage @@ -80590,7 +82561,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-ski" = callPackage @@ -80611,7 +82581,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-strategies" = callPackage @@ -80628,7 +82597,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-trs" = callPackage @@ -80673,7 +82641,6 @@ self: { homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-serialize" = callPackage @@ -80719,6 +82686,7 @@ self: { homepage = "https://github.com/atzedijkstra/graph-visit"; description = "Graph walk abstraction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-wrapper" = callPackage @@ -80899,7 +82867,6 @@ self: { homepage = "https://github.com/jml/graphql-api#readme"; description = "Sketch of GraphQL stuff"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -81249,7 +83216,6 @@ self: { homepage = "https://github.com/mhwombat/grid#readme"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gridbounds" = callPackage @@ -81314,7 +83280,6 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grm" = callPackage @@ -81385,7 +83350,6 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-converters" = callPackage @@ -81429,6 +83393,30 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "groundhog-inspector_0_8_0_2" = callPackage + ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs + , containers, groundhog, groundhog-sqlite, groundhog-th, mtl + , regex-compat, syb, template-haskell, text, time, transformers + }: + mkDerivation { + pname = "groundhog-inspector"; + version = "0.8.0.2"; + sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson-pretty base bytestring containers groundhog groundhog-th + regex-compat syb template-haskell text time transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs containers groundhog groundhog-sqlite + groundhog-th mtl + ]; + homepage = "http://github.com/lykahb/groundhog"; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -81447,7 +83435,6 @@ self: { ]; description = "MySQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-postgresql" = callPackage @@ -81467,7 +83454,6 @@ self: { ]; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-sqlite" = callPackage @@ -81485,7 +83471,6 @@ self: { ]; description = "Sqlite3 backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-th" = callPackage @@ -81502,7 +83487,6 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "group-by-date" = callPackage @@ -81778,7 +83762,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -81892,7 +83875,7 @@ self: { libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; homepage = "http://www.haskell.org/gtk2hs/"; - description = "Bindings for the Gtk/OS X integration library"; + description = "Bindings for the Gtk/macOS integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {gtk-mac-integration-gtk2 = null;}; @@ -82156,7 +84139,7 @@ self: { libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; homepage = "http://www.haskell.org/gtk2hs/"; - description = "Bindings for the Gtk/OS X integration library"; + description = "Bindings for the Gtk/macOS integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {gtk-mac-integration-gtk3 = null;}; @@ -82779,7 +84762,6 @@ self: { homepage = "http://gregheartsfield.com/hS3/"; description = "Interface to Amazon's Simple Storage Service (S3)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hScraper" = callPackage @@ -82936,23 +84918,23 @@ self: { "hablog" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types - , mtl, optparse-applicative, scotty, scotty-tls, text, transformers + , mtl, network-uri, optparse-applicative, rss, scotty, scotty-tls + , text, time, transformers }: mkDerivation { pname = "hablog"; - version = "0.5.1"; - sha256 = "178j0jv38yi5hq2lb9sq8rjxbpvb1y8anqal2mgh7crxkch3llqs"; + version = "0.6.0"; + sha256 = "0373kjd67iivrrr6kcjrhcqkk2wrxfx9zz3qn58mhycp8w78biaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bifunctors blaze-html blaze-markup bytestring containers - directory filepath markdown mime-types mtl scotty scotty-tls text - transformers + directory filepath markdown mime-types mtl network-uri rss scotty + scotty-tls text time transformers ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -83388,7 +85370,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-interface-wai"; description = "Hack2 interface to WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-db" = callPackage @@ -83479,7 +85460,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-plot"; description = "Generate cumulative graphs of hackage uploads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-processing" = callPackage @@ -83541,7 +85521,6 @@ self: { homepage = "https://github.com/well-typed/hackage-security"; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security" = callPackage @@ -83647,7 +85626,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-sparks"; description = "Generate sparkline graphs of hackage statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-whatsnew" = callPackage @@ -83682,7 +85660,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage2hwn"; description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2twitter" = callPackage @@ -83880,7 +85857,6 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddock_2_18_1" = callPackage @@ -83950,6 +85926,8 @@ self: { pname = "haddock-api"; version = "2.17.4"; sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss"; + revision = "1"; + editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath @@ -83970,6 +85948,8 @@ self: { pname = "haddock-api"; version = "2.18.1"; sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8"; + revision = "1"; + editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath @@ -84037,14 +86017,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddock-library_1_4_4" = callPackage + "haddock-library_1_4_5" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq , hspec, QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; - version = "1.4.4"; - sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9"; + version = "1.4.5"; + sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; libraryHaskellDepends = [ attoparsec base bytestring transformers ]; @@ -84135,6 +86115,7 @@ self: { homepage = "http://github.com/jystic/hadoop-rpc"; description = "Use the Hadoop RPC interface from Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-tools" = callPackage @@ -84306,6 +86287,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hailgun_0_4_1_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, email-validate + , exceptions, filepath, http-client, http-client-tls, http-types + , tagsoup, text, time, transformers + }: + mkDerivation { + pname = "hailgun"; + version = "0.4.1.5"; + sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; + libraryHaskellDepends = [ + aeson base bytestring email-validate exceptions filepath + http-client http-client-tls http-types tagsoup text time + transformers + ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; + description = "Mailgun REST api interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hailgun-send" = callPackage ({ mkDerivation, base, bytestring, configurator, hailgun, text }: mkDerivation { @@ -84717,7 +86718,6 @@ self: { homepage = "http://github.com/Minoru/hakyll-convert"; description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -84763,7 +86763,6 @@ self: { homepage = "https://gitlab.com/aergus/hakyll-filestore"; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -84776,7 +86775,6 @@ self: { homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -84806,7 +86804,6 @@ self: { homepage = "https://github.com/oisdk/hakyll-series"; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -84824,7 +86821,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -84954,7 +86950,6 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halma-gui" = callPackage @@ -85072,7 +87067,6 @@ self: { homepage = "https://github.com/mstksg/hamilton"; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamlet" = callPackage @@ -85441,6 +87435,8 @@ self: { pname = "hapistrano"; version = "0.3.2.2"; sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7"; + revision = "1"; + editedCabalFile = "0rx3hs8z717cmx3l97fjmyz94i0n25f69x2rk3nvgnldskvjxswv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85458,6 +87454,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_2_4" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath, hspec + , mtl, optparse-applicative, path, path-io, process, stm, temporary + , time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.2.4"; + sha256 = "08p1060m9wjxgxai5zxhzv40c0h9xsdvcbdg33b20hzyapzgq6kl"; + revision = "1"; + editedCabalFile = "0cvbn9a7jhq8nr1cwfij5bm030d662s5hn287q5w5wx5xmmzsn9m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base optparse-applicative path path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -85628,6 +87653,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -85795,8 +87821,8 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.9"; - sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n"; + version = "0.5.9.1"; + sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base @@ -86012,7 +88038,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "happstack-server_7_5_0" = callPackage + "happstack-server_7_5_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -86023,8 +88049,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.0"; - sha256 = "0ybwzb9w6mzw9mjr10rpih9hh1cs4v0wdaizl7p5l34xk441qaxw"; + version = "7.5.0.1"; + sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -86059,6 +88085,25 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) openssl;}; + + "happstack-server-tls_7_1_6_4" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions + , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile + , time, unix + }: + mkDerivation { + pname = "happstack-server-tls"; + version = "7.1.6.4"; + sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions happstack-server hslogger + HsOpenSSL network sendfile time unix + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.happstack.com/"; + description = "extend happstack-server with https:// support (TLS/SSL)"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; @@ -86116,7 +88161,6 @@ self: { homepage = "https://github.com/scrive/happstack-static-routing"; description = "Support for static URL routing with overlap detection for Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-util" = callPackage @@ -86199,7 +88243,6 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happybara" = callPackage @@ -86303,7 +88346,6 @@ self: { homepage = "https://github.com/freizl/har"; description = "HAR spec in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "harchive" = callPackage @@ -86524,7 +88566,6 @@ self: { homepage = "https://github.com/zmactep/hasbolt#readme"; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -86540,7 +88581,6 @@ self: { homepage = "https://github.com/mekeor/hascal"; description = "tiny calculator library and command-line program"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascar" = callPackage @@ -86569,6 +88609,7 @@ self: { homepage = "https://github.com/VirtualForgeGmbH/hascar"; description = "Decompress SAPCAR archives"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascas" = callPackage @@ -86846,7 +88887,6 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashing" = callPackage @@ -87027,6 +89067,7 @@ self: { homepage = "http://github.com/singpolyma/haskades"; description = "Utility to generate bindings for BlackBerry Cascades"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskakafka" = callPackage @@ -87052,7 +89093,6 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -87073,7 +89113,6 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskarrow" = callPackage @@ -87238,6 +89277,32 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "haskell-abci" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, foundation, lens + , network-conduit, proto-lens, proto-lens-arbitrary + , proto-lens-protoc, text + }: + mkDerivation { + pname = "haskell-abci"; + version = "0.1.0.0"; + sha256 = "15d4hqld9f00vmc3cvjvhamfkcl60dfdmkkrd9yrqj044ml93kaf"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base binary bytestring conduit conduit-combinators conduit-extra + foundation lens network-conduit proto-lens proto-lens-arbitrary + proto-lens-protoc + ]; + executableHaskellDepends = [ + base binary bytestring foundation lens text + ]; + homepage = "https://github.com/cwgoes/haskell-abci#readme"; + description = "Haskell Application BlockChain Interface (ABCI) Server Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-aliyun" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude , blaze-builder, bytestring, case-insensitive, conduit, Crypto @@ -87376,10 +89441,25 @@ self: { homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {booleanlist = null;}; + "haskell-conll" = callPackage + ({ mkDerivation, base, containers, lens, pretty-show, protolude + , split, text + }: + mkDerivation { + pname = "haskell-conll"; + version = "0.1.0.1"; + sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga"; + libraryHaskellDepends = [ + base containers lens pretty-show protolude split text + ]; + homepage = "https://github.com/mgajda/haskell-conll#readme"; + description = "Core Types for NLP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-course-preludes" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -87444,6 +89524,7 @@ self: { homepage = "https://github.com/dilawar/haskell-eigen-util#README.md"; description = "Some utility functions for haskell-eigen library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-exp-parser" = callPackage @@ -87596,6 +89677,34 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_20_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.20.3"; + sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -87609,6 +89718,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_20_4" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.20.4"; + sha256 = "00kpn7rxg91im26109q1m3g6hyp8v46v50j3dddz002sj2zycifq"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi-base"; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + + "haskell-gi-overloading" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "haskell-gi-overloading"; + version = "1.0"; + sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry"; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Overloading support for haskell-gi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-go-checkers" = callPackage ({ mkDerivation, base, containers, gloss }: mkDerivation { @@ -87621,7 +89756,6 @@ self: { homepage = "https://github.com/prateekkumarweb/haskell-go-checkers"; description = "Go and Checkers game in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-google-trends" = callPackage @@ -87684,7 +89818,6 @@ self: { homepage = "https://github.com/ncaq/haskell-import-graph.git#readme"; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-in-space" = callPackage @@ -88199,7 +90332,6 @@ self: { homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta" = callPackage @@ -88291,6 +90423,22 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Haskell AST for efficient tooling"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-ast_0_8_1_0" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "0.8.1.0"; + sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88364,6 +90512,24 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-backend-ghc_0_8_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.8.1.0"; + sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88422,6 +90588,33 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Background process for Haskell-tools refactor that editors can connect to"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-daemon_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, Diff + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl + , network, process, references, split, strict, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.8.1.0"; + sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers Diff directory filepath ghc + ghc-paths haskell-tools-ast haskell-tools-prettyprint + haskell-tools-refactor mtl network process references split strict + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc HUnit network process + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88445,6 +90638,28 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-debug_0_8_1_0" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, references, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "0.8.1.0"; + sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-prettyprint + haskell-tools-refactor references template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88476,6 +90691,36 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-demo_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.8.1.0"; + sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88494,6 +90739,23 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Pretty printing of Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-prettyprint_0_8_1_0" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "0.8.1.0"; + sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88525,6 +90787,36 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-refactor_0_8_1_0" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "0.8.1.0"; + sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88548,6 +90840,28 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-rewrite_0_8_1_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.8.1.0"; + sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -89258,6 +91572,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskintex_0_8_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text + , transformers + }: + mkDerivation { + pname = "haskintex"; + version = "0.8.0.0"; + sha256 = "1n6xbk8mc4n7a7w9hw2q21ya784jd2wqfvx54iqz9fik5w8p8jcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers directory filepath + haskell-src-exts HaTeX hint parsec process text transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "http://daniel-diaz.github.io/projects/haskintex"; + description = "Haskell Evaluation inside of LaTeX code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams , io-streams, time, vector @@ -89798,6 +92134,36 @@ self: { homepage = "https://github.com/contivero/hasmin#readme"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hasmin_0_3_2_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, text + }: + mkDerivation { + pname = "hasmin"; + version = "0.3.2.4"; + sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers matrix mtl numbers parsers + text + ]; + executableHaskellDepends = [ + attoparsec base bytestring containers gitrev hopfli matrix mtl + numbers optparse-applicative parsers text + ]; + testHaskellDepends = [ + attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion directory text ]; + homepage = "https://github.com/contivero/hasmin#readme"; + description = "CSS Minifier"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -89861,6 +92227,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_18_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.18.1"; + sha256 = "1cmr3l9gb639spqdw8if1da23qhlifr4jyxgfmy61l81mm42zjfb"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -89944,7 +92340,6 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-generic" = callPackage @@ -89988,7 +92383,6 @@ self: { homepage = "https://github.com/tvh/hasql-migration"; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-optparse-applicative" = callPackage @@ -90104,7 +92498,6 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-transaction"; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -90268,7 +92661,6 @@ self: { homepage = "http://bitbucket.org/sras/hastily"; description = "A program to download subtitle files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasty-hamiltonian" = callPackage @@ -90330,7 +92722,6 @@ self: { ]; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hath" = callPackage @@ -90526,7 +92917,6 @@ self: { homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl_0_5_1_0" = callPackage @@ -90573,7 +92963,6 @@ self: { homepage = "http://github.com/tvh/haxl-amazonka#readme"; description = "Haxl data source for accessing AWS services through amazonka"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl-facebook" = callPackage @@ -90645,7 +93034,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -90958,7 +93346,6 @@ self: { homepage = "https://www.bytelabs.org/project/haskell-bottom-up-rewrite-generator/"; description = "Haskell Bottom Up Rewrite Generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcc" = callPackage @@ -91502,7 +93889,6 @@ self: { ]; description = "A Digital Ocean client in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdocs" = callPackage @@ -91645,6 +94031,24 @@ self: { homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "heaps_0_3_5" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest + , filepath + }: + mkDerivation { + pname = "heaps"; + version = "0.3.5"; + sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; + revision = "1"; + editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/heaps/"; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -91730,7 +94134,6 @@ self: { homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog" = callPackage @@ -91757,7 +94160,6 @@ self: { homepage = "https://hedgehog.qa"; description = "Hedgehog will eat all your bugs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-quickcheck" = callPackage @@ -92272,7 +94674,6 @@ self: { homepage = "http://github.com/switchface/helm"; description = "A functionally reactive game engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "help-esb" = callPackage @@ -92879,6 +95280,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hexml-lens" = callPackage + ({ mkDerivation, base, bytestring, doctest, foundation, hexml, lens + , QuickCheck, text + }: + mkDerivation { + pname = "hexml-lens"; + version = "0.2.0"; + sha256 = "1rj45rghjzcgdllrcz2qm1sixjl73ncij5bh5qnkdb65b5hkfhfp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring foundation hexml lens text + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/pepeiborra/hexml-lens#readme"; + description = "Lenses for the hexml package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hexpat" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, expat, List , text, transformers, utf8-string @@ -92895,7 +95315,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "XML parser/formatter based on expat"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) expat;}; "hexpat-iteratee" = callPackage @@ -92931,7 +95350,6 @@ self: { homepage = "https://github.com/tel/hexpat-lens"; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -92949,7 +95367,6 @@ self: { homepage = "http://code.haskell.org/hexpat-pickle/"; description = "XML picklers based on hexpat, source-code-similar to those of the HXT package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle-generic" = callPackage @@ -92979,7 +95396,6 @@ self: { libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpr" = callPackage @@ -93261,7 +95677,7 @@ self: { librarySystemDepends = [ Cocoa ]; libraryToolDepends = [ CoreServices ]; homepage = "http://github.com/luite/hfsevents"; - description = "File/folder watching for OS X"; + description = "File/folder watching for macOS"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; hydraPlatforms = stdenv.lib.platforms.none; @@ -93424,7 +95840,6 @@ self: { homepage = "https://fstaals.net/software/hgeometry"; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgeos" = callPackage @@ -93536,6 +95951,8 @@ self: { pname = "hgmp"; version = "0.1.0.1"; sha256 = "0fkcp3l34si7v286dza3yhw2bjpx6vpwqnkqnp9lv18jwxak7xji"; + revision = "1"; + editedCabalFile = "0fmzm7m0z1jzpi7c1k8gk843d9jqljrkrb25yzs1kpbrg0ylpi3c"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -93589,6 +96006,7 @@ self: { homepage = "https://github.com/LukeHoersten/hgrev"; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrib" = callPackage @@ -93743,7 +96161,6 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; "hidden-char" = callPackage @@ -93876,7 +96293,6 @@ self: { homepage = "https://gitlab.com/gonz/hifi"; description = "WiFi connection script generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highWaterMark" = callPackage @@ -93916,7 +96332,6 @@ self: { homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "higherorder" = callPackage @@ -93949,7 +96364,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Spec based JSON parsing/serialisation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highjson-swagger" = callPackage @@ -93969,7 +96383,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Derive swagger instances from highjson specs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highjson-th" = callPackage @@ -93991,7 +96404,6 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Template Haskell helpers for highjson specs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highlight" = callPackage @@ -94447,7 +96859,6 @@ self: { homepage = "https://github.com/LTI2000/hinterface"; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -94500,7 +96911,6 @@ self: { homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hipbot" = callPackage @@ -94545,6 +96955,7 @@ self: { ]; description = "Hipchat API bindings in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hipe" = callPackage @@ -94995,6 +97406,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjugement" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "hjugement"; + version = "1.0.0.20170808"; + sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-hunit tasty-quickcheck text + transformers + ]; + description = "Majority Judgment"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { @@ -95170,7 +97598,6 @@ self: { homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -95211,21 +97638,21 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, megaparsec, microlens, microlens-th - , optparse-applicative, QuickCheck, text, text-format, text-zipper - , time, transformers, unordered-containers, vector, vty - , xdg-basedir + , optparse-applicative, QuickCheck, semigroups, text, text-format + , text-zipper, time, transformers, unordered-containers, vector + , vty, xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.3"; - sha256 = "1y2j2aiidp3y92wpx8wmr9r4wibg2cn0lws4s7ljrl6ghh57n4vq"; + version = "1.2.5"; + sha256 = "1va5a1j4pa6yvzhk0y4pxs0q80ph3yr8jdbgy422mkvbmczxynna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec - microlens microlens-th optparse-applicative text text-format - text-zipper time transformers unordered-containers vector vty - xdg-basedir + microlens microlens-th optparse-applicative semigroups text + text-format text-zipper time transformers unordered-containers + vector vty xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens @@ -95239,7 +97666,6 @@ self: { homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-interest" = callPackage @@ -95276,7 +97702,6 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -95479,6 +97904,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsass;}; + "hlibsass_0_1_6_1" = callPackage + ({ mkDerivation, base, Cabal, directory, hspec, libsass }: + mkDerivation { + pname = "hlibsass"; + version = "0.1.6.1"; + sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy"; + configureFlags = [ "-fexternallibsass" ]; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ libsass ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/jakubfijalkowski/hlibsass"; + description = "Low-level bindings to Libsass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libsass;}; + "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, directory, extra, filepath, haskell-src-exts @@ -95670,7 +98112,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -95771,7 +98212,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-special" = callPackage @@ -95818,7 +98258,6 @@ self: { homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmatrix-syntax" = callPackage @@ -95854,7 +98293,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -96029,6 +98467,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mpfr;}; + "hmpfr_0_4_3" = callPackage + ({ mkDerivation, base, integer-gmp, mpfr }: + mkDerivation { + pname = "hmpfr"; + version = "0.4.3"; + sha256 = "09q4gmj2gr3krh7vpkc8xwiy874d7mr6v57hv2i3n481yhky0yir"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base integer-gmp ]; + librarySystemDepends = [ mpfr ]; + homepage = "https://github.com/michalkonecny/hmpfr"; + description = "Haskell binding to the MPFR library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mpfr;}; + "hmt" = callPackage ({ mkDerivation, array, base, bytestring, colour, containers , data-ordlist, directory, filepath, lazy-csv, logict @@ -96977,8 +99430,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.12"; - sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx"; + version = "5.0.13"; + sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97248,7 +99701,6 @@ self: { homepage = "https://github.com/ananthakumaran/hopfli"; description = "Bidings to Google's Zopfli compression library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoppy-docs" = callPackage @@ -97346,7 +99798,6 @@ self: { homepage = "http://akc.is/hops"; description = "Handy Operations on Power Series"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoq" = callPackage @@ -97387,7 +99838,6 @@ self: { homepage = "https://github.com/ciez/hora"; description = "date time"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "horizon" = callPackage @@ -97422,6 +99872,7 @@ self: { homepage = "https://github.com/cocreature/horname#readme"; description = "Rename function definitions returned by SMT solvers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc" = callPackage @@ -97799,7 +100250,6 @@ self: { homepage = "https://github.com/yamadapc/hpack-convert#readme"; description = "Convert Cabal manifests into hpack's package.yamls"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpaco" = callPackage @@ -97945,7 +100395,6 @@ self: { ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc_0_6_0_3" = callPackage @@ -97988,7 +100437,6 @@ self: { homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -98159,6 +100607,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpp_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: + mkDerivation { + pname = "hpp"; + version = "0.4.1"; + sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-trie directory filepath ghc-prim time + transformers + ]; + executableHaskellDepends = [ base directory filepath time ]; + homepage = "https://github.com/acowley/hpp"; + description = "A Haskell pre-processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpqtypes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-default-class, exceptions, HUnit, lifted-base, monad-control @@ -98222,8 +100691,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.2"; - sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s"; + version = "2.4.3"; + sha256 = "1qdk5s1dv3v9pvf8hrr2cwgqsvk7pfiy1k3vvdqcv5cfnknqx0y1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98432,6 +100901,7 @@ self: { ]; description = "A query language for transforming HTML5"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hranker" = callPackage @@ -98480,7 +100950,6 @@ self: { homepage = "http://github.com/dredozubov/hreader-lens"; description = "Optics for hreader package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hricket" = callPackage @@ -98540,7 +101009,6 @@ self: { ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -98554,7 +101022,6 @@ self: { homepage = "http://github.com/ozataman/hs-GeoIP"; description = "Haskell bindings to the MaxMind GeoIPCity database via the C library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {GeoIP = null;}; "hs-bibutils" = callPackage @@ -98714,7 +101181,6 @@ self: { homepage = "https://github.com/myfreeweb/hs-duktape"; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-excelx" = callPackage @@ -98988,7 +101454,6 @@ self: { homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-pkpass" = callPackage @@ -99449,7 +101914,6 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3" = callPackage @@ -100053,7 +102517,6 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -100244,6 +102707,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_1_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.1.2"; + sha256 = "1i6h4gpjlrb9jadm52ygs9i1430lik2kljv86bpq6wz9zmq25d0s"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -100404,8 +102887,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.3"; - sha256 = "1hfhni85518hqvq3gzllc2mj83z1fwqlsfh2ida5pn8lg2j9ix2b"; + version = "0.8.4"; + sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100418,7 +102901,6 @@ self: { ]; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -100558,7 +103040,6 @@ self: { libraryHaskellDepends = [ base hslogger mtl template-haskell ]; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger4j" = callPackage @@ -100951,7 +103432,6 @@ self: { homepage = "http://www.jasani.org/search/label/hsparklines"; description = "Sparklines for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsparql" = callPackage @@ -101144,7 +103624,6 @@ self: { libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-pretty" = callPackage @@ -101214,7 +103693,6 @@ self: { homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; description = "Use tests to monitor changes in Aeson serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-hashable" = callPackage @@ -101352,6 +103830,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-multicheck" = callPackage + ({ mkDerivation, base, hspec, hspec-smallcheck, QuickCheck + , smallcheck + }: + mkDerivation { + pname = "hspec-multicheck"; + version = "0.1"; + sha256 = "1x4c3fsvxacwh5jlfjmasxm8bznqv9b6hsd7fr0vqp6q9a2hrx8k"; + libraryHaskellDepends = [ + base hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/marcellussiegburg/hspec-multicheck"; + description = "A testing framework for Haskell using Hspec"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -101609,7 +104104,6 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec2" = callPackage @@ -102032,8 +104526,8 @@ self: { }: mkDerivation { pname = "hssqlppp"; - version = "0.6.0"; - sha256 = "1g0c9rvk9pn23bnja46vw67q7k3yvik3bvlzk43ghl8jzcyd0lkh"; + version = "0.6.1"; + sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz"; libraryHaskellDepends = [ base containers mtl parsec pretty pretty-show syb text transformers uniplate @@ -102045,7 +104539,6 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hssqlppp-th" = callPackage @@ -102054,8 +104547,8 @@ self: { }: mkDerivation { pname = "hssqlppp-th"; - version = "0.6.0"; - sha256 = "11apcd3l77zifip70mvkhncfrs5ahmfw26cdqxyqwykkgrx92vjl"; + version = "0.6.1"; + sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg"; libraryHaskellDepends = [ base hssqlppp syb template-haskell text ]; @@ -102065,7 +104558,6 @@ self: { homepage = "http://jakewheat.github.com/hssqlppp/"; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstatistics" = callPackage @@ -102332,7 +104824,6 @@ self: { ]; description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hswip" = callPackage @@ -102412,6 +104903,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx2hs_0_14_1_1" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.1"; + sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + homepage = "https://github.com/seereason/hsx2hs"; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -102581,12 +105092,17 @@ self: { }) {}; "htirage" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: mkDerivation { pname = "htirage"; - version = "1.20170723"; - sha256 = "184z1bzzs00mkvmbr2p2xk0f5agxxv1xqmgbs0hq9yldpsa2nszc"; + version = "1.20170804"; + sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck text transformers + ]; description = "Equiprobable draw from publicly verifiable random data"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -102655,15 +105171,17 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, text, unordered-containers + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-doctest, directory, doctest, filepath, text + , unordered-containers }: mkDerivation { pname = "html-entities"; - version = "1.1.4"; - sha256 = "1h4jjy1fqzfcj49q99iprnz4ifaznacxnryq9bx8abxqsss22p0d"; + version = "1.1.4.1"; + sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec base-prelude text unordered-containers + attoparsec base base-prelude text unordered-containers ]; testHaskellDepends = [ base base-prelude directory doctest filepath @@ -102700,14 +105218,21 @@ self: { }) {}; "html-parse" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup - , text + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , string-conversions, tagsoup, text }: mkDerivation { pname = "html-parse"; - version = "0.2.0.0"; - sha256 = "14jap2xx030hzb0qs2rz30q92zivl0qd9h5z2ab3msl6vh0q97ww"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; + version = "0.2.0.1"; + sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + libraryHaskellDepends = [ + attoparsec base containers deepseq text + ]; + testHaskellDepends = [ + base containers hspec hspec-discover QuickCheck + quickcheck-instances string-conversions text + ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text ]; @@ -103100,7 +105625,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -103270,7 +105794,6 @@ self: { homepage = "https://github.com/bazqux/http-conduit-downloader"; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-date" = callPackage @@ -103429,7 +105952,6 @@ self: { homepage = "https://github.com/myfreeweb/http-link-header"; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "http-listen" = callPackage @@ -103470,15 +105992,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-media_0_7_1" = callPackage + "http-media_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 , utf8-string }: mkDerivation { pname = "http-media"; - version = "0.7.1"; - sha256 = "06b921qchv3avras2i7x0n7fy3rj7lr2dwm82b62fgzhy6riskh6"; + version = "0.7.1.1"; + sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -103526,7 +106048,6 @@ self: { homepage = "https://github.com/nfjinjing/http-pony"; description = "A type unsafe http library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony-serve-wai" = callPackage @@ -103745,7 +106266,6 @@ self: { homepage = "http://github.com/afcowie/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -103976,7 +106496,6 @@ self: { homepage = "http://justhub.org"; description = "For multiplexing GHC installations and providing development sandboxes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubigraph" = callPackage @@ -103990,7 +106509,6 @@ self: { homepage = "http://ooxo.org/hubigraph/"; description = "A haskell wrap for Ubigraph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubris" = callPackage @@ -104049,7 +106567,6 @@ self: { homepage = "https://github.com/elliottt/huff"; description = "A fast-foward-based planner"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "huffman" = callPackage @@ -104207,6 +106724,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_0_7_0_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.7.0.0"; + sha256 = "0pp3rxzb00glkc9fn45hik7rn4dwampdbh7va0gdlzh1jma6wpgw"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -104560,6 +107090,29 @@ self: { homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-balancedparens_0_2_0_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess + , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.0.0"; + sha256 = "1yd7s4n93rparg99x3kjsfiyk1si8kfg2ibfz5da1dlnzpffvmfq"; + libraryHaskellDepends = [ + base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple + vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; + homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -104581,6 +107134,26 @@ self: { homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-bits_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, hw-int + , hw-prim, hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.6.0.0"; + sha256 = "1w6kr5brkw78a0x82r34aivbbh4bhrng2hzh7hycia7291vysbbw"; + libraryHaskellDepends = [ + base bytestring hw-int hw-prim hw-string-parse safe vector + ]; + testHaskellDepends = [ + base bytestring hspec hw-prim QuickCheck vector + ]; + benchmarkHaskellDepends = [ base criterion hw-prim vector ]; + homepage = "http://github.com/haskell-works/hw-bits#readme"; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -104602,7 +107175,6 @@ self: { homepage = "http://github.com/haskell-works/hw-conduit#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-diagnostics" = callPackage @@ -104634,7 +107206,6 @@ self: { homepage = "http://github.com/haskell-works/hw-eliasfano#readme"; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage @@ -104654,9 +107225,41 @@ self: { homepage = "http://github.com/haskell-works/hw-excess#readme"; description = "Excess"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-excess_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base + , QuickCheck, safe, storable-record, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.0.0"; + sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe storable-record vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim QuickCheck vector + ]; + homepage = "http://github.com/haskell-works/hw-excess#readme"; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.1"; + sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/hw-hedgehog#readme"; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { @@ -104722,7 +107325,6 @@ self: { homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -104757,7 +107359,6 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-kafka-avro" = callPackage @@ -104790,8 +107391,8 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-avro#readme"; description = "Avro support for Kafka infrastructure"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {avro = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers @@ -104883,7 +107484,6 @@ self: { homepage = "http://github.com/haskell-works/hw-packed-vector#readme"; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage @@ -104932,22 +107532,34 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect#readme"; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-rankselect_0_8_0_2" = callPackage - ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim - , hw-rankselect-base, QuickCheck, vector + "hw-rankselect_0_10_0_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap + , QuickCheck, resourcet, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.8.0.2"; - sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm"; + version = "0.10.0.1"; + sha256 = "0xpgm2r05cshsn7ddkx6pxfj80y5fgpvi1r11iqxvdgnfdhpv780"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory hw-bits hw-prim hw-rankselect-base mmap vector ]; testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector ]; homepage = "http://github.com/haskell-works/hw-rankselect#readme"; description = "Rank-select"; @@ -104975,7 +107587,6 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-string-parse" = callPackage @@ -105008,7 +107619,6 @@ self: { homepage = "http://github.com/haskell-works/hw-succinct#readme"; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-vector" = callPackage @@ -105065,7 +107675,6 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -105380,7 +107989,6 @@ self: { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Expat parser for HXT"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -105963,8 +108571,8 @@ self: { ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.1.0.1"; - sha256 = "0jzfij3wqnyj7yf4ip8a8y0kz8zj9ci8gsjxf4m4hr5zsh90bas4"; + version = "0.1.0.2"; + sha256 = "1lp9mlg2ky1ph508xiwvn2f5ycxv0w7lyl0rl7wnlhm5wcp6793r"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; @@ -105976,14 +108584,13 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.1.0.1"; - sha256 = "1ffbp3qqplfys3yhy3mm8k76xnfzkmyk1zsgmcw4hn4phmqbkdvc"; + version = "0.1.0.2"; + sha256 = "032ccqrpjqqlgg416x2igg5dycd2ddgl0mfh2yywg9fmigs0zxdd"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper svg-builder text ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -105992,8 +108599,8 @@ self: { }: mkDerivation { pname = "hyper-haskell-server"; - version = "0.1.0.1"; - sha256 = "147jwzv9jym0bimlvaxgwyf0081vw0zb4sw7xs5c783ci5qdgc23"; + version = "0.1.0.2"; + sha256 = "0ljkh1n4lh877gxcy15pv9bybl9rnhi7ycxvzw9m97r80hyxidm1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106064,6 +108671,32 @@ self: { homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "hyperloglog_0_4_2" = callPackage + ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal + , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory + , distributive, doctest, filepath, generic-deriving, hashable, lens + , reflection, safecopy, semigroupoids, semigroups, simple-reflect + , siphash, tagged, vector + }: + mkDerivation { + pname = "hyperloglog"; + version = "0.4.2"; + sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + approximate base binary bits bytes cereal cereal-vector comonad + deepseq distributive hashable lens reflection safecopy + semigroupoids semigroups siphash tagged vector + ]; + testHaskellDepends = [ + base directory doctest filepath generic-deriving semigroups + simple-reflect + ]; + homepage = "http://github.com/analytics/hyperloglog"; + description = "An approximate streaming (constant space) unique object counter"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -106122,6 +108755,8 @@ self: { pname = "hyphenation"; version = "0.7"; sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; + revision = "2"; + editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -106133,7 +108768,6 @@ self: { homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -106624,7 +109258,6 @@ self: { ]; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idiii" = callPackage @@ -106741,6 +109374,52 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "idris_1_1_1" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal + , ansi-wl-pprint, array, async, base, base64-bytestring, binary + , blaze-html, blaze-markup, bytestring, Cabal, cheapskate + , code-page, containers, deepseq, directory, filepath, fingertree + , fsnotify, gmp, haskeline, ieee754, libffi, mtl, network + , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size + , text, time, transformers, transformers-compat, trifecta, uniplate + , unix, unordered-containers, utf8-string, vector + , vector-binary-instances, zip-archive + }: + mkDerivation { + pname = "idris"; + version = "1.1.1"; + sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp"; + configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async + base base64-bytestring binary blaze-html blaze-markup bytestring + cheapskate code-page containers deepseq directory filepath + fingertree fsnotify haskeline ieee754 libffi mtl network + optparse-applicative parsers pretty process regex-tdfa safe split + terminal-size text time transformers transformers-compat trifecta + uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive + ]; + librarySystemDepends = [ gmp ]; + executableHaskellDepends = [ + base directory filepath haskeline transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath haskeline + optparse-applicative process tagged tasty tasty-golden tasty-rerun + time transformers + ]; + homepage = "http://www.idris-lang.org/"; + description = "Functional Programming Language with Dependent Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmp;}; + "ieee" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106836,7 +109515,6 @@ self: { homepage = "http://code.haskell.org/~thielema/iff/"; description = "Constructing and dissecting IFF files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ifscs" = callPackage @@ -106893,7 +109571,7 @@ self: { libraryPkgconfigDepends = [ ige-mac-integration ]; libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://www.haskell.org/gtk2hs/"; - description = "Bindings for the Gtk/OS X integration library"; + description = "Bindings for the Gtk/macOS integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {ige-mac-integration = null;}; @@ -107232,6 +109910,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ihs_0_1_0_1" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "ihs"; + version = "0.1.0.1"; + sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process ]; + homepage = "https://github.com/minad/ihs"; + description = "Interpolated Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -107941,7 +110634,6 @@ self: { homepage = "https://bitbucket.org/adamsmd/indentation"; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indentation-core" = callPackage @@ -107986,7 +110678,6 @@ self: { homepage = "https://bitbucket.org/adamsmd/indentation"; description = "Indentation sensitive parsing combinators for Trifecta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indentparser" = callPackage @@ -108260,6 +110951,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.0"; + sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + homepage = "https://github.com/stackbuilders/inflections-hs"; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -108303,7 +111015,6 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -108443,22 +111154,21 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) gsl; gslcblas = null;}; - "inline-c_0_6_0_2" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, gsl, gslcblas, hashable, hspec, mtl - , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix - , template-haskell, transformers, unordered-containers, vector + "inline-c_0_6_0_4" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl + , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck + , raw-strings-qq, regex-posix, template-haskell, transformers + , unordered-containers, vector }: mkDerivation { pname = "inline-c"; - version = "0.6.0.2"; - sha256 = "0myrr8fh42ydzwkyw2mipa5g7hzr6lb593dl95vkika8v3nr2srk"; + version = "0.6.0.4"; + sha256 = "0ram4gixghck1ydqjfymm0ks7yfig2cn3iq40iid2ppvam5kmsgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring containers cryptohash - hashable mtl parsec parsers QuickCheck template-haskell - transformers unordered-containers vector + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector ]; executableSystemDepends = [ gsl gslcblas ]; testHaskellDepends = [ @@ -108534,7 +111244,6 @@ self: { homepage = "http://github.com/tweag/inline-java#readme"; description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-r" = callPackage @@ -108571,7 +111280,6 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -108852,7 +111560,6 @@ self: { homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-gmp_1_0_0_1" = callPackage @@ -108886,7 +111593,6 @@ self: { homepage = "https://github.com/phadej/integer-logarithms"; description = "Integer logarithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -109021,7 +111727,6 @@ self: { ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -109192,7 +111897,6 @@ self: { homepage = "http://hub.darcs.net/thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interruptible" = callPackage @@ -109260,6 +111964,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "intervals_0_8_1" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, directory + , distributive, doctest, filepath, ghc-prim, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "intervals"; + version = "0.8.1"; + sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; + revision = "1"; + editedCabalFile = "0im2m4acx6g638h7yz0x3qyaipfmri59q4zdq1w7n608r3i406dj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "http://github.com/ekmett/intervals"; + description = "Interval Arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath @@ -109306,7 +112032,6 @@ self: { homepage = "https://github.com/minad/intro#readme"; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -109411,6 +112136,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_4_3" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, profunctors, QuickCheck + , semigroups, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.4.3"; + sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors semigroups StateVar stm tagged template-haskell + th-abstraction transformers transformers-compat + unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -109429,7 +112178,6 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -109467,7 +112215,6 @@ self: { homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Invertible syntax descriptions for both parsing and pretty printing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-capture" = callPackage @@ -110065,6 +112812,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_0_4_4_4" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit + , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text + , time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "0.4.4.4"; + sha256 = "0y858xsjl16vlb9ifvw7akw727zmg06i5ald78r8828c8piqa259"; + libraryHaskellDepends = [ + base bytestring conduit connection irc-conduit irc-ctcp + network-conduit-tls old-locale stm stm-conduit text time tls + transformers x509 x509-store x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-client"; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -110095,6 +112862,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_2_2_3" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.2.2.3"; + sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-conduit"; + description = "Streaming IRC message library using conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector @@ -110111,7 +112898,6 @@ self: { homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-ctcp" = callPackage @@ -110149,7 +112935,6 @@ self: { homepage = "https://github.com/JanGe/irc-dcc"; description = "A DCC message parsing and helper library for IRC clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-fun-bot" = callPackage @@ -110253,7 +113038,6 @@ self: { homepage = "https://github.com/stepcut/ircbot"; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ircbouncer" = callPackage @@ -110287,8 +113071,8 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.6"; - sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q"; + version = "0.1.5.7"; + sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -110342,6 +113126,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "irt" = callPackage + ({ mkDerivation, ad, base, data-default-class, statistics }: + mkDerivation { + pname = "irt"; + version = "0.2.0.1"; + sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c"; + libraryHaskellDepends = [ ad base data-default-class statistics ]; + homepage = "https://github.com/argiopetech/irt"; + description = "Item Response Theory functions for use in computerized adaptive testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "is" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -110352,7 +113148,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -110545,7 +113340,6 @@ self: { homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; description = "Isotopic masses and relative abundances"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ispositive" = callPackage @@ -110603,7 +113397,6 @@ self: { ]; description = "A brick Widget for selectable summary of many elements on a terminal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iter-stats" = callPackage @@ -110808,21 +113601,20 @@ self: { "ivory" = callPackage ({ mkDerivation, alex, array, base, base-compat, containers, dlist , filepath, happy, monadLib, pretty, template-haskell, text - , th-lift + , th-abstraction, th-lift }: mkDerivation { pname = "ivory"; - version = "0.1.0.6"; - sha256 = "13akncp29sqidkqxfbv6k2gadipdzvnk6svgwm1p29xr5wxfizca"; + version = "0.1.0.7"; + sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty - template-haskell text th-lift + template-haskell text th-abstraction th-lift ]; libraryToolDepends = [ alex happy ]; homepage = "http://ivorylang.org"; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-artifact" = callPackage @@ -110849,10 +113641,8 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.5"; - sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0"; - revision = "3"; - editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49"; + version = "0.1.0.7"; + sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory @@ -110902,7 +113692,6 @@ self: { homepage = "http://ivorylang.org"; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-examples" = callPackage @@ -110940,7 +113729,6 @@ self: { homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-opts" = callPackage @@ -110960,7 +113748,6 @@ self: { homepage = "http://ivorylang.org"; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-quickcheck" = callPackage @@ -111000,7 +113787,6 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-stdlib" = callPackage @@ -111014,7 +113800,6 @@ self: { homepage = "http://ivorylang.org"; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivy-web" = callPackage @@ -111501,7 +114286,6 @@ self: { homepage = "https://github.com/NICTA/javaclass"; description = "Java class files"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "javascript-extras" = callPackage @@ -111618,7 +114402,6 @@ self: { homepage = "https://github.com/erikd/jenga"; description = "Generate a cabal freeze file from a stack.yaml"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jenkinsPlugins2nix" = callPackage @@ -111771,7 +114554,6 @@ self: { homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage @@ -111926,7 +114708,6 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jpeg" = callPackage @@ -112000,7 +114781,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -112031,7 +114811,6 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -112215,7 +114994,6 @@ self: { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast" = callPackage @@ -112432,6 +115210,7 @@ self: { homepage = "https://github.com/tfausak/json-feed#readme"; description = "JSON Feed"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -112715,7 +115494,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-state" = callPackage @@ -112753,7 +115531,6 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -112945,6 +115722,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsons-to-schema" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit + , conduit-combinators, containers, Glob, hjsonschema, hspec + , neat-interpolation, optparse-applicative, protolude, QuickCheck + , quickcheck-instances, safe, scientific, semigroups, text + , uniplate, unordered-containers, vector + }: + mkDerivation { + pname = "jsons-to-schema"; + version = "0.1.0.0"; + sha256 = "0agnvc8x2yvl2m0lz5hcflmi44gscyb349zn0xbrlk9arq7ha8nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema protolude + QuickCheck safe scientific semigroups text unordered-containers + vector + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-combinators Glob hjsonschema + optparse-applicative protolude + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hjsonschema hspec + neat-interpolation protolude QuickCheck quickcheck-instances + scientific text uniplate unordered-containers vector + ]; + homepage = "https://github.com/garetht/jsons-to-schema/README.md"; + description = "JSON to JSON Schema"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonschema-gen" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, process , scientific, tagged, text, time, unordered-containers, vector @@ -112963,7 +115772,6 @@ self: { homepage = "https://github.com/yuga/jsonschema-gen"; description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonsql" = callPackage @@ -113070,7 +115878,6 @@ self: { ]; description = "Manage users in MariaDB >= 10.1.1"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "judy" = callPackage @@ -113187,6 +115994,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "justified-containers" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "justified-containers"; + version = "0.1.2.0"; + sha256 = "1rzphablg1wpx2b33zgdyslb9ch436g0wi59vy6gk06572najvz4"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/matt-noonan/justified-containers"; + description = "Keyed container types with type-checked proofs of key presence"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, criterion , distributed-closure, hspec, jni, singletons, template-haskell @@ -113205,7 +116024,6 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -113239,7 +116057,6 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jwt" = callPackage @@ -113721,7 +116538,6 @@ self: { homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -114445,8 +117261,8 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20170303"; - sha256 = "0nmlm6izhg0nh4wh6vrdl8sm6w447x3jnx4nxxwxxz4mfy4yx18p"; + version = "0.20170811"; + sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114511,7 +117327,6 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -114837,7 +117652,6 @@ self: { homepage = "https://github.com/scrive/kontra-config"; description = "JSON config file parsing based on unjson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kontrakcja-templates" = callPackage @@ -114925,8 +117739,8 @@ self: { pname = "kraken"; version = "0.0.3"; sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0"; - revision = "1"; - editedCabalFile = "0dm107c8nxdh544pswj7saxmaz1jbzwphdzgpyk857l33sdmy203"; + revision = "2"; + editedCabalFile = "0w8w1frkx54ldyhxp09ddm2y1l7q72xfl1p6py7y6ywxnq23lr4h"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -115310,7 +118124,6 @@ self: { homepage = "https://github.com/sgillespie/lambda-calculus#readme"; description = "A lambda calculus interpreter"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-canvas" = callPackage @@ -115363,7 +118176,6 @@ self: { homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-placeholders" = callPackage @@ -115393,7 +118205,6 @@ self: { homepage = "https://github.com/maciej-bendkowski/lambda-sampler"; description = "Boltzmann sampler utilities for lambda calculus"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-toolbox" = callPackage @@ -115954,7 +118765,6 @@ self: { homepage = "http://github.com/NorfairKing/lambdatex"; description = "Type-Safe LaTeX EDSL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdatwit" = callPackage @@ -116159,8 +118969,8 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.10.0"; - sha256 = "152bh73gr6a7iahi2vsn2z4vjgbk2rd5qsmrd5wc7jrb67485n6i"; + version = "0.7.11.0"; + sha256 = "1f31yk4h507d3gl0crjrjxhc2c313i8l04sacw79m2vyvy7fqrzw"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell @@ -116598,6 +119408,8 @@ self: { pname = "language-lua"; version = "0.10.0"; sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c"; + revision = "1"; + editedCabalFile = "0l90w79xn0k1wqhz7gb2ih33nja3w9m8pp11d9dxdg5am05fyhm2"; libraryHaskellDepends = [ array base bytestring deepseq text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -116681,22 +119493,22 @@ self: { , cabal-doctest, containers, deepseq, doctest, flow, ghc , haddock-api, haddock-library, hashable, intern, lens, megaparsec , monad-mock, mtl, optparse-generic, QuickCheck - , quickcheck-instances, smallcheck, system-filepath, tasty - , tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck + , quickcheck-instances, semigroups, smallcheck, system-filepath + , tasty, tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck , tasty-smallcheck, template-haskell, text, transformers, turtle , unordered-containers, versions }: mkDerivation { pname = "language-ninja"; - version = "0.1.0"; - sha256 = "1bqf61q8mzglf1f3y2khy2vw4k3kfc0qd0rw984jyfxk10wqr27d"; + version = "0.2.0"; + sha256 = "08lzkvq0v3b8grji7gcfg2m714xql85k18b5wg3h0nh38wkh6m8d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring containers deepseq flow hashable intern lens - megaparsec mtl QuickCheck quickcheck-instances smallcheck - system-filepath text transformers unordered-containers versions + megaparsec mtl QuickCheck semigroups smallcheck system-filepath + text transformers unordered-containers versions ]; executableHaskellDepends = [ aeson aeson-pretty base flow lens mtl optparse-generic text @@ -116705,8 +119517,8 @@ self: { testHaskellDepends = [ aeson base bytestring cabal-doctest containers doctest flow ghc haddock-api haddock-library hashable lens monad-mock mtl QuickCheck - quickcheck-instances smallcheck system-filepath tasty tasty-html - tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck + quickcheck-instances semigroups smallcheck system-filepath tasty + tasty-html tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck template-haskell text transformers turtle unordered-containers versions ]; @@ -116835,7 +119647,51 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; + }) {}; + + "language-puppet_1_3_9" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, exceptions, filecache, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, HUnit, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parallel-io, parsec + , pcre-utils, process, random, regex-pcre-builtin, scientific + , semigroups, servant, servant-client, split, stm + , strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.9"; + sha256 = "13sap5qqpinbn0cvi38kbvlny0vp1pi4xjvx8kjjwkrl30av2rx8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory exceptions + filecache formatting hashable hruby hslogger hspec http-api-data + http-client lens lens-aeson megaparsec memory mtl operational + parsec pcre-utils process random regex-pcre-builtin scientific + semigroups servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers Glob hslogger http-client lens + megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin + servant-client strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens + megaparsec mtl scientific strict-base-types temporary text + transformers unix unordered-containers vector + ]; + 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 @@ -116853,7 +119709,6 @@ self: { homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python-colour" = callPackage @@ -116885,7 +119740,6 @@ self: { homepage = "http://github.com/bjpop/language-python-test"; description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-qux" = callPackage @@ -116911,8 +119765,8 @@ self: { }: mkDerivation { pname = "language-sally"; - version = "0.1.1.0"; - sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v"; + version = "0.1.2.0"; + sha256 = "053lswpcscsx74lyfjm6g5yzckfd5fc2bvj34ps8470d8dhbphkb"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers text ]; @@ -117079,7 +119933,6 @@ self: { homepage = "https://github.com/factisresearch/large-hashable"; description = "Efficiently hash (large) Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "largeword" = callPackage @@ -117729,6 +120582,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_6_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.6.4"; + sha256 = "0vvqzcl53d18axi3p6n9chggb2g7i2ip3wq8z5cbklkm9vb8qirc"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/rudymatela/leancheck#readme"; + description = "Cholesterol-free property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -117769,12 +120636,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "leapseconds-announced_2017_1" = callPackage + "leapseconds-announced_2017_1_0_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; - version = "2017.1"; - sha256 = "06gn0y1nkg2wr3rnfm7f5drjfjxgaq16qayanhhdy59hdpfim70g"; + version = "2017.1.0.1"; + sha256 = "1mm8j994106gyx9p3widkydczn8wcj79m2kiymg9fjkhmxyb4fyd"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; homepage = "https://github.com/bjornbm/leapseconds-announced"; @@ -118041,7 +120908,6 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -118104,6 +120970,48 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lens_4_15_4" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.15.4"; + sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids semigroups tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -118136,6 +121044,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-action_0_2_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant + , directory, doctest, filepath, lens, mtl, profunctors + , semigroupoids, semigroups, transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.2"; + sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/lens-action/"; + description = "Monadic Getters and Folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, doctest, generic-deriving, lens, scientific @@ -118158,6 +121087,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lens-aeson_1_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, doctest, generic-deriving, lens, scientific + , semigroups, simple-reflect, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.0.2"; + sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; + revision = "1"; + editedCabalFile = "1xkxncl218ni4idq90g6bdd7vnwxshcpa1xk11fd3kc3i3j90pqs"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/lens/lens-aeson/"; + description = "Law-abiding lenses for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-datetime" = callPackage ({ mkDerivation, base, lens, time }: mkDerivation { @@ -118208,6 +121162,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family-th_0_5_0_1" = callPackage + ({ mkDerivation, base, hspec, lens-family, template-haskell }: + mkDerivation { + pname = "lens-family-th"; + version = "0.5.0.1"; + sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec lens-family template-haskell ]; + homepage = "http://github.com/DanBurton/lens-family-th#readme"; + description = "Generate lens-family style lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-labels" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -118220,6 +121188,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/google/proto-lens"; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -118299,7 +121280,6 @@ self: { ]; description = "Computing lenses generically using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-text-encoding" = callPackage @@ -118331,8 +121311,8 @@ self: { ({ mkDerivation, base, doctest, lens }: mkDerivation { pname = "lens-tutorial"; - version = "1.0.2"; - sha256 = "1dg1s44gqip77bqb76f8yyq9x20rhicdw2y2mlamzczvkgv3h9pg"; + version = "1.0.3"; + sha256 = "1x6lbmylfp1gbik32ssfq643nmkhvhliryz70fsvcmscscm0chxp"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -118420,7 +121400,6 @@ self: { homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz" = callPackage @@ -118432,7 +121411,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -118918,6 +121896,8 @@ self: { pname = "libinfluxdb"; version = "0.0.4"; sha256 = "0gzgcczw1jz0cns9x9na8rnyrapwml2ih9x0dv28pqf9fk1bpd95"; + revision = "1"; + editedCabalFile = "17ddlql04hgah7pr0zi8zvpza17ig7a0m27wr2c47gdzy7k0nr2v"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types resource-pool stm text @@ -118952,7 +121932,6 @@ self: { ]; description = "Jenkins API interface"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liblastfm" = callPackage @@ -119106,6 +122085,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "libmpd_0_9_0_7" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, filepath, hspec, mtl, network, old-locale + , QuickCheck, text, time, unix, utf8-string + }: + mkDerivation { + pname = "libmpd"; + version = "0.9.0.7"; + sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + mtl network old-locale text time utf8-string + ]; + testHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + hspec mtl network old-locale QuickCheck text time unix utf8-string + ]; + homepage = "http://github.com/vimus/libmpd-haskell#readme"; + description = "An MPD client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "libnotify" = callPackage ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { @@ -119213,7 +122215,6 @@ self: { homepage = "https://github.com/SaneTracker/librato"; description = "Bindings to the Librato API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libravatar" = callPackage @@ -119222,13 +122223,13 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.4"; - sha256 = "0b0zyavlxmh0qcfiksyshrhxrnynz3wwbg13vd64gs0i9abdxjij"; + version = "0.4.0.1"; + sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url ]; - homepage = "http://rel4tion.org/projects/libravatar/"; + homepage = "https://rel4.seek-together.space/projects/libravatar/"; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -119244,7 +122245,6 @@ self: { homepage = "https://ahakki.xyz"; description = "Use Roman Numerals as a Numeric Datatype (sort of)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libssh2" = callPackage @@ -119338,7 +122338,6 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; "libtagc" = callPackage @@ -119369,7 +122368,6 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -119382,7 +122380,6 @@ self: { homepage = "https://github.com/the-real-blackh/libvorbis"; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libxls" = callPackage @@ -119468,7 +122465,6 @@ self: { executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -119767,7 +122763,6 @@ self: { libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linda" = callPackage @@ -119921,6 +122916,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_7" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.7"; + sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; + revision = "1"; + editedCabalFile = "0ghmlkk5cy0pylx47rwr37p403ml7x6sg0sapz9c7534nzzhxq0g"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + homepage = "http://github.com/ekmett/linear/"; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -119939,6 +122966,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_5" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.5"; + sha256 = "1whgf5bxl8knh04n7brgy7a7awdsxkyvkrqqpskyiii5bya21q7r"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -120068,7 +123114,6 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -120117,15 +123162,14 @@ self: { homepage = "http://ariis.it/static/articles/linebreak/page.html"; description = "breaks strings to fit width"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linguistic-ordinals" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "linguistic-ordinals"; - version = "0.1.0.1"; - sha256 = "02sl3jbfpbb77a6g4g9gj7a6mba804fqjx5d21ix8c8rzakavh38"; + version = "0.1.0.2"; + sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik"; libraryHaskellDepends = [ base text ]; homepage = "http://github.com/argiopetech/linguistic-ordinals"; description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)"; @@ -120242,7 +123286,6 @@ self: { homepage = "https://github.com/hlian/linklater"; description = "A Haskell library for the Slack API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode" = callPackage @@ -120265,7 +123308,6 @@ self: { homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode-v4" = callPackage @@ -120648,6 +123690,7 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -120807,6 +123850,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "list-t_1_0_0_1" = callPackage + ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control + , mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.0.1"; + sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa"; + libraryHaskellDepends = [ + base base-prelude mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -120884,7 +123946,6 @@ self: { homepage = "https://github.com/nikita-volkov/list-t-libcurl"; description = "A \"libcurl\"-based streaming HTTP client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-text" = callPackage @@ -120938,7 +123999,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/list-tries/"; description = "Tries and Patricia tries: finite sets and maps for list keys"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-zip-def" = callPackage @@ -121049,7 +124109,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liveplot" = callPackage @@ -121388,7 +124447,6 @@ self: { homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; "llvm-hs-pure" = callPackage @@ -121570,6 +124628,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lmdb-simple" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, lmdb + , QuickCheck, serialise + }: + mkDerivation { + pname = "lmdb-simple"; + version = "0.3.1.0"; + sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn"; + libraryHaskellDepends = [ base bytestring lmdb serialise ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/verement/lmdb-simple#readme"; + description = "Simple API for LMDB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lmonad" = callPackage ({ mkDerivation, base, containers, exceptions, HUnit, monad-control , transformers, transformers-base @@ -121738,7 +124812,6 @@ self: { homepage = "https://github.com/MailOnline/located-monad-logger#readme"; description = "Location-aware logging without Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locators" = callPackage @@ -121810,7 +124883,6 @@ self: { homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locked-poll" = callPackage @@ -121903,6 +124975,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_7_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.7.2.0"; + sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds"; + revision = "1"; + editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unordered-containers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving @@ -121926,6 +125020,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_11_2" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, safecopy, semigroupoids, semigroups, simple-reflect + , vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.11.2"; + sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd"; + revision = "1"; + editedCabalFile = "0frl4vwwlkfvz73pkiay4qh1vm576z4kj2gsbbq1za6b6pya4qhw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/ekmett/log-domain/"; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, fast-logger , time @@ -121961,6 +125081,28 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "log-elasticsearch_0_9_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, http-client-tls + , log-base, semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.9.1.0"; + sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5"; + revision = "1"; + editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client http-client-tls log-base semigroups text + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -121985,6 +125127,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-postgres_0_7_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base + , mtl, semigroups, split, text, text-show, time + , unordered-containers, vector + }: + mkDerivation { + pname = "log-postgres"; + version = "0.7.0.2"; + sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; + revision = "1"; + editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring deepseq + hpqtypes http-client lifted-base log-base mtl semigroups split text + text-show time unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (PostgreSQL back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config @@ -122038,7 +125203,6 @@ self: { homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -122198,7 +125362,6 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade-syslog" = callPackage @@ -122316,7 +125479,6 @@ self: { homepage = "https://github.com/sol/logsink#readme"; description = "A logging framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lojban" = callPackage @@ -122463,6 +125625,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-calculus" = callPackage @@ -122504,6 +125667,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-repa" = callPackage @@ -122524,6 +125688,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A repa backend for <https://hackage.haskell.org/package/lol lol>."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-tests" = callPackage @@ -122544,6 +125709,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-typing" = callPackage @@ -122804,8 +125970,8 @@ self: { }: mkDerivation { pname = "loup"; - version = "0.0.13"; - sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122"; + version = "0.0.15"; + sha256 = "1pb2ka69vpv9x318b80dcgk72g6r4s24j9n8dcjg0ibw6cxsn5fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122847,7 +126013,6 @@ self: { ]; description = "An EDSL for diagrams based based on linear constraints"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lp-diagrams-svg" = callPackage @@ -123009,7 +126174,6 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -123030,7 +126194,6 @@ self: { homepage = "https://github.com/achirkin/qua-kit"; description = "Partial implementation of a service provider for LTI 1.1."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltk" = callPackage @@ -123071,6 +126234,8 @@ self: { pname = "lua-bc"; version = "0.1.1"; sha256 = "0bp0j181j2zr2xw6mpj4f17998bmh6qs0y7xbimxz4nh7bf8chba"; + revision = "1"; + editedCabalFile = "1bp54qza0pncf4r8dwavxqls2zfvcxavpsvj7sxr52yiz8nisink"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -123540,7 +126705,6 @@ self: { homepage = "http://github.com/alphaHeavy/lzma-conduit"; description = "Conduit interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lzma;}; "lzma-enumerator" = callPackage @@ -123691,7 +126855,6 @@ self: { homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines" = callPackage @@ -123721,6 +126884,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines_0_6_3" = callPackage + ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad + , conduit, conduit-combinators, containers, criterion, distributive + , doctest, mtl, pipes, pointed, profunctors, semigroupoids + , semigroups, transformers, transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.6.3"; + sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; + revision = "1"; + editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators criterion mtl pipes + ]; + homepage = "http://github.com/ekmett/machines/"; + description = "Networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -123919,8 +127110,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.0.1"; - sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1"; + version = "2.4.0.2"; + sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123936,7 +127127,6 @@ self: { homepage = "https://github.com/vmchale/madlang#readme"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mage" = callPackage @@ -124849,7 +128039,6 @@ self: { ]; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mappy" = callPackage @@ -124952,7 +128141,6 @@ self: { libraryHaskellDepends = [ base monads-tf papillon ]; description = "markdown parser with papillon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markdown-unlit" = callPackage @@ -125066,7 +128254,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -125207,7 +128394,6 @@ self: { homepage = "https://marvin.readthedocs.io"; description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marvin-interpolate" = callPackage @@ -125248,7 +128434,6 @@ self: { ]; description = "Markup language preprocessor for Haskell"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "masakazu-bot" = callPackage @@ -125381,6 +128566,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mathflow" = callPackage + ({ mkDerivation, base, doctest, hspec, hspec-server, process + , QuickCheck, shakespeare, singletons, template-haskell, text + }: + mkDerivation { + pname = "mathflow"; + version = "0.1.0.0"; + sha256 = "175r5h1g5dxh1xaxnmy0l0m91433prvd6d32r6pqn9alf6jlm4fd"; + libraryHaskellDepends = [ + base process singletons template-haskell + ]; + testHaskellDepends = [ + base doctest hspec hspec-server QuickCheck shakespeare singletons + template-haskell text + ]; + homepage = "https://github.com/junjihashimoto/mathflow#readme"; + description = "Dependently typed tensorflow modeler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mathgenealogy" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup @@ -125586,8 +128791,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40000.0.0"; - sha256 = "1cr4mnqqdwf137v4r6mgc7p1b20hm4pdvm6qs61zrhlgimy9zmln"; + version = "40000.0.2"; + sha256 = "1lsxadkhvk8bylpc0sh1pmkldv8m17fpi96zkihdpchpwhw1i8jn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125619,8 +128824,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40000.0.0"; - sha256 = "0c2c09hmq8n44na0i20hqj57cv5wr9yy4apvhdn0xvgfs155wgp9"; + version = "40000.0.1"; + sha256 = "0phykn8h08yprmpds92cp6snraxg66hbh553b8da5v47dn06y8mv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125646,8 +128851,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40000.0.0"; - sha256 = "0pnwzay7w9jmdrq26sj3in127c5dywbzhwi12vcf09q4mi43zqwb"; + version = "40000.0.1"; + sha256 = "0444m1349gpyffpjlvf9faz4sia5kfsry9q174n6b60ch85w1ilg"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -125859,16 +129064,17 @@ self: { }) {}; "mbtiles" = callPackage - ({ mkDerivation, base, bytestring, directory, HUnit, mtl - , sqlite-simple, text, transformers, unordered-containers + ({ mkDerivation, base, bytestring, directory, HUnit, monad-control + , mtl, resource-pool, sqlite-simple, text, transformers + , unordered-containers }: mkDerivation { pname = "mbtiles"; - version = "0.3.0.0"; - sha256 = "0v41lzh1pi105nw3kl0kg04q1xlf9mwkhrdyiyc877a2y01xg2np"; + version = "0.4.0.0"; + sha256 = "03d1wmn974ic0dfapyrf881xnily0g6asqss1raaad9g03kwxcxr"; libraryHaskellDepends = [ - base bytestring directory mtl sqlite-simple text transformers - unordered-containers + base bytestring directory monad-control mtl resource-pool + sqlite-simple text transformers unordered-containers ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/caneroj1/mbtiles#readme"; @@ -126173,6 +129379,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "med-module_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, storable-endian, transformers + , utility-ht + }: + mkDerivation { + pname = "med-module"; + version = "0.1.1"; + sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring storable-endian transformers utility-ht + ]; + description = "Parse song module files from Amiga MED and OctaMED"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mediabus" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers @@ -126202,7 +129426,6 @@ self: { homepage = "https://github.com/sheyll/mediabus"; description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "mediabus-fdk-aac" = callPackage @@ -126270,7 +129493,6 @@ self: { homepage = "https://github.com/sheyll/mediabus-rtp"; description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "median-stream" = callPackage @@ -126387,7 +129609,6 @@ self: { homepage = "https://github.com/snoyberg/mega-sdist"; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage @@ -126413,7 +129634,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_6_0_1" = callPackage + "megaparsec_6_1_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -126421,8 +129642,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "6.0.1"; - sha256 = "1cj6ibzcvdq24k94xbx6fw2wxzh3dvxv9q2yapbdhimkx632g88w"; + version = "6.1.0"; + sha256 = "1096frlw1q7mgr87ndbwbg26dcmj1yv8a88xwwwy4p2f5m4df0fd"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -126814,6 +130035,8 @@ self: { pname = "memorypool"; version = "0.1.0.0"; sha256 = "0w3ssdffsnaxgs8a22sbclsyss4bvmzhb6bww252dcrgpcmn1dkh"; + revision = "1"; + editedCabalFile = "1jv5zba8jldkic64dmrafq45dwaa0ayc2ihvbg0ff87n5i3sh5z0"; libraryHaskellDepends = [ base containers transformers unsafe vector ]; @@ -127091,6 +130314,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "metrics_0_4_1_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , HUnit, lens, mwc-random, primitive, QuickCheck, text, time + , transformers, transformers-base, unix-compat + , unordered-containers, vector, vector-algorithms + }: + mkDerivation { + pname = "metrics"; + version = "0.4.1.1"; + sha256 = "1f2vqwldp457956bx839r9v3xpmp95q42insn2xcdw669rq6wpym"; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers lens mwc-random primitive + text time transformers transformers-base unix-compat + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + async base HUnit lens mwc-random primitive QuickCheck + ]; + description = "High-performance application metric tracking"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "metricsd-client" = callPackage ({ mkDerivation, base, network }: mkDerivation { @@ -127114,6 +130360,7 @@ self: { ]; description = "Time Synchronized execution"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mezzo" = callPackage @@ -127244,7 +130491,6 @@ self: { homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -127276,6 +130522,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens_0_4_8_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.8.1"; + sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -127296,7 +130555,6 @@ self: { homepage = "http://github.com/fosskers/microlens-aeson/"; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -127550,7 +130808,6 @@ self: { homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-simple" = callPackage @@ -127701,7 +130958,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mighty-metropolis" = callPackage @@ -127734,7 +130990,6 @@ self: { homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikrokosmos" = callPackage @@ -127744,8 +130999,8 @@ self: { }: mkDerivation { pname = "mikrokosmos"; - version = "0.3.0"; - sha256 = "1qr0m4iy1xyprw714nrdpkxlr6lmvsb6f9d8m4z13z03njnz4vm6"; + version = "0.5.0"; + sha256 = "04hm0bz3hhxb11x1cfk129sv8x9dqjyvbagpr250cha47wws3sal"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127795,7 +131050,6 @@ self: { ]; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -128039,7 +131293,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT haskell98 unix ]; - description = "Shows how to run grabber on Mac OS X"; + description = "Shows how to run grabber on macOS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -128333,6 +131587,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers + , lucid, servant, servant-lucid, text, vector + }: + mkDerivation { + pname = "miso"; + version = "0.7.0.0"; + sha256 = "0zakd08mfrzhdi9wqzj7vs62wlnhzkakbx0yqa9qgzfz4x6pi1j8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BoundedChan bytestring containers lucid servant + servant-lucid text vector + ]; + homepage = "http://github.com/dmjio/miso"; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "missing-foreign" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -128369,7 +131643,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Mixing effects of one arrow into another one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mixed-strategies" = callPackage @@ -128408,6 +131681,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mixed-types-num_0_3_0_1" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.3.0.1"; + sha256 = "00qvb1himrrdpasfc44bblydgc1hmhnbfmcprq6yzdz7lb1f8x6x"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + homepage = "https://github.com/michalkonecny/mixed-types-num"; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -128418,7 +131710,7 @@ self: { isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base directory filepath haskell98 ]; - description = "Makes an OS X .app bundle from a binary."; + description = "Makes an macOS .app bundle from a binary."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -128592,7 +131884,6 @@ self: { homepage = "https://github.com/kryoxide/mnist-idx/"; description = "Read and write IDX data that is used in e.g. the MNIST database."; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moan" = callPackage @@ -128645,7 +131936,6 @@ self: { homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "model" = callPackage @@ -128706,7 +131996,6 @@ self: { homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modsplit" = callPackage @@ -128883,7 +132172,6 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -128922,6 +132210,8 @@ self: { pname = "mole"; version = "0.0.5"; sha256 = "14vqa4mszb37rlpimlqir4g39lv66bfvg9jp4hcqzj5gsny3a1qb"; + revision = "4"; + editedCabalFile = "1565y432g3xy8q9db5sg4nsrb4pn25sxjlb0d6psgfhajb0qlh3l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129045,7 +132335,6 @@ self: { homepage = "https://github.com/strake/monad-classes.hs"; description = "more flexible mtl"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-classes-logging" = callPackage @@ -129065,7 +132354,6 @@ self: { homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme"; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-codec" = callPackage @@ -129078,6 +132366,7 @@ self: { homepage = "https://github.com/kawu/monad-codec"; description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-connect" = callPackage @@ -129112,6 +132401,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_2" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.2"; + sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -129243,8 +132549,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "4"; - editedCabalFile = "00xzkxsqz34gc8vf1zanrmqszkbfigcl7dz1xwhab4p55lddvhhl"; + revision = "5"; + editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -129543,8 +132849,8 @@ self: { }: mkDerivation { pname = "monad-mock"; - version = "0.1.1.1"; - sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3"; + version = "0.1.1.2"; + sha256 = "029c8jcw7y3hd1llvfnm85fwxvfh7mlhr7dxnfsx6x8zq1qda12f"; libraryHaskellDepends = [ base constraints exceptions haskell-src-exts haskell-src-meta monad-control mtl template-haskell th-orphans transformers-base @@ -129649,7 +132955,6 @@ self: { homepage = "https://github.com/mnacamura/monad-parallel-progressbar"; description = "Parallel execution of monadic computations with a progress bar"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-param" = callPackage @@ -129766,6 +133071,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-skeleton_0_1_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "monad-skeleton"; + version = "0.1.5"; + sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "Monads of program skeleta"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -129776,7 +133094,6 @@ self: { homepage = "http://github.com/ekmett/monad-st"; description = "Provides a MonadST class"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-state" = callPackage @@ -130352,7 +133669,6 @@ self: { homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -130469,6 +133785,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, foldl + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.2.1"; + sha256 = "0smirpwika7d5a98h20jr9jqg41n7vqfy7k31crmn449qfig9ljf"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -130583,6 +133924,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoid-subclasses_0_4_4" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "0.4.4"; + sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + homepage = "https://github.com/blamario/monoid-subclasses/"; + description = "Subclasses of Monoid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -130610,6 +133972,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoidal-containers_0_3_0_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype + , unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.3.0.2"; + sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij"; + libraryHaskellDepends = [ + base containers deepseq hashable lens newtype unordered-containers + ]; + homepage = "http://github.com/bgamari/monoidal-containers"; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -131161,7 +134540,6 @@ self: { homepage = "https://github.com/lpeterse/haskell-mqtt"; description = "An MQTT protocol implementation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mqtt-hs" = callPackage @@ -131179,7 +134557,6 @@ self: { homepage = "http://github.com/k00mi/mqtt-hs"; description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrifk" = callPackage @@ -131769,6 +135146,7 @@ self: { homepage = "http://github.com/micxjo/hs-multiaddr"; description = "A network address format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiarg" = callPackage @@ -131807,7 +135185,6 @@ self: { homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -132079,6 +135456,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multistate_0_7_1_2" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.7.1.2"; + sha256 = "1mcl0gp2l9wvscq942mz6p0pwlaf4i8li9kp20bp608kahy332ci"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "https://github.com/lspitzner/multistate"; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multivariant" = callPackage ({ mkDerivation, base, containers, free, HUnit, invertible , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty @@ -132572,7 +135969,6 @@ self: { homepage = "https://github.com/JustusAdam/mustache"; description = "A mustache template parser library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mustache-haskell" = callPackage @@ -133003,7 +136399,6 @@ self: { homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell_0_8_1_0" = callPackage @@ -133045,7 +136440,6 @@ self: { homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-openssl" = callPackage @@ -133083,7 +136477,6 @@ self: { homepage = "https://github.com/paul-rouse/mysql-simple"; description = "A mid-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -133161,7 +136554,6 @@ self: { ]; description = "Web application to view and kill MySQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mzv" = callPackage @@ -133189,7 +136581,6 @@ self: { executableHaskellDepends = [ base HSH mtl process ]; description = "Utility to call iwconfig"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "n-tuple" = callPackage @@ -133987,8 +137378,8 @@ self: { }: mkDerivation { pname = "neko-obfs"; - version = "0.1.0.1"; - sha256 = "1fv15fsdhy3crny3w7k944fsnpjv3vhkdvnj9s1dj64a1pnysi0b"; + version = "0.1.0.2"; + sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134512,7 +137903,6 @@ self: { homepage = "https://github.com/esoeylemez/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input" = callPackage @@ -134525,7 +137915,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input"; description = "Input handling abstractions for netwire"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-glfw" = callPackage @@ -134543,7 +137932,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-javascript" = callPackage @@ -134813,7 +138201,6 @@ self: { homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-conduit" = callPackage @@ -135013,6 +138400,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-ip_0_3_0_2" = callPackage + ({ mkDerivation, base, data-default-class, data-dword, data-endian + , data-serializer, data-textual, hashable, parsers, tasty + , tasty-quickcheck, text-printer, type-hint + }: + mkDerivation { + pname = "network-ip"; + version = "0.3.0.2"; + sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf"; + libraryHaskellDepends = [ + base data-default-class data-dword data-endian data-serializer + data-textual hashable parsers text-printer type-hint + ]; + testHaskellDepends = [ + base data-dword data-textual parsers tasty tasty-quickcheck + text-printer + ]; + homepage = "https://github.com/mvv/network-ip"; + description = "Internet Protocol data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-metrics" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, network , random, time @@ -135079,7 +138489,6 @@ self: { homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-multicast" = callPackage @@ -135465,6 +138874,7 @@ self: { homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-uri" = callPackage @@ -135557,7 +138967,6 @@ self: { ]; description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural" = callPackage @@ -135745,7 +139154,6 @@ self: { testHaskellDepends = [ base hspec HUnit ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -135858,8 +139266,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.5.0.1"; - sha256 = "0j3wxzf8p5ck3dxfb6bmv3g8xpknsdalgjgp39i47g4qf27prqgx"; + version = "0.6.0.0"; + sha256 = "0bs0jxxgrq29b14mcslyqa29znbhlx6kwq93jzr995alhn7g92px"; libraryHaskellDepends = [ async base binary bytestring template-haskell unix ]; @@ -136073,7 +139481,6 @@ self: { homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage @@ -136539,6 +139946,20 @@ self: { license = "GPL"; }) {}; + "non-negative_0_1_1_2" = callPackage + ({ mkDerivation, base, QuickCheck, utility-ht }: + mkDerivation { + pname = "non-negative"; + version = "0.1.1.2"; + sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; + libraryHaskellDepends = [ base QuickCheck utility-ht ]; + testHaskellDepends = [ base QuickCheck utility-ht ]; + homepage = "http://code.haskell.org/~thielema/non-negative/"; + description = "Non-negative numbers"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nonce" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text , transformers @@ -136588,7 +140009,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization" = callPackage @@ -136600,6 +140020,7 @@ self: { libraryHaskellDepends = [ base primitive vector ]; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization-ad" = callPackage @@ -136619,6 +140040,7 @@ self: { homepage = "https://github.com/msakai/nonlinear-optimization-ad"; description = "Wrapper of nonlinear-optimization package for using with AD package"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "noodle" = callPackage @@ -136656,10 +140078,8 @@ self: { }: mkDerivation { pname = "normalization-insensitive"; - version = "2.0.0.1"; - sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p"; - revision = "1"; - editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x"; + version = "2.0.1"; + sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -136671,7 +140091,6 @@ self: { homepage = "https://github.com/ppelleti/normalization-insensitive"; description = "Normalization insensitive string comparison"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "normalize-imports" = callPackage @@ -136824,7 +140243,6 @@ self: { homepage = "https://github.com/NICTA/notzero"; description = "A data type for representing numeric values, except zero"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-extras" = callPackage @@ -136833,6 +140251,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; + revision = "1"; + editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -137121,7 +140541,6 @@ self: { homepage = "https://github.com/roelvandijk/numerals"; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numerals-base" = callPackage @@ -137313,14 +140732,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask_0_0_8" = callPackage + "numhask_0_0_9" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest , protolude, QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "numhask"; - version = "0.0.8"; - sha256 = "1mgknk4ilpk216hxclc3zc2gcrk2c9si52r77s6ijhkx398j2v11"; + version = "0.0.9"; + sha256 = "16ss7lqwvmsgwgrj1smvdr5zzj33svi1mj1k5lhik1mm6dhd1c9x"; libraryHaskellDepends = [ adjunctions base distributive protolude QuickCheck vector ]; @@ -137350,6 +140769,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-range_0_1_0" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , doctest, formatting, numhask, protolude, QuickCheck + , semigroupoids, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "numhask-range"; + version = "0.1.0"; + sha256 = "1z5h7vmbq0jx8rcvxd8b9y1w1lnh3hv9mcykajwddjmrk2rxynnp"; + libraryHaskellDepends = [ + adjunctions base containers distributive formatting numhask + protolude QuickCheck semigroupoids + ]; + testHaskellDepends = [ + base doctest numhask tasty tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-range"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -137455,6 +140896,45 @@ self: { homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + }) {}; + + "nvim-hs_0_2_4" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal + , cereal-conduit, conduit, conduit-extra, containers, data-default + , deepseq, directory, dyre, exceptions, filepath, foreign-store + , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec + , messagepack, monad-control, mtl, network, optparse-applicative + , process, QuickCheck, resourcet, setenv, stm, streaming-commons + , template-haskell, text, time, time-locale-compat, transformers + , transformers-base, utf8-string + }: + mkDerivation { + pname = "nvim-hs"; + version = "0.2.4"; + sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default deepseq directory dyre + exceptions filepath foreign-store hslogger lifted-base megaparsec + messagepack monad-control mtl network optparse-applicative process + resourcet setenv stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base utf8-string + ]; + executableHaskellDepends = [ base data-default ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring cereal cereal-conduit conduit + conduit-extra containers data-default directory dyre exceptions + filepath foreign-store hslogger hspec hspec-discover HUnit + lifted-base megaparsec messagepack mtl network optparse-applicative + process QuickCheck resourcet setenv stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base utf8-string + ]; + homepage = "https://github.com/neovimhaskell/nvim-hs"; + description = "Haskell plugin backend for neovim"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137478,7 +140958,6 @@ self: { homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-ghcid" = callPackage @@ -137496,7 +140975,6 @@ self: { homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvvm" = callPackage @@ -137676,6 +141154,7 @@ self: { homepage = "https://github.com/jwaldmann/haskell-obdd"; description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oberon0" = callPackage @@ -137799,7 +141278,30 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; + + "octane_0_20_1" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.1"; + sha256 = "0gaynwg4r5rjdbppcs0cdqq7fbl51y8bqm149bynkgwrbgs4dbfm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -138004,8 +141506,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.3.0.0"; - sha256 = "0k5gknbp54pqbk66cx900lqdrxn0fzfpcpafpfmvz4r49parrj7w"; + version = "0.3.0.1"; + sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138013,7 +141515,8 @@ self: { http-client-tls jose-jwt network network-uri text time tls ]; testHaskellDepends = [ - base bytestring hspec http-client http-client-tls http-types text + aeson base bytestring exceptions hspec http-client http-client-tls + http-types jose-jwt network-uri text time ]; homepage = "https://github.com/krdlab/haskell-oidc-client"; description = "OpenID Connect 1.0 library for RP"; @@ -138269,7 +141772,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "one-time-password" = callPackage @@ -138410,7 +141912,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "opaleye_0_5_3_1" = callPackage + "opaleye_0_5_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, dotenv , hspec, hspec-discover, multiset, postgresql-simple, pretty @@ -138419,8 +141921,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.3.1"; - sha256 = "0hgkvvl3pn9bhiy21jxmcvvbzbsywpavwxcmvcwwnkkcdv679rvx"; + version = "0.5.4.0"; + sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -138598,7 +142100,6 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-union" = callPackage @@ -138614,7 +142115,6 @@ self: { homepage = "https://github.com/bfopa/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-witness" = callPackage @@ -138633,6 +142133,24 @@ self: { homepage = "https://github.com/AshleyYakeley/open-witness"; description = "open witnesses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "open-witness_0_4_0_1" = callPackage + ({ mkDerivation, base, constraints, hashable, mtl, random, tasty + , tasty-hunit, template-haskell, transformers, witness + }: + mkDerivation { + pname = "open-witness"; + version = "0.4.0.1"; + sha256 = "04a10cv0iddnvp5my4h00bmmpc2mxz6c5gih5p4iyc7bdq6m0w07"; + libraryHaskellDepends = [ + base constraints hashable random template-haskell transformers + witness + ]; + testHaskellDepends = [ base mtl tasty tasty-hunit witness ]; + homepage = "https://github.com/AshleyYakeley/open-witness"; + description = "open witnesses"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138646,6 +142164,7 @@ self: { homepage = "https://github.com/hansroland/opench"; description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opencog-atomspace" = callPackage @@ -138883,7 +142402,6 @@ self: { homepage = "http://github.com/elliottt/hsopenid"; description = "An implementation of the OpenID-2.0 spec."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openpgp" = callPackage @@ -139050,7 +142568,6 @@ self: { libraryHaskellDepends = [ base directory HsOpenSSL time unix ]; description = "Create OpenSSL keypairs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssl-streams" = callPackage @@ -139070,7 +142587,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -139364,7 +142880,6 @@ self: { homepage = "https://github.com/emilaxelsson/operational-alacarte"; description = "A version of Operational suitable for extensible EDSLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "operational-class" = callPackage @@ -139981,7 +143496,6 @@ self: { ]; description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orgstat" = callPackage @@ -140058,6 +143572,7 @@ self: { homepage = "https://github.com/luminescent-dreams/orizentic#readme"; description = "Token-based authentication and authorization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -140104,6 +143619,7 @@ self: { libraryHaskellDepends = [ base colour gloss random ]; description = "Implements an osculatory packing (kissing circles) algorithm and display"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osdkeys" = callPackage @@ -140196,7 +143712,7 @@ self: { sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring containers ]; - description = "Parser for OS X static archive format"; + description = "Parser for macOS static archive format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140222,12 +143738,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "otp-authenticator" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, bytestring + , containers, cryptonite, dependent-sum, filepath, h-gpgme + , haskeline, microlens, one-time-password, optparse-applicative + , sandi, singletons, text, time, transformers, trifecta + , type-combinators, unix, uri-encode, witherable, yaml + }: + mkDerivation { + pname = "otp-authenticator"; + version = "0.1.0.1"; + sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors binary bytestring containers cryptonite + dependent-sum filepath h-gpgme haskeline microlens + one-time-password optparse-applicative sandi singletons text time + transformers trifecta type-combinators unix uri-encode witherable + yaml + ]; + executableHaskellDepends = [ + aeson base binary bytestring h-gpgme text yaml + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mstksg/otp-authenticator"; + description = "OTP Authenticator (a la google) command line client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ottparse-pretty" = callPackage ({ mkDerivation, base, containers, parsec, split, uniplate }: mkDerivation { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; + revision = "1"; + editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140497,7 +144045,6 @@ self: { homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pacman-memcache" = callPackage @@ -140611,6 +144158,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagination_0_2_1" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: + mkDerivation { + pname = "pagination"; + version = "0.2.1"; + sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + libraryHaskellDepends = [ base deepseq exceptions ]; + testHaskellDepends = [ base exceptions hspec QuickCheck ]; + homepage = "https://github.com/mrkkrp/pagination"; + description = "Framework-agnostic pagination boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -140813,8 +144374,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.5.0"; - sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl"; + version = "0.2.6.0"; + sha256 = "1mbv2840l6kjc878f6miar3vfbgx2mwllxaryjlj9y6s6001185b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -140849,7 +144410,6 @@ self: { homepage = "https://github.com/baig/pandoc-csv2table-filter"; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-filter-graphviz" = callPackage @@ -140942,7 +144502,6 @@ self: { homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-placetable" = callPackage @@ -141181,29 +144740,28 @@ self: { "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base , papa-base-export, papa-base-implement, papa-bifunctors - , papa-bifunctors-export, papa-bifunctors-implement, papa-export - , papa-implement, papa-lens, papa-lens-export, papa-lens-implement - , papa-semigroupoids, papa-semigroupoids-export - , papa-semigroupoids-implement, QuickCheck, template-haskell + , papa-bifunctors-export, papa-bifunctors-implement, papa-lens + , papa-lens-export, papa-lens-implement, papa-semigroupoids + , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x + , papa-x-export, papa-x-implement, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.2.1"; - sha256 = "11jklw09xgsd75q85yivsgdab82kg0s98nnarlbid5q433gszs8v"; + version = "0.3.0"; + sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors - papa-bifunctors-export papa-bifunctors-implement papa-export - papa-implement papa-lens papa-lens-export papa-lens-implement - papa-semigroupoids papa-semigroupoids-export - papa-semigroupoids-implement + papa-bifunctors-export papa-bifunctors-implement papa-lens + papa-lens-export papa-lens-implement papa-semigroupoids + papa-semigroupoids-export papa-semigroupoids-implement papa-x + papa-x-export papa-x-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; + homepage = "https://github.com/qfpl/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-base" = callPackage @@ -141213,53 +144771,49 @@ self: { }: mkDerivation { pname = "papa-base"; - version = "0.2.0"; - sha256 = "1hvkjjjwh1m3d3mck5z1szr2f2g4agj20hvrcxwm3iig3nqz04cb"; + version = "0.3.0"; + sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-export" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + , semigroups, template-haskell }: mkDerivation { pname = "papa-base-export"; - version = "0.2.0"; - sha256 = "0jm98mfs339paah260idshsdz1f4hqfnz0c520f7dsvipks81v0z"; - revision = "1"; - editedCabalFile = "1y18rf9q5b6h03870wvlqj53l86r0ad25wm4mv035z1h1c6qmaqn"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z"; + libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-export"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, directory, doctest, filepath + , papa-base-export, QuickCheck, semigroups, template-haskell }: mkDerivation { pname = "papa-base-implement"; - version = "0.2.0"; - sha256 = "0787w4r79aa94nwihzwvc9vash6bqlrg3mkw760ssygl8p5f9834"; - revision = "1"; - editedCabalFile = "1rb6bm8frga4fh865lrwhwpafgi7x8fq4cshb1j869fj0hzfig70"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx"; + libraryHaskellDepends = [ base papa-base-export semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-implement"; + homepage = "https://github.com/qfpl/papa"; description = "Useful base functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141271,15 +144825,15 @@ self: { }: mkDerivation { pname = "papa-bifunctors"; - version = "0.2.0"; - sha256 = "0gwqqf141gq20bf9p3gm3ki8x3xnqkgkbbjd5vgars8gj0scqmga"; + version = "0.3.0"; + sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141290,13 +144844,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-export"; - version = "0.2.0"; - sha256 = "0q1px6sr1pqc6q33mvys5wnbdz2ydma6dcn0fd2m58kvxcq53163"; + version = "0.3.0"; + sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141307,13 +144861,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-implement"; - version = "0.2.0"; - sha256 = "04qndk9sca9mrya3lqnb9678dflh2s09j5n8bfa8102hici29fic"; + version = "0.3.0"; + sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `bifunctors` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141385,15 +144939,15 @@ self: { }: mkDerivation { pname = "papa-lens"; - version = "0.2.0"; - sha256 = "1m9cladf481w4yql8d1wrahinzfwgdbiyl4mdvxa9ls9rivq54zb"; + version = "0.3.0"; + sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141404,13 +144958,13 @@ self: { }: mkDerivation { pname = "papa-lens-export"; - version = "0.2.0"; - sha256 = "1c8fydf4gi9zq6962f936n0g33cpjmxrr5wdazr7qja7jjdn3sm3"; + version = "0.3.0"; + sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `lens`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141421,13 +144975,13 @@ self: { }: mkDerivation { pname = "papa-lens-implement"; - version = "0.2.1"; - sha256 = "0bwwmsnq5a957p3gj9m9r0vx5a3vqyjbywqhl9m2plgzbwlqxfd9"; + version = "0.3.0"; + sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `lens` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141447,7 +145001,6 @@ self: { homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-core" = callPackage @@ -141500,7 +145053,6 @@ self: { homepage = "https://github.com/data61/papa-prelude-semigroupoids"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa-prelude-semigroups" = callPackage @@ -141527,15 +145079,15 @@ self: { }: mkDerivation { pname = "papa-semigroupoids"; - version = "0.2.0"; - sha256 = "1gl9kp6c0h6abpx4lxb9lkksbxs5h0rdxjykc3g1fwgsljklk1ry"; + version = "0.3.0"; + sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141546,31 +145098,82 @@ self: { }: mkDerivation { pname = "papa-semigroupoids-export"; - version = "0.2.0"; - sha256 = "06b5pygdbvmkvfmd27gf6z16shiqkrybm5smijs1iilm7yd4ms8v"; + version = "0.3.0"; + sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `semigroupoids`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, template-haskell + , semigroupoids, semigroups, template-haskell }: mkDerivation { pname = "papa-semigroupoids-implement"; - version = "0.2.1"; - sha256 = "0zr8vx3vpkilwmwl73ll6ajs9by65sd6n96binrf0wf68jwb41rh"; - libraryHaskellDepends = [ base semigroupoids ]; + version = "0.3.0"; + sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd"; + libraryHaskellDepends = [ base semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; - description = "useful `bifunctors` functions reimplemented"; + homepage = "https://github.com/qfpl/papa"; + description = "useful `semigroupoids` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, papa-x-export + , papa-x-implement, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-x"; + version = "0.3.0"; + sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4"; + libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-export"; + version = "0.3.0"; + sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "export useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-implement"; + version = "0.3.0"; + sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "useful functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141606,6 +145209,27 @@ self: { homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; description = "packrat parser"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "papillon_0_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, monads-tf + , template-haskell, transformers + }: + mkDerivation { + pname = "papillon"; + version = "0.1.0.5"; + sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monads-tf template-haskell transformers + ]; + executableHaskellDepends = [ + base directory filepath monads-tf template-haskell transformers + ]; + homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; + description = "packrat parser"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141645,6 +145269,7 @@ self: { homepage = "https://github.com/mitsuji/paprika#readme"; description = "The Haskell library and examples for the kids programming robot paprika"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "para" = callPackage @@ -141971,7 +145596,6 @@ self: { libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-free" = callPackage @@ -142204,6 +145828,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parser-combinators_0_2_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "0.2.0"; + sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -142282,6 +145919,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsers_0_12_6" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal + , cabal-doctest, charset, containers, directory, doctest, filepath + , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.6"; + sha256 = "1jyffc1i9vihhxk5r69qmrnhsjsw2g7r0yxh3svvy1wrcz1vfcik"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base base-orphans charset containers mtl parsec + scientific text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory doctest filepath + parsec QuickCheck quickcheck-instances + ]; + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parsestar" = callPackage ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap , bytestring-nums, bytestring-show, containers, deepseq, derive @@ -142374,7 +146036,6 @@ self: { homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-lens" = callPackage @@ -142409,7 +146070,6 @@ self: { homepage = "https://github.com/mtesseract/haskell-partial-order"; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-uri" = callPackage @@ -142675,20 +146335,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_3_2" = callPackage + "path-io_1_3_3" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.3.2"; - sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp"; + version = "1.3.3"; + sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat ]; testHaskellDepends = [ - base exceptions hspec path transformers unix-compat + base directory exceptions hspec path transformers unix-compat ]; homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; @@ -143170,6 +146830,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcre-utils_0_1_8_1_1" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl + , regex-pcre-builtin, vector + }: + mkDerivation { + pname = "pcre-utils"; + version = "0.1.8.1.1"; + sha256 = "1x3db1hab0qwpw9m4564x86qibzg8jl6cj2k88jii3ihcg580ahz"; + libraryHaskellDepends = [ + array attoparsec base bytestring mtl regex-pcre-builtin vector + ]; + testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ]; + homepage = "https://github.com/bartavelle/pcre-utils"; + description = "Perl-like substitute and split for PCRE regexps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, directory, exceptions, haskintex, HaTeX @@ -143194,7 +146872,6 @@ self: { homepage = "https://github.com/NCrashed/pdf-slave#readme"; description = "Tool to generate PDF from haskintex templates and YAML input"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-slave-server" = callPackage @@ -143246,7 +146923,6 @@ self: { homepage = "https://github.com/ncrashed/pdf-slave#readme"; description = "Template format definition for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-content" = callPackage @@ -143362,8 +147038,8 @@ self: { }: mkDerivation { pname = "pdfname"; - version = "0.2"; - sha256 = "18ihz3vir5py6fbkqdnh8yjvsgjwavb7g601abdihrrp2p255lpn"; + version = "0.3"; + sha256 = "01xy5rg2n1x2fpqwhnbrmxqqma40zxr8ac0mv06qnyidyggrsggz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143431,12 +147107,11 @@ self: { pname = "peano"; version = "0.1.0.1"; sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; - revision = "1"; - editedCabalFile = "0sf4iv77bgkr4n50ap27cxy9gkdx030dbg3f6wxk0rwa7sxdjkal"; + revision = "2"; + editedCabalFile = "10b0vjc7lnfkscg2c8hhqbvf1xdvgbr3njrs9b4ick91n44vjbhk"; libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -143809,7 +147484,6 @@ self: { homepage = "https://github.com/w3rs/period"; description = "Parse and format date periods, collapse and expand their text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "periodic" = callPackage @@ -143983,7 +147657,6 @@ self: { ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-cereal" = callPackage @@ -144112,7 +147785,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql" = callPackage @@ -144132,7 +147804,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -144160,6 +147831,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql-haskell_0_3_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-control, monad-logger, mysql-haskell, network + , persistent, persistent-template, resource-pool, resourcet, text + , time, tls, transformers + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.3.3"; + sha256 = "1dvdz1l5kpliy9h3l11vlrx9yis7a1a54fnj2c764pg6s5kp8rjq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-control + monad-logger mysql-haskell network persistent resource-pool + resourcet text time tls transformers + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -144192,7 +147889,6 @@ self: { testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-postgresql" = callPackage @@ -144244,7 +147940,6 @@ self: { homepage = "https://github.com/jprider63/persistent-ratelimit"; description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-redis" = callPackage @@ -144307,6 +148002,7 @@ self: { homepage = "http://github.com/himura/persistent-relational-record"; description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-sqlite" = callPackage @@ -144672,6 +148368,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; + revision = "2"; + editedCabalFile = "11p3bcr82rm4pry1dqxgnzsgi50qiwma8bvfbm13fq7jy2qj51vq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144682,7 +148380,6 @@ self: { ]; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -144897,19 +148594,20 @@ self: { }) {}; "phone-numbers" = callPackage - ({ mkDerivation, base, bytestring, phonenumber }: + ({ mkDerivation, base, bytestring, c2hs, phonenumber, protobuf }: mkDerivation { pname = "phone-numbers"; - version = "0.1.0"; - sha256 = "10afhnlphgyxsmkv576c5gf5b78d3j2qs46s2crlgfav1y9crv0f"; + version = "0.1.1"; + sha256 = "09b5qp7c059wah6wddn71hk6ciijj07qylxh3xcff0qyvjqd18ya"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ phonenumber ]; + librarySystemDepends = [ phonenumber protobuf ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/christian-marie/phone-numbers"; description = "Haskell bindings to the libphonenumber library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {phonenumber = null;}; + }) {phonenumber = null; inherit (pkgs) protobuf;}; "phone-push" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring @@ -145481,7 +149179,6 @@ self: { homepage = "https://github.com/jwiegley/pipes-async"; description = "A higher-level interface to using concurrency with pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-attoparsec" = callPackage @@ -145627,6 +149324,8 @@ self: { pname = "pipes-cacophony"; version = "0.5.0"; sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20"; + revision = "1"; + editedCabalFile = "1qv6h09y5pca3agkmn12lg9vlbm5j8s3dnrn98w9agj62jrvymzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cacophony pipes ]; @@ -145634,7 +149333,6 @@ self: { homepage = "https://github.com/centromere/pipes-cacophony#readme"; description = "Pipes for Noise-secured network connections"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-category" = callPackage @@ -146000,13 +149698,12 @@ self: { ({ mkDerivation, base, containers, heaps, pipes }: mkDerivation { pname = "pipes-interleave"; - version = "1.1.1"; - sha256 = "0l7g184ksrh9qy8ixh49iv13amiwh40v6bbx0gcgq451knfl4n17"; + version = "1.1.2"; + sha256 = "0anjd66z0z7813jcakqcagp4ml8q4dg6bvygy8mn2jqggm2bqs4d"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-io" = callPackage @@ -146072,8 +149769,8 @@ self: { }: mkDerivation { pname = "pipes-lzma"; - version = "0.1.1.1"; - sha256 = "09ndjxrfh55269gjpm61h65bk0xcv46dah8i0svxcdq4myc8d9r4"; + version = "0.1.1.2"; + sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring lzma pipes ]; @@ -146286,10 +149983,8 @@ self: { }: mkDerivation { pname = "pipes-s3"; - version = "0.3.0.2"; - sha256 = "1rx45znf7ln23gd41fwgfzvqzgqw59w7ab7vnk175waayldbp2gx"; - revision = "1"; - editedCabalFile = "0w1bmf15k6jdiqpcfv8gk41zhh2kr33ch3r72g6rxh42akia99iy"; + version = "0.3.0.3"; + sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -146464,7 +150159,6 @@ self: { homepage = "https://github.com/peddie/pipes-zeromq4"; description = "Pipes integration for ZeroMQ messaging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-zlib" = callPackage @@ -146814,7 +150508,6 @@ self: { homepage = "https://github.com/pjones/playlists"; description = "Library and executable for working with playlist files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "playlists-http" = callPackage @@ -146844,7 +150537,7 @@ self: { sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base64-bytestring bytestring hxt ]; - description = "Generate and parse Mac OS X property list format"; + description = "Generate and parse macOS property list format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146950,7 +150643,6 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3" = callPackage @@ -147009,6 +150701,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-light_0_2_7" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg + , colour, hspec, mtl, palette, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "plot-light"; + version = "0.2.7"; + sha256 = "0w1mbhws7fs0kld61fd9f9xyvfpzsjhh6ic6ny89gka4421p002s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-svg colour mtl palette scientific text time + ]; + executableHaskellDepends = [ + attoparsec attoparsec-time base blaze-svg colour palette scientific + text time + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/plot-light"; + description = "A lightweight plotting library, exporting to SVG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plotfont" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { @@ -147108,7 +150825,6 @@ self: { homepage = "http://hub.darcs.net/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plugins-auto" = callPackage @@ -147176,7 +150892,6 @@ self: { executableHaskellDepends = [ base bytestring linear vector ]; description = "PLY file loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "png-file" = callPackage @@ -147483,7 +151198,6 @@ self: { librarySystemDepends = [ poker-eval ]; description = "Binding to libpoker-eval"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) poker-eval;}; "pokitdok" = callPackage @@ -147598,7 +151312,6 @@ self: { libraryHaskellDepends = [ base constraints ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poly-control" = callPackage @@ -147750,7 +151463,6 @@ self: { homepage = "https://github.com/kawu/polysoup"; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polytypeable" = callPackage @@ -147924,7 +151636,6 @@ self: { homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -148210,7 +151921,6 @@ self: { homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) acl;}; "posix-error-codes" = callPackage @@ -148583,7 +152293,6 @@ 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 @@ -148628,7 +152337,6 @@ self: { ]; description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -148655,6 +152363,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple-migration_0_1_11_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash + , directory, hspec, postgresql-simple, text, time + }: + mkDerivation { + pname = "postgresql-simple-migration"; + version = "0.1.11.0"; + sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple time + ]; + executableHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple text time + ]; + testHaskellDepends = [ base bytestring hspec postgresql-simple ]; + homepage = "https://github.com/ameingast/postgresql-simple-migration"; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, data-default, either, hspec , optparse-applicative, optparse-generic, postgresql-simple @@ -148673,7 +152406,6 @@ self: { homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme"; description = "An optparse-applicative parser for postgresql-simple's connection options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-queue" = callPackage @@ -148898,25 +152630,25 @@ self: { "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base - , base64-bytestring, bytestring, configurator, containers, either - , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json - , http-types, jwt, lens, lens-aeson, optparse-applicative - , postgresql-libpq, protolude, retry, stm, stm-containers - , stringsearch, text, time, transformers, unix + , base64-bytestring, bytestring, configurator, containers + , contravariant, either, hasql, hasql-pool, heredoc, hspec + , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson + , optparse-applicative, postgresql-libpq, protolude, retry, stm + , stm-containers, stringsearch, text, time, transformers, unix , unordered-containers, wai, wai-app-static, wai-extra , wai-websockets, warp, websockets }: mkDerivation { pname = "postgrest-ws"; - version = "0.3.3.0"; - sha256 = "0w1hgn0lg6p3zc5n43d2wqr18kwvbvvhp8al3ggf3jjx04sn3sih"; + version = "0.4.0.0"; + sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring either hasql hasql-pool http-types jwt lens - lens-aeson postgresql-libpq protolude retry stm stm-containers - stringsearch text time unordered-containers wai wai-websockets - websockets + aeson base bytestring contravariant either hasql hasql-pool + http-types jwt lens lens-aeson postgresql-libpq protolude retry stm + stm-containers stringsearch text time unordered-containers wai + wai-websockets websockets ]; executableHaskellDepends = [ ansi-wl-pprint auto-update base base64-bytestring bytestring @@ -149011,7 +152743,6 @@ self: { homepage = "http://github.com/peti/postmaster"; description = "Postmaster ESMTP Server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potato-tool" = callPackage @@ -149057,7 +152788,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powermate" = callPackage @@ -149073,7 +152803,6 @@ self: { homepage = "https://github.com/ppelleti/powermate"; description = "bindings for Griffin PowerMate USB"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerpc" = callPackage @@ -149194,7 +152923,6 @@ self: { homepage = "https://github.com/gdevanla/pptable#readme"; description = "Pretty Print containers in a tabular format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pqc" = callPackage @@ -149223,6 +152951,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_3_2_3" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.3.2.3"; + sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Reliable, persistent, fast priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -149290,8 +153031,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.47"; - sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w"; + version = "0.0.49"; + sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149519,7 +153260,6 @@ self: { homepage = "https://github.com/jxv/pregame"; description = "Prelude for applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "preliminaries" = callPackage @@ -149542,7 +153282,6 @@ self: { homepage = "http://github.com/kerscher/preliminaries"; description = "A larger alternative to the Prelude"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prelude-compat" = callPackage @@ -149719,7 +153458,6 @@ self: { homepage = "https://github.com/chrisdone/present"; description = "Make presentations for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "press" = callPackage @@ -149793,12 +153531,18 @@ self: { }) {}; "pretty-compact" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , criterion, deepseq, pretty, text, unordered-containers, wl-pprint + }: mkDerivation { pname = "pretty-compact"; - version = "2.0"; - sha256 = "09nyx24b15qgk6cn71m05q56kfcvm2582wywf8b9d1h0k4bhic0k"; - libraryHaskellDepends = [ base containers ]; + version = "2.1"; + sha256 = "0723zp6577vwfrhr2hnn439hc90h6qh6sgrshywhd5yks673vgf5"; + libraryHaskellDepends = [ base base-compat containers ]; + benchmarkHaskellDepends = [ + aeson base base-compat bytestring criterion deepseq pretty text + unordered-containers wl-pprint + ]; description = "Pretty-printing library"; license = "GPL"; }) {}; @@ -149831,7 +153575,6 @@ self: { homepage = "https://github.com/jml/pretty-error"; description = "Pretty error messages for runtime invariants"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-hex" = callPackage @@ -149896,7 +153639,6 @@ self: { homepage = "https://github.com/cdepillabout/pretty-simple"; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -149966,8 +153708,8 @@ self: { pname = "prettyprinter"; version = "1.1"; sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y"; - revision = "2"; - editedCabalFile = "0gfxgc3jrnxa54arih1ys1qbswyx7waxp06ib8ifd3rw64yjn16j"; + revision = "3"; + editedCabalFile = "0y6qhf5bxbwxpy4xma05h806mxfn52kvf5f29r1hdpm2xlcab5hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -149984,6 +153726,34 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_1_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.1.1"; + sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base template-haskell text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base containers criterion deepseq mtl QuickCheck + random text transformers + ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "A modern, easy to use, well-documented, extensible prettyprinter"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -149998,6 +153768,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-ansi-terminal_1_1_1_1" = callPackage + ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1.1.1"; + sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl"; + revision = "1"; + editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -150042,6 +153829,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-convert-ansi-wl-pprint" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest + , prettyprinter, prettyprinter-ansi-terminal, text + }: + mkDerivation { + pname = "prettyprinter-convert-ansi-wl-pprint"; + version = "1.1"; + sha256 = "03565w1qvqgdr1g2nwj3d2xpqbx04xm45pjfkb9d6jb2fww2v65q"; + revision = "1"; + editedCabalFile = "1c4zcscmvq0vbdgnp7n0avv8si5jshl4kw2qd1lqmhr28kj8x45f"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-vty" = callPackage ({ mkDerivation, base, prettyprinter, vty }: mkDerivation { @@ -150054,12 +153862,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "preview" = callPackage + ({ mkDerivation, base, containers, pretty, strict-data, text + , util-plus + }: + mkDerivation { + pname = "preview"; + version = "0.1.0.4"; + sha256 = "0z8dz0frc43jnm65iybvpcn2689c3q2iy3zdqjs623clwsvrmh3b"; + libraryHaskellDepends = [ + base containers pretty strict-data text util-plus + ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "The method of previewing data (instead of wholly show-ing it)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-array" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "prim-array"; - version = "0.2"; - sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9"; + version = "0.2.1"; + sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; @@ -150210,7 +154034,6 @@ self: { homepage = "https://github.com/andrewthad/pringletons"; description = "Classes and data structures complementing the singletons library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "print-debugger" = callPackage @@ -150820,6 +154643,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctors_5_2_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.2.1"; + sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + tagged transformers + ]; + homepage = "http://github.com/ekmett/profunctors/"; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "progress" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -151230,8 +155071,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.6.1"; - sha256 = "1j8768v7al7fxvg8z71pd7lq89qcdkpmnnmz1f2y8zfjw8mcn7wp"; + version = "4.7.6"; + sha256 = "0nqhhgrcjq8zbnvarrgn2ijk7pmyb2blzh1896jxij828zq9rddd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151341,7 +155182,6 @@ self: { executableHaskellDepends = [ base bytestring filepath ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libpulseaudio;}; "proto-lens" = callPackage @@ -151360,6 +155200,24 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens_0_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, lens-family, parsec, pretty, text + , transformers, void + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class + lens-family parsec pretty text transformers void + ]; + homepage = "https://github.com/google/proto-lens"; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -151377,6 +155235,22 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens-arbitrary_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.1.1"; + sha256 = "1jdp2axwvmdifssqq1i4ik1dv7zn0sdvj6jy45bi0nxyr5mqzhlm"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -151404,6 +155278,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-combinators_0_1_0_8" = callPackage + ({ mkDerivation, base, Cabal, data-default-class, HUnit + , lens-family, lens-family-core, proto-lens, proto-lens-protoc + , test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "proto-lens-combinators"; + version = "0.1.0.8"; + sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base data-default-class lens-family proto-lens proto-lens-protoc + transformers + ]; + testHaskellDepends = [ + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Utilities functions to proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text @@ -151420,6 +155318,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-descriptors_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , lens-family, lens-labels, proto-lens, text + }: + mkDerivation { + pname = "proto-lens-descriptors"; + version = "0.2.2.0"; + sha256 = "1vjvr931ylnmpclizbrhqsx0x5jbmcbir0s53zpvm0f0vnwlwgqb"; + libraryHaskellDepends = [ + base bytestring containers data-default-class lens-family + lens-labels proto-lens text + ]; + description = "Protocol buffers for describing the definitions of messages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-optparse" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { @@ -151432,6 +155347,20 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens-optparse_0_1_0_4" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.0.4"; + sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -151449,6 +155378,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts @@ -151472,6 +155419,31 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "proto-lens-protoc_0_2_2_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, directory, filepath, haskell-src-exts + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.3"; + sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class directory + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text + ]; + executableHaskellDepends = [ + base bytestring containers data-default-class filepath + haskell-src-exts lens-family proto-lens proto-lens-descriptors text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -151565,6 +155537,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.3"; + sha256 = "1spxilp6zk30ijcr3vqgnzbznc0g3050cy9258931vz2zfkjc6kd"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -151580,6 +155570,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.3"; + sha256 = "1wwn4lwzl0l8bbw99hdh9xizc39hvjr9cxc5sww8f4zh2vbyw99p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -151633,6 +155639,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text + , transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.2"; + sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat safe stm text transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -151886,7 +155911,6 @@ self: { ]; description = "Pipe stdin to a redis pub/sub channel"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffix" = callPackage @@ -151905,6 +155929,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20170802" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20170802"; + sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -152044,7 +156085,6 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-DrIFT" = callPackage @@ -152229,7 +156269,6 @@ self: { homepage = "https://github.com/bosu/pure-cdb"; description = "Another pure-haskell CDB (Constant Database) implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-fft" = callPackage @@ -152393,6 +156432,7 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -152449,6 +156489,7 @@ self: { homepage = "https://github.com/soupi/pursuit-client"; description = "A cli client for pursuit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "push-notify" = callPackage @@ -152539,8 +156580,8 @@ self: { }: mkDerivation { pname = "pushbullet-types"; - version = "0.2.0.0"; - sha256 = "1r57l48xzfraa85lrkx9i8dmlrjicavz0fxr8l6c28iisj6db8js"; + version = "0.4.0.0"; + sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -152587,6 +156628,28 @@ self: { homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; + }) {}; + + "pusher-http-haskell_1_3_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash, hashable, hspec, http-client, http-types, QuickCheck + , text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.3.0.0"; + sha256 = "1pppzhr6507y1fl2w3w876bhwbbm5mvss4qfavrbhzi9ycqk2hrp"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types QuickCheck text + transformers unordered-containers + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -152598,8 +156661,8 @@ self: { }: mkDerivation { pname = "pusher-ws"; - version = "0.1.0.0"; - sha256 = "0gdbxrvcnhr0y229i9k5rc9fp73fvrnvsj77mw8pibnq2djfqx5s"; + version = "0.1.0.1"; + sha256 = "0i5659wljhaindimm8b6khibr8mcmcr5iaags2a33zjb67gjbsd7"; libraryHaskellDepends = [ aeson base bytestring containers deepseq hashable http-conduit lens lens-aeson network scientific stm text time transformers @@ -152608,7 +156671,6 @@ self: { homepage = "https://github.com/barrucadu/pusher-ws"; description = "Implementation of the Pusher WebSocket protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pushme" = callPackage @@ -152750,28 +156812,26 @@ self: { "pvss" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite - , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory - , tasty, tasty-quickcheck + , cryptonite-openssl, deepseq, foundation, hourglass, integer-gmp + , memory, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "pvss"; - version = "0.1"; - sha256 = "16gwq23d7p34n23ydi82lxz7cjvwdc684s36915fb2hm8k60n57s"; - revision = "1"; - editedCabalFile = "03nx4w2b6i2wn4x4ggbizc4k9y5bkjq4ihli5ln8bs60slz84srd"; + version = "0.2.0"; + sha256 = "130249k3gly9msd8x514qlq0gjqi60hjps2176j83ifa0d818h74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring cryptonite cryptonite-openssl deepseq - integer-gmp memory + foundation integer-gmp memory ]; executableHaskellDepends = [ - base cryptonite deepseq hourglass memory + base cryptonite deepseq hourglass memory vector ]; testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; homepage = "https://github.com/input-output-hk/pvss-haskell#readme"; description = "Public Verifiable Secret Sharing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "pwstore-cli" = callPackage @@ -152918,6 +156978,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qchas" = callPackage + ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }: + mkDerivation { + pname = "qchas"; + version = "1.0.1.0"; + sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam"; + libraryHaskellDepends = [ base hmatrix random ]; + testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; + homepage = "https://github.com/ardeleanasm/qchas#readme"; + description = "A library for implementing Quantum Algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qd" = callPackage ({ mkDerivation, base, floatshow, qd }: mkDerivation { @@ -153013,6 +157086,7 @@ self: { homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; description = "Implementation of interpolated multiline strings"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qr-imager" = callPackage @@ -153240,14 +157314,18 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, hashable, path-pieces, text }: + ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text + , vector + }: mkDerivation { pname = "quantification"; - version = "0.1.1"; - sha256 = "092qnimc99x1n1g0mfpgsr85fbyd33isjsd9cc8rgb1n44ryj14m"; - libraryHaskellDepends = [ aeson base hashable path-pieces text ]; + version = "0.2"; + sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; + libraryHaskellDepends = [ + aeson base ghc-prim hashable path-pieces text vector + ]; homepage = "https://github.com/andrewthad/quantification#readme"; - description = "Data types and typeclasses to deal with universally and existentially quantified types"; + description = "Rage against the quantification"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153524,7 +157602,6 @@ self: { libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-instances" = callPackage @@ -153746,7 +157823,6 @@ self: { homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-state-machine" = callPackage @@ -153834,7 +157910,6 @@ self: { homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples"; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicklz" = callPackage @@ -153932,7 +158007,6 @@ self: { homepage = "https://github.com/SamuelSchlesinger/Quickterm"; description = "An interface for describing and executing terminal applications"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicktest" = callPackage @@ -154150,7 +158224,6 @@ self: { ]; description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-interleave" = callPackage @@ -154276,7 +158349,6 @@ self: { executableHaskellDepends = [ base ]; description = "A library and program to create QIF files from Rabobank CSV exports"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rad" = callPackage @@ -154324,7 +158396,6 @@ self: { homepage = "https://github.com/klangner/radium"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium-formula-parser" = callPackage @@ -154549,6 +158620,7 @@ self: { homepage = "https://github.com/ciez/raketka"; description = "distributed-process node"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rakhana" = callPackage @@ -154693,8 +158765,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.0"; - sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd"; + version = "0.1.1"; + sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh"; libraryHaskellDepends = [ base bytestring mwc-random ]; benchmarkHaskellDepends = [ async base bytestring criterion entropy ghc-prim mwc-random @@ -154899,7 +158971,6 @@ self: { homepage = "https://bitbucket.org/kpratt/random-variate"; description = "\"Uniform RNG => Non-Uniform RNGs\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "randomgen" = callPackage @@ -155063,8 +159134,8 @@ self: { ({ mkDerivation, base, doctest, template-haskell, transformers }: mkDerivation { pname = "rank2classes"; - version = "0.1"; - sha256 = "1izr3nrbrrcf4496m0p5fpvd9h6gzgirb6q76kvn4chd4p45j0iz"; + version = "0.2"; + sha256 = "017vz33qafc1synzccl3p3cws010vg03l13i5y5igfs8f1rf5l80"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/blamario/grampa/tree/master/rank2classes"; @@ -155400,6 +159471,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_3_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, http-client, http-client-tls, http-types + , tasty, tasty-hspec, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "0.3.5"; + sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base filepath tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -155416,6 +159507,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "0.3.1"; + sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + homepage = "https://github.com/tfausak/ratel-wai#readme"; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -155460,7 +159568,6 @@ self: { homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rattletrap_2_5_2" = callPackage @@ -155671,7 +159778,6 @@ self: { homepage = "http://paychandoc.runeks.me/"; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bitcoin-payment-protocol = null;}; @@ -155714,8 +159820,10 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2"; - sha256 = "0i88w7yg1q6fbkqfkvmnxxg9wg90sxv6c0shb8hvx0afz1mfhrz3"; + version = "0.2.1"; + sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; + revision = "1"; + editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -155981,7 +160089,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -156087,7 +160194,6 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -156165,7 +160271,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -156184,7 +160289,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -156252,7 +160356,6 @@ self: { homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "read-editor" = callPackage @@ -156464,6 +160567,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_1" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.1"; + sha256 = "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -156622,7 +160748,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -156660,7 +160785,24 @@ self: { homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "recursion-schemes-ext" = callPackage + ({ mkDerivation, base, composition-prelude, criterion, hspec + , recursion-schemes + }: + mkDerivation { + pname = "recursion-schemes-ext"; + version = "0.1.0.1"; + sha256 = "1g24mcb6qdpq6ggnixbb82iq3b3fhrgpspgrblk9cwwrpl1arnhg"; + libraryHaskellDepends = [ + base composition-prelude recursion-schemes + ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; + description = "Amateur addenda to recursion-schemes"; + license = stdenv.lib.licenses.bsd3; }) {}; "recursive-line-count" = callPackage @@ -157068,6 +161210,29 @@ self: { homepage = "https://github.com/lazac/references"; description = "Selectors for reading and updating data"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "references_0_3_2_2" = callPackage + ({ mkDerivation, array, base, containers, directory, either + , filepath, HUnit, instance-control, lens, mtl, template-haskell + , text, transformers, uniplate + }: + mkDerivation { + pname = "references"; + version = "0.3.2.2"; + sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary"; + libraryHaskellDepends = [ + array base containers directory either filepath instance-control + mtl template-haskell text transformers uniplate + ]; + testHaskellDepends = [ + array base containers directory either filepath HUnit + instance-control lens mtl template-haskell text transformers + uniplate + ]; + homepage = "https://github.com/lazac/references"; + description = "Selectors for reading and updating data"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -157467,7 +161632,6 @@ self: { homepage = "https://github.com/oreshinya/refty"; description = "Formatted JSON generator for API server inspired by normalizr"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refurb" = callPackage @@ -157496,7 +161660,6 @@ self: { homepage = "https://github.com/ConferHealth/refurb#readme"; description = "Tools for maintaining a database"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex" = callPackage @@ -157518,7 +161681,6 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -157692,7 +161854,6 @@ self: { homepage = "http://regex.uk"; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-genex" = callPackage @@ -157979,7 +162140,6 @@ self: { homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -158019,7 +162179,6 @@ self: { homepage = "http://functionalley.eu/RegExChar/regExChar.html"; description = "A POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexdot" = callPackage @@ -158036,7 +162195,6 @@ self: { homepage = "http://functionalley.eu/RegExDot/regExDot.html"; description = "A polymorphic, POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexp-tries" = callPackage @@ -158308,7 +162466,6 @@ self: { homepage = "https://github.com/kerkomen/rei"; description = "Process lists easily"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reified-records" = callPackage @@ -158355,7 +162512,6 @@ self: { homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relacion" = callPackage @@ -158387,7 +162543,6 @@ self: { homepage = "https://github.com/iostat/relapse#readme"; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relation" = callPackage @@ -158419,6 +162574,7 @@ self: { homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8"; description = "PostgreSQL v8.x driver for haskell-relational-record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query" = callPackage @@ -158503,7 +162659,6 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -158873,6 +163028,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-array" = callPackage @@ -158989,7 +163145,6 @@ self: { ]; description = "Perform fft with repa via FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -159026,6 +163181,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-linear-algebra" = callPackage @@ -159106,7 +163262,6 @@ self: { ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-stream" = callPackage @@ -159374,28 +163529,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req_0_3_1" = callPackage + "req_0_4_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, data-default-class , hspec, hspec-core, http-api-data, http-client, http-client-tls - , http-types, mtl, QuickCheck, retry, text, time, transformers - , unordered-containers + , http-types, monad-control, mtl, QuickCheck, retry, text, time + , transformers, transformers-base, unordered-containers }: mkDerivation { pname = "req"; - version = "0.3.1"; - sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a"; + version = "0.4.0"; + sha256 = "1ahs0ig9xi2i6470q6vdc011pk2l0sp39jr1n3f9a0mp5l0m7n0s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring case-insensitive connection data-default-class http-api-data - http-client http-client-tls http-types mtl retry text time - transformers + http-client http-client-tls http-types monad-control mtl retry text + time transformers transformers-base ]; testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types mtl - QuickCheck retry text time unordered-containers + data-default-class hspec hspec-core http-client http-types + monad-control mtl QuickCheck retry text time unordered-containers ]; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; @@ -159429,14 +163584,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req-conduit_0_2_0" = callPackage + "req-conduit_0_2_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh }: mkDerivation { pname = "req-conduit"; - version = "0.2.0"; - sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg"; + version = "0.2.1"; + sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; + revision = "1"; + editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -159494,6 +163651,18 @@ self: { homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; + }) {}; + + "rerebase_1_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.1"; + sha256 = "17x606gm0mfy7xgfy1dby8gxs4jzspnrlchv1d93rjqklr2wsyyv"; + libraryHaskellDepends = [ rebase ]; + homepage = "https://github.com/nikita-volkov/rerebase"; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -160120,6 +164289,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rethinkdb-client-driver_0_0_24" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , criterion, hashable, hspec, hspec-smallcheck, mtl, network + , old-locale, scientific, smallcheck, stm, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "rethinkdb-client-driver"; + version = "0.0.24"; + sha256 = "06fhrip547mgv0nqjsiilbdhc0nphqqwy3qacxw36macvg6mhsbb"; + libraryHaskellDepends = [ + aeson base binary bytestring containers hashable mtl network + old-locale scientific stm template-haskell text time + unordered-containers vector + ]; + testHaskellDepends = [ + base hspec hspec-smallcheck smallcheck text time + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion text time unordered-containers vector + ]; + homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; + description = "Client driver for RethinkDB"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-model" = callPackage ({ mkDerivation, aeson, base, mtl, rethinkdb, text, transformers , unordered-containers @@ -160583,6 +164780,7 @@ self: { homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riot" = callPackage @@ -160816,7 +165014,6 @@ self: { homepage = "https://github.com/grwlf/rl"; description = "Collection of Reinforcement Learning algorithms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlglue" = callPackage @@ -161006,6 +165203,7 @@ self: { homepage = "https://github.com/hexresearch/roc-cluster#readme"; description = "ROC online clustering algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roc-cluster-demo" = callPackage @@ -161024,6 +165222,7 @@ self: { homepage = "https://github.com/ncrashed/roc-cluster-demo#readme"; description = "Gloss interactive demo for roc-cluster package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rocksdb-haskell" = callPackage @@ -161046,7 +165245,6 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -161125,20 +165323,19 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , monad-control, network, text, vector + , monad-control, network, resourcet, text, vector }: mkDerivation { pname = "rollbar"; - version = "0.3.1"; - sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1"; + version = "0.4.1"; + sha256 = "0gl1q1f8n2xngb665hkqncqj1ymm7kymhhgp0qwdhdi3gnm8kymp"; libraryHaskellDepends = [ - aeson base basic-prelude http-conduit monad-control network text - vector + aeson base basic-prelude http-conduit monad-control network + resourcet text vector ]; - homepage = "https://github.com/docmunch/rollbar-haskell"; + homepage = "https://github.com/azara/rollbar-haskell"; description = "error tracking through rollbar.com"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roller" = callPackage @@ -161489,7 +165686,6 @@ self: { ]; description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundtrip-aeson" = callPackage @@ -161523,7 +165719,6 @@ self: { libraryHaskellDepends = [ base mtl parsec roundtrip ]; description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundtrip-xml" = callPackage @@ -161724,6 +165919,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rset" = callPackage + ({ mkDerivation, base, QuickCheck, safe }: + mkDerivation { + pname = "rset"; + version = "1.0.0"; + sha256 = "1d1r9hp38mhl1jmmqhn42al7gd0nsqk5d5msqrzjwxdyj884y3pq"; + libraryHaskellDepends = [ base safe ]; + testHaskellDepends = [ base QuickCheck safe ]; + homepage = "https://github.com/lovasko/rset"; + description = "Range set"; + license = "unknown"; + }) {}; + "rspp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -161751,7 +165959,6 @@ self: { homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss-conduit" = callPackage @@ -161809,13 +166016,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring , conduit, conduit-combinators, conduit-extra, lens, lens-aeson - , random, resourcet, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, word24 + , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.2.2"; - sha256 = "1fh6hvz3isv8zzmw94lkr354lm7805pr8sg5rj859skh2h49mzbb"; + version = "0.2.5"; + sha256 = "1idqvlva12ndm4nbjhigz6z8r7y8lr25yck6fxilkls766rdv61m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161824,7 +166031,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra resourcet + conduit-combinators conduit-extra ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty @@ -161833,7 +166040,6 @@ self: { homepage = "http://github.com/swift-nav/librtcm"; description = "RTCM Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtld" = callPackage @@ -161881,7 +166087,6 @@ self: { homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtorrent-rpc" = callPackage @@ -161961,7 +166166,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -161981,7 +166186,6 @@ self: { homepage = "https://github.com/filib/ruby-marshal"; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruby-qq" = callPackage @@ -162012,7 +166216,6 @@ self: { homepage = "http://code.mathr.co.uk/ruff"; description = "relatively useful fractal functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruin" = callPackage @@ -162214,7 +166417,6 @@ self: { homepage = "https://github.com/aisamanra/s-cargot"; description = "A flexible, extensible s-expression library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "s-expression" = callPackage @@ -162271,7 +166473,6 @@ self: { homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-exceptions" = callPackage @@ -162411,7 +166612,6 @@ self: { homepage = "https://github.com/k0001/safe-money"; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -162556,6 +166756,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safeio_0_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , directory, filepath, HUnit, resourcet, test-framework + , test-framework-hunit, test-framework-th, unix + }: + mkDerivation { + pname = "safeio"; + version = "0.0.3.0"; + sha256 = "0rknn8rlxyj32a0vrx0wjfma9w0zhs3vg1jyksn71drxch7jvwqs"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + resourcet unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + HUnit resourcet test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Write output to disk atomically"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safepath" = callPackage ({ mkDerivation, base, doctest, text, validity }: mkDerivation { @@ -162954,6 +167177,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sandi_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, exceptions + , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck + , tasty-th + }: + mkDerivation { + pname = "sandi"; + version = "0.4.1"; + sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; + libraryHaskellDepends = [ + base bytestring conduit exceptions stringsearch + ]; + testHaskellDepends = [ + base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + homepage = "http://hackage.haskell.org/package/sandi"; + description = "Data encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sandlib" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -163203,13 +167448,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.11"; - sha256 = "1fdwsqh3mr90w6k4f4y8cbshx8divhfwhc06cfbdh64k8wckl27x"; + version = "2.2.12"; + sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163219,7 +167464,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet yaml + conduit-extra yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -163228,7 +167473,6 @@ self: { homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -163249,7 +167493,6 @@ self: { ]; description = "SBP to UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbv" = callPackage @@ -163261,8 +167504,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.0"; - sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc"; + version = "7.1"; + sha256 = "0gxx84b7dzhymizwna8fzaaz2gimzch650jk1xssn5da2gqfan7g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -163287,8 +167530,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.9"; - sha256 = "01fxnyi3jw952v7hlmf0isp88kv99jg6jll74cz2b04c461w1fhv"; + version = "0.10"; + sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -163491,6 +167734,7 @@ self: { homepage = "https://github.com/redelmann/scat"; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -164473,14 +168717,13 @@ self: { ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }: mkDerivation { pname = "sdl2-cairo"; - version = "0.1.0.3"; - sha256 = "1lw5d8hk97h26sxq1bq0ha56s1pi0zsyw60di41w92a4xrx8z2nf"; + version = "0.1.1.0"; + sha256 = "08i7vbibak0y760j2cibwdn2yhgkp2xv2j325mimvdqcp44x0rz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; description = "Render with Cairo on SDL textures. Includes optional convenience drawing API."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-cairo-image" = callPackage @@ -164560,7 +168803,6 @@ self: { executableHaskellDepends = [ base sdl2 text ]; description = "Bindings to SDL2_image"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-mixer" = callPackage @@ -164868,7 +169110,6 @@ self: { homepage = "http://github.com/haskoin/secp256k1-haskell#readme"; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "secret-santa" = callPackage @@ -164942,7 +169183,6 @@ self: { homepage = "http://code.google.com/p/secure-hs/"; description = "Secure point-to-point connectivity library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "secureUDP" = callPackage @@ -165004,6 +169244,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_1_10_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.10.1"; + sha256 = "1yx8gxi9bha95ss2i1hvbv8vlywxgi3a6rxjig44jz5w2s0zlp5h"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Type-safe, high-level EDSL for interacting with relational databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -165020,6 +169278,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.6.0"; + sha256 = "0zf77mavhxn64mag6cgf6xch54qknl1yhack5nylf5xlwhpmrgsx"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -165036,6 +169311,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-sqlite_0_1_6_0" = callPackage + ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda + , text + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.6.0"; + sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + libraryHaskellDepends = [ + base direct-sqlite directory exceptions selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "SQLite backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165048,6 +169340,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "selections" = callPackage + ({ mkDerivation, base, bifunctors, comonad }: + mkDerivation { + pname = "selections"; + version = "0.1.0.3"; + sha256 = "1g7p30mjvkq8ymmjdhh54bhyjs2dvz7v860mr1f8qs35j31bkabd"; + libraryHaskellDepends = [ base bifunctors comonad ]; + homepage = "https://github.com/ChrisPenner/selections#readme"; + description = "Combinators for operating with selections over an underlying functor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "selectors" = callPackage ({ mkDerivation, alex, array, base, containers, happy , template-haskell, text, xml-conduit @@ -165219,6 +169523,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_2_1" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.2.1"; + sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; + revision = "1"; + editedCabalFile = "1lb59k2hdz9kbhmpw7bzc0n9pb5x3b9ysglp69dn4yf5xxjw03wx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable semigroups tagged transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -165450,15 +169779,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_3_0" = callPackage + "sensu-run_0_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.3.0"; - sha256 = "0p22069kvfj1fl5s26l9lvijbxzvdf58rkj3bdfrrw76l941shwm"; + version = "0.4.0"; + sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165522,23 +169851,24 @@ self: { "separated" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, papa, parsec, QuickCheck, semigroupoids, semigroups + , lens, parsec, QuickCheck, semigroupoids, semigroups , template-haskell }: mkDerivation { pname = "separated"; - version = "0.1.2"; - sha256 = "0hq4b6pvhwgqxskylyqg2952gj8nblbx7zcgj4rds10qlkaxhp4m"; + version = "0.2.3"; + sha256 = "0lxl7i0j27nn43a6p7ayxd1rr48h31zj0bviw0nd49fsd9l5c0iq"; + revision = "1"; + editedCabalFile = "0k1z3a9yr9aq7cnm7kfk5yiclhq95nqlgnzzz5ksj010qmnsb6zj"; libraryHaskellDepends = [ - base bifunctors lens papa semigroupoids semigroups + base bifunctors lens semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell ]; - homepage = "https://github.com/data61/separated"; + homepage = "https://github.com/qfpl/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqaid" = callPackage @@ -165576,7 +169906,6 @@ self: { libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid_0_1_0" = callPackage @@ -165625,6 +169954,7 @@ self: { homepage = "https://github.com/LukeHoersten/seqid-streams"; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqloc" = callPackage @@ -165798,6 +170128,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serialise" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring + , base64-bytestring, binary, bytestring, cborg, cereal + , cereal-vector, containers, criterion, deepseq, directory + , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive + , QuickCheck, quickcheck-instances, scientific, store, tar, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector, zlib + }: + mkDerivation { + pname = "serialise"; + version = "0.1.0.0"; + sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3"; + libraryHaskellDepends = [ + array base bytestring cborg containers ghc-prim half hashable + old-locale primitive text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring base64-bytestring binary + bytestring cborg containers deepseq directory filepath ghc-prim + half hashable QuickCheck quickcheck-instances scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson array base binary bytestring cborg cereal cereal-vector + containers criterion deepseq directory filepath ghc-prim half + old-locale pretty store tar text time vector zlib + ]; + homepage = "https://github.com/well-typed/cborg"; + description = "A binary serialisation library for Haskell values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "serialize-instances" = callPackage ({ mkDerivation, base, cereal, hashable, semigroups , unordered-containers @@ -165829,39 +170192,35 @@ self: { }) {}; "serokell-util" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal - , base, base16-bytestring, base64-bytestring, binary - , binary-orphans, bytestring, cereal, cereal-vector, clock - , containers, data-msgpack, deepseq, directory, either, exceptions - , extra, filepath, formatting, hashable, hspec, lens, log-warper - , monad-control, mtl, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, safecopy, scientific, semigroups, stm - , template-haskell, text, text-format, time-units, transformers - , universum, unordered-containers, vector, yaml + ({ mkDerivation, acid-state, aeson, ansi-terminal, base + , base16-bytestring, base64-bytestring, bytestring, clock + , containers, deepseq, directory, exceptions, extra, filepath + , formatting, hashable, hspec, lens, log-warper, monad-control, mtl + , optparse-applicative, parsec, QuickCheck, quickcheck-instances + , safecopy, scientific, semigroups, stm, template-haskell, text + , text-format, time-units, transformers, universum + , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.1.5.3"; - sha256 = "05iwdmwq6fg4bq1nmmi19dax3rnjjxwbn6l5ff9fbs794qzmb704"; + version = "0.3.1"; + sha256 = "01wjr1xlnvz2ml7iiarbbl1h8p4ax457nq1n6xxx070d08l4iq33"; libraryHaskellDepends = [ - acid-state aeson aeson-extra ansi-terminal base base16-bytestring - base64-bytestring binary binary-orphans bytestring cereal - cereal-vector clock containers data-msgpack deepseq directory - either exceptions extra filepath formatting hashable lens - log-warper monad-control mtl optparse-applicative parsec QuickCheck + acid-state aeson ansi-terminal base base16-bytestring + base64-bytestring bytestring clock containers deepseq directory + exceptions extra filepath formatting hashable lens log-warper + monad-control mtl optparse-applicative parsec QuickCheck quickcheck-instances safecopy scientific semigroups stm template-haskell text text-format time-units transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base binary bytestring cereal data-msgpack hspec QuickCheck - quickcheck-instances safecopy scientific text text-format - unordered-containers vector + aeson base bytestring hspec QuickCheck quickcheck-instances + safecopy scientific text text-format unordered-containers vector ]; homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serpentine" = callPackage @@ -166166,6 +170525,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage @@ -166186,6 +170546,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -166204,7 +170565,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-acid" = callPackage @@ -166245,7 +170605,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token-api#readme"; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-leveldb" = callPackage @@ -166444,6 +170803,7 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-db-postgresql" = callPackage @@ -166503,7 +170863,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "servant-docs_0_11" = callPackage @@ -166582,6 +170941,7 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-elm" = callPackage @@ -166680,17 +171040,18 @@ self: { }) {}; "servant-github-webhook" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto - , github, http-types, servant, servant-server, string-conversions - , text, transformers, wai, warp + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, github, http-types, memory, servant, servant-server + , string-conversions, text, transformers, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.0.2"; - sha256 = "1fbrc1i76hllrl61j262yxbibgsd6fkwcwl588mhxf48j0cfpp06"; + version = "0.3.1.0"; + sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring Crypto github http-types - servant servant-server string-conversions text transformers wai + aeson base base16-bytestring bytestring cryptonite github + http-types memory servant servant-server string-conversions text + transformers wai ]; testHaskellDepends = [ aeson base bytestring servant-server transformers wai warp @@ -166698,7 +171059,6 @@ self: { homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -166730,6 +171090,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-iCalendar" = callPackage + ({ mkDerivation, base, data-default, http-media, iCalendar, servant + }: + mkDerivation { + pname = "servant-iCalendar"; + version = "0.1.0.1"; + sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; + libraryHaskellDepends = [ + base data-default http-media iCalendar servant + ]; + homepage = "https://github.com/fgaz/servant-iCalendar#readme"; + description = "Servant support for iCalendar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -166846,7 +171221,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-multipart" = callPackage @@ -166873,7 +171247,6 @@ self: { homepage = "https://github.com/haskell-servant/servant-multipart#readme"; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-named" = callPackage @@ -166984,7 +171357,6 @@ self: { homepage = "https://github.com/eskimor/servant-purescript#readme"; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pushbullet-client" = callPackage @@ -166995,8 +171367,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.2.0.0"; - sha256 = "1701mcr99hg4zlsh95ri4nrx1iws1ns2f9gi55dzbyay429czlfg"; + version = "0.4.0.0"; + sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -167112,6 +171484,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_3_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.3.0.0"; + sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -167289,7 +171677,6 @@ self: { homepage = "http://github.com/eskimor/servant-subscriber#readme"; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-subscriber_0_6_0_1" = callPackage @@ -167474,7 +171861,6 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "server-generic" = callPackage @@ -167563,7 +171949,6 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using persistent and an RDBMS"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-backend-redis" = callPackage @@ -167586,7 +171971,6 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-frontend-snap" = callPackage @@ -167825,7 +172209,6 @@ self: { homepage = "http://bitbucket.org/robertmassaioli/setdown"; description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setenv" = callPackage @@ -167883,7 +172266,6 @@ self: { ]; description = "A Haskell implementation of setoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setops" = callPackage @@ -168005,7 +172387,6 @@ self: { homepage = "https://github.com/esmolanka/sexp-grammar"; description = "Invertible parsers for S-expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -168059,7 +172440,6 @@ self: { homepage = "https://github.com/dzhus/sext#readme"; description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfml-audio" = callPackage @@ -168392,7 +172772,6 @@ self: { homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-path" = callPackage @@ -168457,14 +172836,18 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, directory, shake }: + ({ mkDerivation, base, basic-prelude, deepseq, directory + , regex-compat, shake + }: mkDerivation { pname = "shakers"; - version = "0.0.27"; - sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym"; + version = "0.0.31"; + sha256 = "134v3rzyhf5yv417dp90f9phgm4mdbhc5sv9l44jdbhplnmahh2m"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base basic-prelude directory shake ]; + libraryHaskellDepends = [ + base basic-prelude deepseq directory regex-compat shake + ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; @@ -168775,6 +173158,7 @@ self: { homepage = "https://github.com/psibi/shell-conduit"; description = "Write shell scripts with Conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-escape" = callPackage @@ -168852,7 +173236,6 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Simple interface for shell scripting in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellmate-extras" = callPackage @@ -168872,7 +173255,6 @@ self: { homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelltestrunner" = callPackage @@ -168929,6 +173311,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_6_8_4" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async + , lifted-base, monad-control, mtl, process, system-fileio + , system-filepath, text, time, transformers, transformers-base + , unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.6.8.4"; + sha256 = "1s69ifnamzjd121rf7k5idxzbwhc4ap8msxjhfsya04kwzjcixyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions hspec HUnit lifted-async lifted-base monad-control mtl + process system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -169353,7 +173766,6 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -169433,7 +173845,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Thom polynomials of second order Thom-Boardman singularities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "sign" = callPackage @@ -169471,6 +173882,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "signal_0_1_0_4" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "signal"; + version = "0.1.0.4"; + sha256 = "1rbnblp2d9cw54jnxjcfjhp0bizvcdcxg9y1b4ky0iskny9dvgy4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base unix ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/pmlodawski/signal"; + description = "Multiplatform signal support for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "signals" = callPackage ({ mkDerivation, base, containers, hashable, imperative-edsl-vhdl , language-vhdl, mtl, observable-sharing, operational-alacarte @@ -169675,7 +174102,6 @@ self: { homepage = "http://github.com/jwiegley/simple-conduit"; description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-config" = callPackage @@ -169747,7 +174173,6 @@ self: { homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-eval" = callPackage @@ -169905,7 +174330,6 @@ self: { homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-logging" = callPackage @@ -170160,8 +174584,8 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.2"; - sha256 = "013vxh1l1q44s566d7mizhf810sl6r87nkkpl687md421kjhswms"; + version = "0.4.3"; + sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -170169,10 +174593,9 @@ self: { testHaskellDepends = [ base HUnit mtl parsec pretty test-framework test-framework-hunit ]; - homepage = "http://jakewheat.github.io/simple-sql-parser/"; + homepage = "http://jakewheat.github.io/simple-sql-parser/latest"; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-stacked-vm" = callPackage @@ -170275,7 +174698,6 @@ self: { homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-zipper" = callPackage @@ -170508,7 +174930,6 @@ self: { homepage = "http://sigkill.dk/programs/sindre"; description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage @@ -170568,15 +174989,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_3" = callPackage + "singletons_2_3_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, text , th-desugar }: mkDerivation { pname = "singletons"; - version = "2.3"; - sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5"; + version = "2.3.1"; + sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa"; libraryHaskellDepends = [ base containers mtl syb template-haskell text th-desugar ]; @@ -170686,6 +175107,7 @@ self: { homepage = "http://github.com/alpmestan/sitemap"; description = "Sitemap parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sitepipe" = callPackage @@ -170707,7 +175129,6 @@ self: { homepage = "https://github.com/ChrisPenner/sitepipe#readme"; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sixfiguregroup" = callPackage @@ -171022,7 +175443,6 @@ self: { homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting_0_3_3_1" = callPackage @@ -171139,7 +175559,6 @@ self: { testHaskellDepends = [ base ]; description = "Bindings to the Slack RTM API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slack-notify-haskell" = callPackage @@ -171289,7 +175708,6 @@ self: { homepage = "http://akc.is/sloane"; description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slope-field" = callPackage @@ -171410,6 +175828,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck_1_1_2" = callPackage + ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: + mkDerivation { + pname = "smallcheck"; + version = "1.1.2"; + sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm"; + libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; + homepage = "https://github.com/feuerbach/smallcheck"; + description = "A property-based testing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smallcheck-laws" = callPackage ({ mkDerivation, base, smallcheck, smallcheck-series }: mkDerivation { @@ -171526,8 +175957,8 @@ self: { }: mkDerivation { pname = "smartcheck"; - version = "0.2.2"; - sha256 = "1wc5257r6qrbawn4ip2d9fqlcpb77bjikjn3ixsa3rhazbasq2is"; + version = "0.2.4"; + sha256 = "0wj6xwassh69z97p47xh7i68xs7mvi05fni4qxizyicmbr8k27il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171645,7 +176076,6 @@ self: { homepage = "https://github.com/GetShopTV/smsaero"; description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smt-lib" = callPackage @@ -171867,8 +176297,8 @@ self: { pname = "snap"; version = "1.0.0.1"; sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9"; - revision = "4"; - editedCabalFile = "1bcfw4g6wqkssp0l7n6115d513y70b8zb7cdz5hrlaxyq5pah6hk"; + revision = "5"; + editedCabalFile = "0kka00b4xvskfcfva1zvbd7sp2sa5mplvgaihcagjsim96124bsp"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -171906,7 +176336,6 @@ self: { homepage = "https://github.com/zmthy/snap-accept"; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-app" = callPackage @@ -172078,8 +176507,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.0.0"; - sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n"; + version = "0.12.1.0"; + sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172203,8 +176632,8 @@ self: { pname = "snap-server"; version = "1.0.2.2"; sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7"; - revision = "1"; - editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f"; + revision = "2"; + editedCabalFile = "032m1c42qm4b07s835aa9jl2n7r7py8cdz3fdfqi6qd68z7lqrb5"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -172237,7 +176666,6 @@ self: { homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -172260,7 +176688,6 @@ self: { homepage = "http://snapframework.com/"; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -173495,7 +177922,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -173589,7 +178015,6 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -173622,7 +178047,6 @@ self: { homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme"; description = "Unix domain sockets"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socketed" = callPackage @@ -173788,7 +178212,6 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Swagger generation for Solga"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solr" = callPackage @@ -173960,7 +178383,6 @@ self: { ]; description = "Approximate a song from other pieces of sound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sounddelay" = callPackage @@ -174063,6 +178485,25 @@ self: { license = "GPL"; }) {}; + "sox_0_2_2_7" = callPackage + ({ mkDerivation, base, containers, explicit-exception + , extensible-exceptions, process, sample-frame, transformers, unix + , utility-ht + }: + mkDerivation { + pname = "sox"; + version = "0.2.2.7"; + sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; + libraryHaskellDepends = [ + base containers explicit-exception extensible-exceptions process + sample-frame transformers unix utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Sox"; + description = "Play, write, read, convert audio signals using Sox"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soxlib" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector @@ -174496,8 +178937,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.5"; - sha256 = "1galy8k0nvnq4xavm15f6v160ili1kmiq5p2rdhqmfciadrxzxqd"; + version = "0.2.7"; + sha256 = "0n5lrwlagb6clj3sarmdzy43n9dyfj6rz1rnyj8d63s57fk7jpl5"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base cmdargs containers leancheck ]; benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; @@ -174865,7 +179306,6 @@ self: { homepage = "http://code.haskell.org/~thielema/split-record/"; description = "Split a big audio file into pieces at positions of silence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "split-tchan" = callPackage @@ -175117,7 +179557,6 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage @@ -175131,8 +179570,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.95.0"; - sha256 = "16m0sqmp85p8zkpdh1pnzhja7j774cpfppwc5d6rq5palikwd88c"; + version = "1.96.0"; + sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -175144,7 +179583,6 @@ self: { ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spsa" = callPackage @@ -175190,7 +179628,7 @@ self: { test-framework-hunit test-framework-quickcheck2 time unix ]; homepage = "https://bitbucket.org/ssaasen/spy"; - description = "A compact file system watcher for Mac OS X, Linux and Windows"; + description = "A compact file system watcher for macOS, Linux and Windows"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -175435,7 +179873,6 @@ self: { homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sr-extra" = callPackage @@ -175517,6 +179954,7 @@ self: { ]; description = "text UI for scanning with SANE"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sscgi" = callPackage @@ -175750,7 +180188,6 @@ self: { homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-memo" = callPackage @@ -175764,7 +180201,6 @@ self: { libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-tree" = callPackage @@ -175823,7 +180259,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_1_0_0" = callPackage + "stache_1_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -175831,8 +180267,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "1.0.0"; - sha256 = "1ms3jxsbny6gdqwq536xsdm1xj5hlyb77mxyf6q2s0q8skyc9kvr"; + version = "1.1.1"; + sha256 = "1gjmv1yqm5hkgap60w1ci6ng1l7kfhmz97wdhnqawcm8q7lir1nx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -175876,10 +180312,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.5.0"; - sha256 = "1wx3p4n28mf6g4iydnsjvm87hn43kqsmn52npmsyym54wsl2vzx9"; + version = "1.5.1"; + sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x"; revision = "1"; - editedCabalFile = "161v9lsi6xacbz279bhclmhn0vmv24a0badawm17rqhq4w8lh4yq"; + editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -175998,7 +180434,6 @@ self: { homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run" = callPackage @@ -176080,6 +180515,7 @@ self: { executableHaskellDepends = [ base Cabal optparse-applicative ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -176215,7 +180651,6 @@ self: { homepage = "https://github.com/fpco/stackage-curator"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-install" = callPackage @@ -176545,7 +180980,6 @@ self: { testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-record" = callPackage @@ -176579,6 +181013,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stateWriter_0_2_8_2" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, dlist, free + , hspec, lens, mtl, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "stateWriter"; + version = "0.2.8.2"; + sha256 = "1y8580n66hif4pp2b6gsqssafcqf1vysf63209i2rcjr0dsgnjgz"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base free hspec mtl QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dlist lens mtl transformers + vector + ]; + description = "A faster variant of the RWS monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statechart" = callPackage ({ mkDerivation, base, polyparse }: mkDerivation { @@ -176623,6 +181076,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; + revision = "1"; + editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -176914,8 +181369,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.0"; - sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797"; + version = "0.2.1.2"; + sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176932,7 +181387,6 @@ self: { homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-image" = callPackage @@ -177053,7 +181507,6 @@ self: { homepage = "https://github.com/schell/steeloverseer#readme"; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stego-uuid" = callPackage @@ -177068,6 +181521,7 @@ self: { homepage = "https://github.com/dimitri-xyz/stego-uuid#readme"; description = "Generator and verifier for steganographic numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stemmer" = callPackage @@ -177270,6 +181724,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stm-containers_0_2_16" = callPackage + ({ mkDerivation, async, base, base-prelude, containers, criterion + , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl + , mtl-prelude, mwc-random, mwc-random-monad, placeholders + , primitive, QuickCheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "stm-containers"; + version = "0.2.16"; + sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139"; + libraryHaskellDepends = [ + base base-prelude focus hashable list-t primitive transformers + ]; + testHaskellDepends = [ + base base-prelude focus free hashable HTF list-t loch-th mtl + mtl-prelude placeholders primitive QuickCheck transformers + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base base-prelude containers criterion focus free hashable + hashtables list-t loch-th mtl mtl-prelude mwc-random + mwc-random-monad placeholders text unordered-containers vector + ]; + homepage = "https://github.com/nikita-volkov/stm-containers"; + description = "Containers for STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-delay" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -177337,7 +181821,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-linkedlist" = callPackage @@ -177659,6 +182142,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storablevector_0_2_12_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, non-negative + , QuickCheck, random, sample-frame, syb, transformers, unsafe + , utility-ht + }: + mkDerivation { + pname = "storablevector"; + version = "0.2.12.1"; + sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; + libraryHaskellDepends = [ + base deepseq non-negative QuickCheck syb transformers unsafe + utility-ht + ]; + testHaskellDepends = [ + base bytestring QuickCheck random utility-ht + ]; + benchmarkHaskellDepends = [ + base deepseq sample-frame unsafe utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; + description = "Fast, packed, strict storable arrays with a list interface like ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storablevector-carray" = callPackage ({ mkDerivation, base, carray, storablevector, utility-ht }: mkDerivation { @@ -177743,7 +182251,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -177808,15 +182315,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_7_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, hspec, hspec-discover, lens, template-haskell - , text, unordered-containers + "stratosphere_0_8_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable + , hspec, hspec-discover, lens, template-haskell, text + , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.7.1"; - sha256 = "1zmchhyfgjgnckpydn8jd8rz4wyiv5ddqi3i4c0hygf4g5swz2nz"; + version = "0.8.0"; + sha256 = "0wv4anpxf6fmhhyw38wb7s3jbbhyn9vvhs912kls786gxs8xdlg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177828,8 +182335,8 @@ self: { text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hashable hlint hspec - hspec-discover lens template-haskell text unordered-containers + aeson aeson-pretty base bytestring hashable hspec hspec-discover + lens template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -178202,7 +182709,6 @@ self: { ]; description = "Translate pull-based stream folds into push-based iteratees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -178300,7 +182806,6 @@ self: { homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-wai" = callPackage @@ -178384,6 +182889,7 @@ self: { homepage = "https://github.com/nikita-volkov/strelka"; description = "A simple, flexible and composable web-router"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strelka-core" = callPackage @@ -178480,14 +182986,27 @@ self: { }) {}; "strict-data" = callPackage - ({ mkDerivation, aeson, base, deepseq }: + ({ mkDerivation, aeson, base, containers, deepseq, doctest + , exceptions, fail, hashable, HTF, monad-control, mtl, pretty + , QuickCheck, resourcet, strict, text, transformers + , transformers-base, unordered-containers, util-plus, vector + , vector-algorithms + }: mkDerivation { pname = "strict-data"; - version = "0.1.1.0"; - sha256 = "1by3icfp0b0im2g87rmaclh7iwwwz564gl3x6yyn840rgc9k4xnr"; - libraryHaskellDepends = [ aeson base deepseq ]; + version = "0.2.0.2"; + sha256 = "1xr1qd707grip4kan9d2nh5flqc61m2m3z8kf4wzgdd3m42zdg7q"; + libraryHaskellDepends = [ + aeson base containers deepseq exceptions fail hashable + monad-control mtl pretty QuickCheck resourcet strict text + transformers transformers-base unordered-containers util-plus + vector vector-algorithms + ]; + testHaskellDepends = [ + base containers deepseq doctest hashable HTF vector + ]; homepage = "https://github.com/agrafix/strict-data#readme"; - description = "Verious useful strict data structures"; + description = "A collection of commonly used strict data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178515,7 +183034,6 @@ self: { homepage = "https://github.com/cartazio/strict-identity"; description = "Strict Identity Monad, handy for writing fast code!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-io" = callPackage @@ -178527,7 +183045,6 @@ self: { libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-writer" = callPackage @@ -178866,8 +183383,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.1"; - sha256 = "0vbc6ddp15yh7ddz9rrr7cmdqb9b5xzl4lh2h2sqf7wy8yldd58w"; + version = "2.2.2"; + sha256 = "1w2f5ynilzdzszga468lcy4fzl8cm2i9mcvb7hzzpg2gjykbi55s"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -178881,8 +183398,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.1"; - sha256 = "1gyhms7vhmqj9fjs8lfa022r9h43c5m0y5cz5xfbx3v71id9kq5a"; + version = "2.2.2"; + sha256 = "08jksi6swwb15sib5y5ms0m4k6m24v7xg4zany34x2zbas30qlp4"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -178896,8 +183413,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.1"; - sha256 = "0qk6jys2ijg9fy22rhg58ahj4c3mzfcjmpk7rfh09q3y2vrg1rsx"; + version = "2.2.2"; + sha256 = "1s6rj46m2pmcvagwm02z2qf4z4b44y14kjdi397b6s4cva7sdf84"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -178918,8 +183435,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.1"; - sha256 = "1sg3gixaar1lcipdyzlcgcnfsc9vdip49zpfzh7a6pcw242vcw71"; + version = "2.2.2"; + sha256 = "1jccj0ic1v1vpdp3s8vb0a5w2rzr1zcqm6xqkjf1012ljxkvdq3f"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -178963,6 +183480,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_3_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "3.0.4"; + sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -178981,8 +183518,8 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1"; - sha256 = "0haghcp365rfmh53hpkv4xydc2yfyai45r053q60lspd7gj202hz"; + version = "0.1.1"; + sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -179251,7 +183788,6 @@ self: { ]; description = "A generator of nix files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sub-state" = callPackage @@ -179488,6 +184024,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sum-type-boilerplate_0_1_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "sum-type-boilerplate"; + version = "0.1.1"; + sha256 = "17xby0mqdsbax0afrfr3p8c6cj5r94byy8gprgyrmq84qqadls9i"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme"; + description = "Library for reducing the boilerplate involved with sum types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -179719,6 +184269,7 @@ self: { homepage = "http://github.com/ryantrinkle/superconstraints"; description = "Access an instance's constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "superdoc" = callPackage @@ -179752,7 +184303,6 @@ self: { ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -179857,6 +184407,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "svg-builder-fork" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "svg-builder-fork"; + version = "0.1.0.3"; + sha256 = "16y8azlayb5925aybm2780aqbq4qhqpv9c96k22h3ci7ybb9zk92"; + libraryHaskellDepends = [ + base blaze-builder bytestring hashable text unordered-containers + ]; + homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git"; + description = "DSL for building SVG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-tree" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers @@ -180002,7 +184568,6 @@ self: { testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swagger2" = callPackage @@ -180032,7 +184597,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "swapper" = callPackage @@ -180129,7 +184693,6 @@ self: { homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -180305,8 +184868,8 @@ self: { }: mkDerivation { pname = "symantic"; - version = "6.3.0.20170703"; - sha256 = "14r9jdn7pgcajdjgzgxkcn2p394wljlhfsmy6ajp9i18crhinj9y"; + version = "6.3.0.20170807"; + sha256 = "1w2yyy35w9k3p53x9a51hn5cfja74i6g62jcw2l1bq5cgaakfjgn"; libraryHaskellDepends = [ base containers mono-traversable symantic-document symantic-grammar text transformers @@ -180332,8 +184895,8 @@ self: { }: mkDerivation { pname = "symantic-grammar"; - version = "0.1.0.20170703"; - sha256 = "09anbgpkh3l8mgzz0nwl65054az0026wl65vi7qmy79ncl2823yd"; + version = "0.2.0.20170709"; + sha256 = "0vr0j7v2l9sfw8fcfdrhdcb9imgzklmm7p8n6jh9vlshl2d9piwy"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base megaparsec tasty tasty-hunit text transformers @@ -180361,6 +184924,7 @@ self: { ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symbol" = callPackage @@ -180391,6 +184955,7 @@ self: { homepage = "http://github.com/symengine/symengine.hs#readme"; description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; "symengine-hs" = callPackage @@ -180566,7 +185131,6 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntactical" = callPackage @@ -180716,6 +185280,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syntaxnet-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , data-default, haskell-conll, hspec, lens, protolude, safe, split + , text, text-format, vector + }: + mkDerivation { + pname = "syntaxnet-haskell"; + version = "0.1.1.0"; + sha256 = "0lcgn91kbsjkpnbw7fczqsjmzvhrx5fixhgzjzmjaiwndw09b5z5"; + libraryHaskellDepends = [ + aeson base bytestring cassava containers data-default haskell-conll + lens protolude safe split text text-format vector + ]; + testHaskellDepends = [ aeson base cassava haskell-conll hspec ]; + homepage = "https://github.com/mgajda/syntaxnet-haskell#readme"; + description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "synthesizer" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, event-list, filepath, gnuplot, non-negative @@ -180762,7 +185346,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-core" = callPackage @@ -180795,6 +185378,38 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; + }) {}; + + "synthesizer-core_0_8_1_1" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "synthesizer-core"; + version = "0.8.1.1"; + sha256 = "0drh5lmia3bvmdc7f7zl8y3ls43dl7mvb11383k49xlh0adlllka"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq event-list + explicit-exception filepath non-empty non-negative numeric-prelude + numeric-quest process QuickCheck random sample-frame-np sox + storable-record storable-tuple storablevector transformers + utility-ht + ]; + testHaskellDepends = [ + base containers event-list non-empty non-negative numeric-prelude + QuickCheck random storable-tuple storablevector utility-ht + ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; + description = "Audio signal processing coded in Haskell: Low level part"; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -180817,7 +185432,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with static physical dimensions"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-filter" = callPackage @@ -180913,7 +185527,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -180948,7 +185561,6 @@ self: { homepage = "https://github.com/NICTA/sys-process"; description = "A replacement for System.Exit and System.Process."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sysinfo" = callPackage @@ -181013,6 +185625,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "system-extra" = callPackage + ({ mkDerivation, base, bytestring, directory, hspec, process + , QuickCheck + }: + mkDerivation { + pname = "system-extra"; + version = "0.1.0"; + sha256 = "0x4xikvlj61r0sl8b98nccijkp99jalz0qkc6z5l48p81bj3qrl1"; + libraryHaskellDepends = [ base bytestring directory process ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A bunch of system utilities used by other projects"; + license = stdenv.lib.licenses.mit; + }) {}; + "system-fileio" = callPackage ({ mkDerivation, base, bytestring, chell, system-filepath , temporary, text, time, transformers, unix @@ -181063,17 +185689,16 @@ self: { }) {}; "system-info" = callPackage - ({ mkDerivation, base, process, regex }: + ({ mkDerivation, base, process, regex, regex-with-pcre }: mkDerivation { pname = "system-info"; - version = "0.1.0.7"; - sha256 = "0nj490pjlzvsjnxpfkg63x7makhh0y6difqm9iysrqf37qnir5zx"; - libraryHaskellDepends = [ base process regex ]; + version = "0.1.0.8"; + sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516"; + libraryHaskellDepends = [ base process regex regex-with-pcre ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; description = "Get information about CPUs, memory, etc"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-inotify" = callPackage @@ -181127,7 +185752,6 @@ self: { homepage = "https://github.com/erikd/system-linux-proc"; description = "A library for accessing the /proc filesystem in Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-locale" = callPackage @@ -181693,6 +186317,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tagged-binary_0_2_0_1" = callPackage + ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }: + mkDerivation { + pname = "tagged-binary"; + version = "0.2.0.1"; + sha256 = "0nv41x5ijw5wdb2nyfgxyspbgmk9qisp32fs1izzp3c3jl4smkvj"; + libraryHaskellDepends = [ + base base-compat binary bytestring pureMD5 + ]; + description = "Provides tools for serializing data tagged with type information"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-exception-core" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }: mkDerivation { @@ -181828,6 +186466,7 @@ self: { homepage = "http://github.com/alpmestan/taggy"; description = "Efficient and simple HTML/XML parsing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taggy-lens" = callPackage @@ -181847,6 +186486,7 @@ self: { homepage = "http://github.com/alpmestan/taggy-lens"; description = "Lenses for the taggy html/xml parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taglib" = callPackage @@ -182064,7 +186704,6 @@ self: { ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tak" = callPackage @@ -182509,6 +187148,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_0_7_0_0" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.7.0.0"; + sha256 = "0713gck8zdcd303zaq52g0ca9x28arwj9n1brfyzqscac95bcccc"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, tasty , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -182528,7 +187180,6 @@ self: { homepage = "https://github.com/lwm/tasty-discover#readme"; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -182560,7 +187211,6 @@ self: { homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme"; description = "Adds the ability to fail a tasty test suite on first test failure"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-golden" = callPackage @@ -182883,6 +187533,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-stats_0_2_0_3" = callPackage + ({ mkDerivation, base, containers, directory, process, stm, tagged + , tasty, time + }: + mkDerivation { + pname = "tasty-stats"; + version = "0.2.0.3"; + sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; + libraryHaskellDepends = [ + base containers directory process stm tagged tasty time + ]; + homepage = "https://github.com/minad/tasty-stats#readme"; + description = "Collect statistics of your Tasty testsuite in a CSV file"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -182898,7 +187565,6 @@ self: { homepage = "https://github.com/michaelxavier/tasty-tap"; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-th" = callPackage @@ -183060,7 +187726,6 @@ self: { homepage = "https://github.com/winterland1989/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tcp-streams_1_0_1_0" = callPackage @@ -183225,7 +187890,6 @@ self: { homepage = "https://github.com/np/tdoc"; description = "TDoc is a typed document builder with support for (X)HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teams" = callPackage @@ -183272,7 +187936,6 @@ self: { homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "telegram" = callPackage @@ -184080,7 +188743,6 @@ self: { homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terminal-size" = callPackage @@ -184522,7 +189184,6 @@ self: { homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-sandbox-compose" = callPackage @@ -184584,7 +189245,6 @@ self: { homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "QuickCheck convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-shouldbe" = callPackage @@ -184616,7 +189276,6 @@ self: { ]; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testPkg" = callPackage @@ -184825,7 +189484,6 @@ self: { ]; description = "Functions for running Tex from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text" = callPackage @@ -184865,7 +189523,6 @@ self: { homepage = "http://github.com/aelve/text-all"; description = "Everything Data.Text related in one package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-and-plots" = callPackage @@ -184918,7 +189575,6 @@ self: { homepage = "https://github.com/nikita-volkov/text-builder"; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-conversions" = callPackage @@ -185145,15 +189801,14 @@ self: { }: mkDerivation { pname = "text-lips"; - version = "0.1"; - sha256 = "0cwrbl8d2dpiz9q8vvrl04vpdiiw4gx0cv1rmlk4zryn3ja38y8n"; + version = "0.1.0.1"; + sha256 = "1sm7sy11yc2rfjrpq5in7fqv3gh7zcfli8vw4b2mdlh6nxrh7k89"; libraryHaskellDepends = [ base containers parsers text text-loc transformers ]; homepage = "https://github.com/mvv/text-lips"; description = "Monadic parsing combinator library with attention to locations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-loc" = callPackage @@ -185247,6 +189902,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-plus" = callPackage + ({ mkDerivation, base, bytestring, doctest, HTF, pretty, QuickCheck + , strict-data, text, util-plus + }: + mkDerivation { + pname = "text-plus"; + version = "0.1.0.1"; + sha256 = "1i93dk0i7zn81iw0q6g8ygr0bxwil09826mx1kw544n153yw9g7x"; + libraryHaskellDepends = [ + base bytestring pretty QuickCheck strict-data text util-plus + ]; + testHaskellDepends = [ base doctest HTF text ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "Utils for text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-position" = callPackage ({ mkDerivation, base, QuickCheck, regex-applicative }: mkDerivation { @@ -185414,7 +190086,6 @@ self: { homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show_3_6_2" = callPackage @@ -185487,7 +190158,6 @@ self: { homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances_3_6_2" = callPackage @@ -185844,6 +190514,22 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_5_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.5.0"; + sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + homepage = "https://github.com/glguy/th-abstraction"; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -186068,15 +190754,19 @@ self: { }) {}; "th-kinds" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell }: + ({ mkDerivation, base, containers, mtl, template-haskell + , th-orphans + }: mkDerivation { pname = "th-kinds"; - version = "0.1.1"; - sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b"; - libraryHaskellDepends = [ base containers mtl template-haskell ]; + version = "0.2"; + sha256 = "1jajj3fmhwvkla5ngvg6qb3hl2hmhgj6c1ldnz79b66ys62m6fs6"; + libraryHaskellDepends = [ + base containers mtl template-haskell th-orphans + ]; + homepage = "https://github.com/ddssff/th-kinds"; description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-kinds-fork" = callPackage @@ -186244,11 +190934,27 @@ self: { pname = "th-to-exp"; version = "0.0.1.0"; sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h"; + revision = "1"; + editedCabalFile = "0lnknwrvaj8q2i68g09rakg8rdyi5860xia5p5jb2r1z0ggwbbwi"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; + description = "Provides a way to persist data from compile-time to runtime"; + license = stdenv.lib.licenses.isc; + }) {}; + + "th-to-exp_0_0_1_1" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "th-to-exp"; + version = "0.0.1.1"; + sha256 = "09aqjrvgarygcbry01f6kmwbf7lzsbravmwz4277jdzdhwwj2zw6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; description = "Provides a way to persist data from compile-time to runtime"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-traced" = callPackage @@ -186331,7 +191037,6 @@ self: { homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themplate" = callPackage @@ -186628,7 +191333,6 @@ self: { testHaskellDepends = [ base ]; description = "Extends the threads package with a bounded thread group"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threads-pool" = callPackage @@ -186683,7 +191387,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -186722,6 +191425,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-editors_0_5_1" = callPackage + ({ mkDerivation, base, bifunctors, casing, containers, data-default + , generics-sop, lens, profunctors, threepenny-gui + }: + mkDerivation { + pname = "threepenny-editors"; + version = "0.5.1"; + sha256 = "07vg5xzrw7ll5kvbgi2masgbzicp0gfvzm7yrxhdkchdrlkrp1cv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors casing containers data-default generics-sop lens + profunctors threepenny-gui + ]; + homepage = "https://github.com/pepeiborra/threepenny-editors"; + description = "Composable algebraic editors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, filepath, hashable @@ -186745,7 +191468,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -186777,7 +191499,6 @@ self: { homepage = "https://github.com/barischj/threepenny-gui-flexbox"; description = "Flexbox layouts for Threepenny-gui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thrift" = callPackage @@ -186983,8 +191704,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.2"; - sha256 = "10n0vbhkyvq5mcf98mbh06pzzp3f2k1w9mk576h3ciyh8rirvl4d"; + version = "0.1.1.3"; + sha256 = "0jd6w07sks4v9x7m77dz3r59ri2vsmmbv82yi457bn9szdy0jz2x"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -187032,7 +191753,6 @@ self: { homepage = "https://github.com/NICTA/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tictactoe3d" = callPackage @@ -187109,7 +191829,6 @@ self: { homepage = "http://yaxu.org/tidal/"; description = "Visual rendering for Tidal patterns"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tie-knot" = callPackage @@ -187235,14 +191954,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8_0_2" = callPackage + "time_1_8_0_3" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8.0.2"; - sha256 = "158hy4klkdwm1vvqnfibziqac6h6ms42x0gha24w3a5cbjb2sr20"; + version = "1.8.0.3"; + sha256 = "0mbz76v74q938ramsgipgsvk8hvnplcnffplaq439z202zkyar1h"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -187315,7 +192034,6 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Yet another time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-http" = callPackage @@ -187456,7 +192174,6 @@ self: { homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -187607,7 +192324,6 @@ self: { homepage = "https://github.com/xpika/Time-Console"; description = "time each line of terminal output"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeit" = callPackage @@ -187811,7 +192527,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Timeplot"; description = "A tool for visualizing time series from log files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeprint" = callPackage @@ -187921,7 +192636,6 @@ self: { homepage = "https://github.com/Peaker/timestamp-subprocess-lines"; description = "Run a command and timestamp its stdout/stderr lines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timestamper" = callPackage @@ -188257,7 +192971,6 @@ self: { testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tldr" = callPackage @@ -188312,6 +193025,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_4_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, criterion, cryptonite, data-default-class, hourglass + , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck + , transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.4.0"; + sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cereal cryptonite data-default-class + hourglass mtl QuickCheck tasty tasty-quickcheck x509 + x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types base bytestring criterion cryptonite data-default-class + hourglass mtl QuickCheck tasty-quickcheck x509 x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -188332,6 +193075,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_5" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, time, tls, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.5"; + sha256 = "16zb4dray3l6sdckixyd2a5hbf6s0svy5f5bfffq48zr7f3c8id3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem time tls + x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -188359,6 +193123,8 @@ self: { pname = "tls-session-manager"; version = "0.0.0.1"; sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8"; + revision = "1"; + editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01"; libraryHaskellDepends = [ auto-update base clock psqueues tls ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; @@ -188712,6 +193478,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toml" = callPackage @@ -188760,7 +193527,6 @@ self: { homepage = "http://functionalley.eu"; description = "Ill-defined library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "top" = callPackage @@ -188785,7 +193551,6 @@ self: { homepage = "http://github.com/tittoassini/top"; description = "Top (typed oriented protocol) API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "topkata" = callPackage @@ -188856,7 +193621,6 @@ self: { libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "total-alternative" = callPackage @@ -188930,7 +193694,6 @@ self: { homepage = "https://github.com/tonyday567/tower"; description = "A numeric tower"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "toxcore" = callPackage @@ -189043,27 +193806,28 @@ self: { }) {}; "tpb" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring - , directory, filepath, free, http-client, http-client-tls - , libnotify, microlens, mtl, optparse-applicative, pushbullet-types - , servant, servant-client, servant-pushbullet-client, text, time + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, boxes + , bytestring, containers, directory, filepath, free, http-client + , http-client-tls, libnotify, microlens, mtl, optparse-applicative + , pushbullet-types, servant, servant-client + , servant-pushbullet-client, servant-server, text, time, wai, warp , websockets, wuss }: mkDerivation { pname = "tpb"; - version = "0.1.1.1"; - sha256 = "0w2wzv52lmnp80amwrzmxm3lacvp03wpkcx1i9f9b1qr060h6v41"; + version = "0.4.0.0"; + sha256 = "0d90vbyma5yhai0nlxa035pibn928jak879wbs6xx9ssyshcfwgy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson ansi-wl-pprint base boxes bytestring directory filepath free - http-client http-client-tls libnotify microlens mtl - optparse-applicative pushbullet-types servant servant-client - servant-pushbullet-client text time websockets wuss + aeson ansi-wl-pprint async base boxes bytestring containers + directory filepath free http-client http-client-tls libnotify + microlens mtl optparse-applicative pushbullet-types servant + servant-client servant-pushbullet-client servant-server text time + wai warp websockets wuss ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -189167,7 +193931,6 @@ self: { ]; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -189191,7 +193954,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traildb" = callPackage @@ -189439,7 +194201,6 @@ self: { homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {effect-interpreters = null;}; @@ -189514,6 +194275,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_5_9_1" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , directory, mtl, random, stm, time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.5.9.1"; + sha256 = "0dvv03lshvwvfjv9p54jbcihz8w96k33772msx03qqdnr8n9iql7"; + libraryHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + testHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "composing programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -189545,7 +194328,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe-tls" = callPackage @@ -189841,7 +194623,6 @@ self: { ]; description = "A tree of Data.Map."; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap-html" = callPackage @@ -190010,7 +194791,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_7" = callPackage + "trifecta_1_7_1_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal , cabal-doctest, charset, comonad, containers, deepseq, doctest @@ -190020,8 +194801,8 @@ self: { }: mkDerivation { pname = "trifecta"; - version = "1.7"; - sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq"; + version = "1.7.1.1"; + sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -190261,7 +195042,6 @@ self: { ]; description = "Thread-safe logging, with additional interleaving fuzz-testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tsne" = callPackage @@ -190805,21 +195585,19 @@ self: { homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, hspec-megaparsec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , directory, extra, hspec, htoml, http-client, http-client-tls + , http-types, lens, megaparsec, optparse-applicative, QuickCheck + , split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.0.1"; - sha256 = "0z1gi0mlxkchzq6644m5ya3qjz2jzi5rziak5jyz8b8ssvspw3nv"; + version = "1.0.1.1"; + sha256 = "1vcwyhwvh3xfm8n2xlic12in6ybkq11nsafqv0fhbdzhscxgqhqs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190829,9 +195607,7 @@ self: { split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck - ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -191004,7 +195780,6 @@ self: { homepage = "https://github.com/wiggly/twfy-api-client#readme"; description = "They Work For You API Client Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -191097,7 +195872,6 @@ self: { homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -191244,7 +196018,6 @@ self: { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -191311,7 +196084,6 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -191328,7 +196100,6 @@ self: { homepage = "https://github.com/himura/twitter-types-lens"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -191448,7 +196219,6 @@ self: { homepage = "https://github.com/lexi-lambda/type-assertions#readme"; description = "Runtime type assertions for testing"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-booleans" = callPackage @@ -191834,6 +196604,24 @@ self: { homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "type-of-html" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec + , text + }: + mkDerivation { + pname = "type-of-html"; + version = "0.2.1.1"; + sha256 = "1dvmpi1bal10vr5l4phllwxij9yw5lgjyx7aimb1yalri2dapipk"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion text + ]; + homepage = "https://github.com/knupfer/type-of-html"; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -192056,7 +196844,6 @@ self: { homepage = "https://github.com/fpco/typed-process#readme"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -192775,7 +197562,6 @@ self: { homepage = "https://github.com/hvr/uhttpc"; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ui-command" = callPackage @@ -192806,7 +197592,6 @@ self: { homepage = "http://github.com/hargettp/uid.git"; description = "Simple unique identifier datatype, serializable and encodable as base32"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ulid" = callPackage @@ -192898,6 +197683,7 @@ self: { homepage = "https://github.com/LukeHoersten/unagi-streams"; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unamb" = callPackage @@ -193345,6 +198131,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_3" = callPackage + ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq + , filepath, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.3"; + sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; + libraryHaskellDepends = [ base bitarray bytestring text ]; + testHaskellDepends = [ + base deepseq getopt-generics QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq filepath optparse-applicative path path-io + text + ]; + homepage = "http://github.com/harendra-kumar/unicode-transforms"; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -193366,7 +198175,6 @@ self: { homepage = "https://github.com/Zankoku-Okuno/unicoder"; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unidecode" = callPackage @@ -193436,12 +198244,29 @@ self: { pname = "union"; version = "0.1.1.1"; sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1"; + revision = "2"; + editedCabalFile = "0wxjv55bbjknyfn9489s77b22r31qwab6v16687mfj24a1cliad8"; + libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; + benchmarkHaskellDepends = [ base criterion deepseq lens ]; + description = "Extensible type-safe unions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "union_0_1_1_2" = callPackage + ({ mkDerivation, base, criterion, deepseq, lens, profunctors + , tagged, vinyl + }: + mkDerivation { + pname = "union"; + version = "0.1.1.2"; + sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; revision = "1"; - editedCabalFile = "03ac6fnvqhlzngyaz5qd14gb5niybw73iimr4mafyqq3swi27q49"; + editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "union-find" = callPackage @@ -193671,6 +198496,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "units-parser_0_1_0_1" = callPackage + ({ mkDerivation, base, containers, mtl, multimap, parsec, syb + , tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "units-parser"; + version = "0.1.0.1"; + sha256 = "1kmac80hnb2dric6d5ll7cdyhs8s4qqkk5vmd8gq9zjdyl6zxmrp"; + libraryHaskellDepends = [ base containers mtl multimap parsec ]; + testHaskellDepends = [ + base containers mtl multimap parsec syb tasty tasty-hunit + template-haskell + ]; + description = "A parser for units of measure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unittyped" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193733,7 +198576,7 @@ self: { sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring ]; - description = "Parser for OS X Universal Binary format"; + description = "Parser for macOS Universal Binary format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -193861,8 +198704,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.5"; - sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; + version = "0.5.1.1"; + sha256 = "1cj9qs7r3p8zhlrv3h3phmflp158ckimg3rzq4c28vfx85d8vxz2"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers @@ -193904,8 +198747,8 @@ self: { pname = "unix-compat"; version = "0.4.3.1"; sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; - revision = "1"; - editedCabalFile = "02li6r77ingmhd2887qkrj4rrkl7w86bz5kjqix875ib6aji86bc"; + revision = "2"; + editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -194040,7 +198883,6 @@ self: { homepage = "https://github.com/scrive/unjson"; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlambda" = callPackage @@ -194098,7 +198940,6 @@ self: { executableHaskellDepends = [ base directory text ]; description = "Tool to convert literate code between styles or to code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unm-hip" = callPackage @@ -194350,7 +199191,6 @@ self: { homepage = "https://github.com/joshuaclayton/unused#readme"; description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uom-plugin" = callPackage @@ -194582,6 +199422,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring-aeson_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: + mkDerivation { + pname = "uri-bytestring-aeson"; + version = "0.1.0.2"; + sha256 = "1i62sr28fxc3k045j8l2iak4f46nf8ygzqafc2k1pa0grm4l7ipa"; + libraryHaskellDepends = [ + aeson base bytestring text uri-bytestring + ]; + homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; + description = "Aeson instances for URI Bytestring"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -194705,7 +199560,6 @@ self: { homepage = "http://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url" = callPackage @@ -194741,6 +199595,7 @@ self: { homepage = "https://github.com/nikita-volkov/url-decoders"; description = "Decoders for URL-encoding (aka Percent-encoding)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "url-generic" = callPackage @@ -195165,6 +200020,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util-plus" = callPackage + ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck + , safe, unordered-containers + }: + mkDerivation { + pname = "util-plus"; + version = "0.1.0.0"; + sha256 = "062xs84zgqvxwvydbb2ivyhsfsmqk6wxl41pd4v7pyyqhdq588wm"; + libraryHaskellDepends = [ + array base containers hashable safe unordered-containers + ]; + testHaskellDepends = [ base containers HTF QuickCheck ]; + homepage = "https://github.com/factisresearch/opensource-mono#readme"; + description = "A collection of commonly used utils"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -195406,6 +200278,7 @@ self: { libraryHaskellDepends = [ aeson base text uuid ]; description = "Aeson types for UUID instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuid-le" = callPackage @@ -195667,6 +200540,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vado_0_0_9" = callPackage + ({ mkDerivation, attoparsec, base, directory, filepath, process + , QuickCheck, text + }: + mkDerivation { + pname = "vado"; + version = "0.0.9"; + sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base directory filepath process text + ]; + executableHaskellDepends = [ + attoparsec base directory filepath process text + ]; + testHaskellDepends = [ + attoparsec base directory filepath process QuickCheck text + ]; + homepage = "https://github.com/hamishmack/vado"; + description = "Runs commands on remote machines using ssh"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -195808,6 +200706,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson" = callPackage + ({ mkDerivation, aeson, base, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.0.0.0"; + sha256 = "1a7yh87vlngd4f6j5al7zrfy5pkgfgpbjr00fbpaqk56z87328nh"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -195844,6 +200759,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.0.0.0"; + sha256 = "1k68lp33z0w1ari6i2wdcgypv9viynya5bi8bqs7ybic7h7cs3i5"; + libraryHaskellDepends = [ base scientific validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -195870,6 +200797,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.0.0.0"; + sha256 = "162xv4mip8awj214gdybhp2m3skjs0pg10gf9abj3h017wf046vd"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + }) {}; + + "validity-vector" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.0.0.0"; + sha256 = "0iz3qxk73k4ci337h4y9n94vahs9pfl060pdkx4bkg9wpar6fqr1"; + libraryHaskellDepends = [ base hashable validity vector ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -196159,6 +201112,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vcf" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec + , hspec-expectations, text + }: + mkDerivation { + pname = "vcf"; + version = "0.9.0"; + sha256 = "1sjsgld8zd30insksv0n3rsjwq0mrr69rqnb1jpcq8lmcgz43jlq"; + libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring hspec hspec-expectations + ]; + description = "A package to parse VCF files inspired in similar python libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -196204,7 +201173,6 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -196409,6 +201377,7 @@ self: { homepage = "https://github.com/k0001/vector-bytes-instances"; description = "Serial (from the bytes package) for Vector (from the vector package)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytestring" = callPackage @@ -196600,6 +201569,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_0_6_1_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits, vector }: + mkDerivation { + pname = "vector-sized"; + version = "0.6.1.0"; + sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; + libraryHaskellDepends = [ base deepseq finite-typelits vector ]; + homepage = "http://github.com/expipiplus1/vector-sized#readme"; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -196611,6 +201593,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_11" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.11"; + sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -196648,6 +201642,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; + revision = "1"; + editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -196951,6 +201947,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_8" = callPackage + ({ mkDerivation, base, brick, containers, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.8"; + sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers ghc-prof lens scientific text vector + vector-algorithms vty + ]; + homepage = "https://github.com/maoe/viewprof"; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -197028,7 +202044,6 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -197062,19 +202077,21 @@ self: { }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage - ({ mkDerivation, array, base, directory, filepath, HUnit, mtl - , parsec, process, random, regex-base, regex-posix, time + ({ mkDerivation, array, base, directory, filepath, hashable + , hashtables, HUnit, mtl, parsec, process, random, regex-base + , regex-posix, time }: mkDerivation { pname = "vintage-basic"; - version = "1.0.1"; - sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25"; + version = "1.0.3"; + sha256 = "1wv7gz4yw4vd2xqcjx8sq0s7cd9h6z6zn7s5lxb10akv7kf52xb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base directory filepath HUnit mtl parsec process random - regex-base regex-posix time + array base directory filepath hashable hashtables HUnit mtl parsec + process random regex-base regex-posix time ]; + testHaskellDepends = [ base ]; homepage = "http://www.vintage-basic.net"; description = "Interpreter for microcomputer-era BASIC"; license = stdenv.lib.licenses.bsd3; @@ -197098,6 +202115,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vinyl_0_6_0" = callPackage + ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens + , linear, mwc-random, primitive, should-not-typecheck, singletons + , vector + }: + mkDerivation { + pname = "vinyl"; + version = "0.6.0"; + sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base doctest hspec lens should-not-typecheck singletons + ]; + benchmarkHaskellDepends = [ + base criterion lens linear mwc-random primitive vector + ]; + description = "Extensible Records"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -197105,8 +202143,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.0.1"; - sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a"; + version = "0.3.1"; + sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -197328,6 +202366,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vivid-osc" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, microspec, time + }: + mkDerivation { + pname = "vivid-osc"; + version = "0.3.0.0"; + sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57"; + libraryHaskellDepends = [ base binary bytestring cereal time ]; + testHaskellDepends = [ base bytestring cereal microspec time ]; + description = "Open Sound Control encode/decode"; + license = "GPL"; + }) {}; + "vk-aws-route53" = callPackage ({ mkDerivation, aws, base, bytestring, containers, http-conduit , http-types, old-locale, resourcet, text, time, xml-conduit @@ -197516,6 +202567,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_17" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.17"; + sha256 = "19dn80mxdd4w68cp21x7rnish5ph9bajzhcrz9mgxc7274g81kwr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/jtdaugherty/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -197742,7 +202829,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "File/CGI/Rev Proxy App of WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-app-static" = callPackage @@ -197837,7 +202923,6 @@ self: { homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-devel" = callPackage @@ -197885,7 +202970,6 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -198253,7 +203337,6 @@ self: { ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "wai-middleware-cache" = callPackage @@ -198568,6 +203651,7 @@ self: { homepage = "https://github.com/orbital/wai-middleware-json-errors#readme"; description = "Converts errors from plaintext to json"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-metrics" = callPackage @@ -198698,7 +203782,6 @@ self: { homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-static-caching" = callPackage @@ -198810,6 +203893,30 @@ self: { license = "unknown"; }) {}; + "wai-predicates_0_10_0" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , bytestring-conversion, case-insensitive, cookie, http-types + , singletons, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, vault, vector, wai + }: + mkDerivation { + pname = "wai-predicates"; + version = "0.10.0"; + sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion case-insensitive + cookie http-types singletons text transformers vault vector wai + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types tasty + tasty-hunit tasty-quickcheck wai + ]; + homepage = "https://gitlab.com/twittner/wai-predicates/"; + description = "WAI request predicates"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-request-spec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, http-types, text, wai @@ -198861,6 +203968,26 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "wai-route_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck + , tasty, tasty-quickcheck, unordered-containers, wai + }: + mkDerivation { + pname = "wai-route"; + version = "0.3.1.2"; + sha256 = "1biiq5p8aa7icsafslgnnnv5n43v7gizz69y1snyxph5n0n7sl81"; + libraryHaskellDepends = [ + base bytestring http-types unordered-containers wai + ]; + testHaskellDepends = [ + base bytestring http-types mtl QuickCheck tasty tasty-quickcheck + wai + ]; + description = "Minimalistic, efficient routing for WAI"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-router" = callPackage ({ mkDerivation, base, text, wai }: mkDerivation { @@ -198897,7 +204024,6 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -199300,21 +204426,20 @@ self: { "warc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions - , filepath, free, lens, mmorph, optparse-applicative, pipes - , pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time - , transformers + , filepath, free, hashable, lens, mmorph, optparse-applicative + , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time + , transformers, unordered-containers }: mkDerivation { pname = "warc"; - version = "0.3.1"; - sha256 = "044mvpwzgcqzj0zbmlb6v0nx5s2jqw5r9na1m94fxzk571am51rb"; - revision = "1"; - editedCabalFile = "0xmwmi3wqyrpci2zm50kvvyzdyqsblaarm6zz7rjky4qykc12kqr"; + version = "1.0.1"; + sha256 = "0vwml51prp730n5dmdla4s2116slp0wqg195b7psv4a3yqfx7v7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring errors free lens mmorph pipes + attoparsec base bytestring errors free hashable lens mmorph pipes pipes-attoparsec pipes-bytestring text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring errors exceptions filepath free lens @@ -199455,7 +204580,6 @@ self: { libraryHaskellDepends = [ base mtl time ]; description = "Simple control structure to re-try an action with exponential backoff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "watcher" = callPackage @@ -199536,7 +204660,6 @@ self: { homepage = "https://github.com/mrkkrp/wave"; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -199729,7 +204852,6 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -199790,7 +204912,6 @@ self: { homepage = "http://hub.darcs.net/ertes/web-page"; description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-plugins" = callPackage @@ -199944,6 +205065,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-th_0_22_6_2" = callPackage + ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split + , template-haskell, text, web-routes + }: + mkDerivation { + pname = "web-routes-th"; + version = "0.22.6.2"; + sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; + libraryHaskellDepends = [ + base parsec split template-haskell text web-routes + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; + homepage = "https://github.com/happstack/web-routes-th"; + description = "Support for deriving PathInfo using Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-transformers" = callPackage ({ mkDerivation, base, transformers, web-routes }: mkDerivation { @@ -200010,6 +205149,7 @@ self: { homepage = "https://github.com/airalab/hs-web3#readme"; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webapi" = callPackage @@ -200168,7 +205308,6 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -200191,7 +205330,6 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-snoy" = callPackage @@ -200281,7 +205419,6 @@ self: { homepage = "http://github.com/ananthakumaran/webify"; description = "webfont generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webkit" = callPackage @@ -200329,7 +205466,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage @@ -200457,7 +205593,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets_0_12_1_0" = callPackage + "websockets_0_12_2_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -200466,10 +205602,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.1.0"; - sha256 = "04c0bjzdz1l3n7hkfqhrxd16csnrlya2vjh96sgj9k6gwzj2cbsp"; - revision = "1"; - editedCabalFile = "1qnly23vdg76jm54d68jc7ssvlghkx4vi05a0vpmj4mi7b7mnxvq"; + version = "0.12.2.0"; + sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200575,7 +205709,6 @@ self: { homepage = "https://github.com/athanclark/websockets-simple#readme"; description = "Simpler interface to the websockets api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-simple_0_0_6_3" = callPackage @@ -200612,7 +205745,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -200688,6 +205820,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weeder_0_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "0.1.7"; + sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary @@ -200708,6 +205861,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weigh_0_0_5" = callPackage + ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl + , process, random, split, template-haskell, temporary + , unordered-containers + }: + mkDerivation { + pname = "weigh"; + version = "0.0.5"; + sha256 = "0s4bk2bglc5bf569zrbap7h6svd96sfgmvmrx57xwyinard7jfz9"; + libraryHaskellDepends = [ + base deepseq mtl process split template-haskell temporary + ]; + testHaskellDepends = [ + base bytestring-trie containers deepseq random unordered-containers + ]; + homepage = "https://github.com/fpco/weigh#readme"; + description = "Measure allocations of a Haskell functions/values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weighted" = callPackage ({ mkDerivation, base, mtl, semiring-num, transformers }: mkDerivation { @@ -201196,7 +206370,6 @@ self: { homepage = "https://github.com/winterland1989/wire-streams"; description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wires" = callPackage @@ -201215,6 +206388,7 @@ self: { homepage = "https://github.com/esoeylemez/wires"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiring" = callPackage @@ -201232,7 +206406,6 @@ self: { homepage = "http://github.com/seanparsons/wiring/"; description = "Wiring, promotion and demotion of types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiringPi" = callPackage @@ -201248,7 +206421,6 @@ self: { homepage = "https://github.com/ppelleti/hs-wiringPi"; description = "Access GPIO pins on Raspberry Pi via wiringPi library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "with-location" = callPackage @@ -201587,8 +206759,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.24"; - sha256 = "13992gn3myjpdkmc4v2d1s2kmmsjzw8xzibs3iprlk72vacp70ja"; + version = "0.3.26"; + sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201644,17 +206816,19 @@ self: { }) {}; "word-wrap" = callPackage - ({ mkDerivation, base, hspec, text }: + ({ mkDerivation, base, criterion, hspec, text }: mkDerivation { pname = "word-wrap"; - version = "0.1"; - sha256 = "1znkvh6nzx64v5kbfvr06r85idazxjx9qsbqgidrr5vnz0wccj76"; + version = "0.4.1"; + sha256 = "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb"; + revision = "1"; + editedCabalFile = "1k4w4g053vhmpp08542hrqaw81p3p35i567xgdarqmpghfrk68pp"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion text ]; homepage = "https://github.com/jtdaugherty/word-wrap/"; description = "A library for word-wrapping"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "word24" = callPackage @@ -201673,7 +206847,6 @@ self: { homepage = "https://github.com/winterland1989/word24"; description = "24-bit word and int types for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "word8" = callPackage @@ -201689,6 +206862,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word8_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec }: + mkDerivation { + pname = "word8"; + version = "0.1.3"; + sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Word8 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wordchoice" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams , containers, criterion, Glob, lens, optparse-applicative, pandoc @@ -201756,6 +206943,7 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "words" = callPackage @@ -202070,6 +207258,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , byteable, bytestring, case-insensitive, containers, cryptohash + , directory, doctest, exceptions, filepath, ghc-prim, hashable + , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson + , mime-types, network-info, psqueues, QuickCheck, snap-core + , snap-server, template-haskell, temporary, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq"; + version = "0.5.1.0"; + sha256 = "1p8cn9yzm2ggb3kac17xc3if6sdxjdh544k730imvvhm0szx4j76"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring byteable + bytestring case-insensitive containers cryptohash exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + homepage = "http://www.serpentine.com/wreq"; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -202113,12 +207340,13 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.5.0.1"; - sha256 = "0nwn7y593hxf971h0pr7l7l76wl6nmb622yasirzczx8qxvmr5ya"; + version = "0.5.1.0"; + sha256 = "1f23f1dxim8xkx7jj0z7fr4xjpmxc8cr0rbh84hhb359mkfklhvf"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wright" = callPackage @@ -202216,7 +207444,6 @@ self: { homepage = "https://github.com/minad/writer-cps-monads-tf#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-morph" = callPackage @@ -202313,6 +207540,7 @@ self: { ]; description = "WSDL parsing in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wsedit" = callPackage @@ -202471,7 +207699,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -202487,7 +207714,6 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -202538,7 +207764,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -202560,7 +207785,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -202579,7 +207803,6 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxhnotepad" = callPackage @@ -202700,7 +207923,6 @@ self: { homepage = "http://redmine.iportnov.ru/projects/x11-xinput"; description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage @@ -202712,6 +207934,32 @@ self: { pname = "x509"; version = "1.7.1"; sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr"; + revision = "1"; + editedCabalFile = "0hmq9gb6c2cid7kpblxax631mcqxj3p2j8br4n1fqn1jdp832y8v"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "x509_1_7_2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.7.2"; + sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw"; + revision = "1"; + editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -202723,6 +207971,7 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-store" = callPackage @@ -202742,6 +207991,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-store_1_6_5" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, directory, filepath, mtl, pem, tasty + , tasty-hunit, x509 + }: + mkDerivation { + pname = "x509-store"; + version = "1.6.5"; + sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring containers cryptonite + directory filepath mtl pem x509 + ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 collection accessing and storing methods"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-system" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pem, process, x509, x509-store @@ -202759,6 +208028,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-system_1_6_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pem, process, x509, x509-store + }: + mkDerivation { + pname = "x509-system"; + version = "1.6.6"; + sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"; + libraryHaskellDepends = [ + base bytestring containers directory filepath mtl pem process x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "Handle per-operating-system X.509 accessors and storage"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-util" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , cryptonite, directory, hourglass, pem, x509, x509-store @@ -202766,8 +208053,8 @@ self: { }: mkDerivation { pname = "x509-util"; - version = "1.6.3"; - sha256 = "1ca68z6jvsf7xx1qx44k2cic3ijv44ah738rx755gdxx056s49sz"; + version = "1.6.4"; + sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -202803,6 +208090,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_9" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.9"; + sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44"; + revision = "1"; + editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + testHaskellDepends = [ + asn1-encoding asn1-types base bytestring cryptonite + data-default-class hourglass tasty tasty-hunit x509 x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x86-64bit" = callPackage ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis , vector @@ -202896,7 +208209,6 @@ self: { homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xchat-plugin" = callPackage @@ -202957,7 +208269,6 @@ self: { homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xdg-basedir" = callPackage @@ -203270,7 +208581,6 @@ self: { benchmarkHaskellDepends = [ base random time vector ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -203892,7 +209202,6 @@ self: { homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-to-json-fast" = callPackage @@ -204060,6 +209369,7 @@ self: { homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmltv" = callPackage @@ -204631,7 +209941,6 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -204659,7 +209968,6 @@ self: { ]; description = "turtle like LOGO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xxhash" = callPackage @@ -204677,7 +209985,6 @@ self: { ]; description = "A Haskell implementation of the xxHash algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "y0l0bot" = callPackage @@ -205044,7 +210351,6 @@ self: { homepage = "https://github.com/michelk/yaml-union.hs"; description = "Read multiple yaml-files and override fields recursively"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml2owl" = callPackage @@ -205641,7 +210947,6 @@ self: { homepage = "https://github.com/psibi/yesod-auth-fb"; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hashdb" = callPackage @@ -205668,7 +210973,6 @@ self: { homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hmac-keccak" = callPackage @@ -205805,8 +211109,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.2.2"; - sha256 = "0cswp2kkw14g64axbzncnckrlfxnvdjgppjwwm60i4n9y2zg6xk2"; + version = "0.2.4"; + sha256 = "1gpyra5j6hi25r0hrjifjmkar8yb0f74cln4rygdjsvczllkri9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205912,6 +211216,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_5_2_5" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, safe-exceptions, say, shakespeare, split, stm + , streaming-commons, tar, template-haskell, text, time + , transformers, transformers-compat, typed-process, unix-compat + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.5.2.5"; + sha256 = "0jwnjxfb6s2gcx66am74hpq38fv3svgp1a08yf4610g6fskhkx4n"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + safe-exceptions say shakespeare split stm streaming-commons tar + template-haskell text time transformers transformers-compat + typed-process unix-compat unordered-containers wai wai-extra warp + warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -206052,6 +211391,50 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_36" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , criterion, data-default, deepseq, deepseq-generics, directory + , exceptions, fast-logger, hspec, hspec-expectations, http-types + , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.36"; + sha256 = "0pjhpqqsgkkccg269i5q8xngzk1lh945acnlfdjd429xjrpcmfir"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -206110,7 +211493,6 @@ self: { ]; description = "Add CSP headers to Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-datatables" = callPackage @@ -206270,6 +211652,7 @@ self: { homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -206287,7 +211670,6 @@ self: { homepage = "https://github.com/psibi/yesod-fb"; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form" = callPackage @@ -206326,6 +211708,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_0_1_0_1" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "0.1.0.1"; + sha256 = "0z555456ryfgs3ir0h139cfap61hmshywbd8wq7xsc4kf52yl44a"; + libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -206359,6 +211754,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-richtext_0_1_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-richtext"; + version = "0.1.0.2"; + sha256 = "0im3yfy0sdx60hn5cynh8pxp1fq2f64xgaizhxk0rd824i34lycn"; + libraryHaskellDepends = [ + base blaze-builder blaze-html shakespeare text xss-sanitize + yesod-core yesod-form + ]; + homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; + description = "Various rich-text WYSIWYG editors for Yesod forms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-gitrepo" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types , lifted-base, process, temporary, text, wai, yesod-core @@ -206454,7 +211867,6 @@ self: { homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme"; description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-json" = callPackage @@ -206635,7 +212047,6 @@ self: { homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-paypal-rest" = callPackage @@ -206963,7 +212374,6 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -207374,7 +212784,6 @@ self: { homepage = "https://github.com/alephcloud/hs-yet-another-logger"; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "yhccore" = callPackage @@ -207398,8 +212807,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.14.0"; - sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali"; + version = "0.14.1"; + sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -207477,14 +212886,58 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-core_0_14_1" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, filepath, hashable, ListLike, microlens-platform + , mtl, old-locale, oo-prototypes, parsec, pointedlist, process + , process-extras, quickcheck-text, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, text-icu, time + , transformers-base, unix, unix-compat, unordered-containers + , xdg-basedir, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.14.1"; + sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras semigroups split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras quickcheck-text split tasty tasty-hunit + tasty-quickcheck text text-icu time transformers-base unix + unix-compat unordered-containers xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state filepath + hashable ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-dynamic-configuration" = callPackage ({ mkDerivation, base, dyre, microlens-platform, mtl, text , transformers-base, yi-core, yi-rope }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.14.0"; - sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls"; + version = "0.14.1"; + sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw"; libraryHaskellDepends = [ base dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -207514,8 +212967,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.14.0"; - sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5"; + version = "0.14.1"; + sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -207545,6 +212998,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-vty_0_14_1" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.14.1"; + sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core @@ -207563,6 +213035,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-fuzzy-open_0_14_1" = callPackage + ({ mkDerivation, base, binary, containers, data-default, directory + , filepath, mtl, text, transformers-base, vector, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-fuzzy-open"; + version = "0.14.1"; + sha256 = "0qj8dlxdmsbas68zzmb99m5kw5jwp2vfj983s66a379z23zrg7wx"; + libraryHaskellDepends = [ + base binary containers data-default directory filepath mtl text + transformers-base vector yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Fuzzy open plugin for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-gtk" = callPackage ({ mkDerivation }: mkDerivation { @@ -207592,6 +213083,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-ireader_0_14_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.14.1"; + sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-cua" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope @@ -207606,6 +213115,22 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Cua keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-cua_0_14_1" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.14.1"; + sha256 = "1s1nh2h1v4zhgklhzlzix1plfg1z458yhl6y77xbq5r81ammpr5v"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207626,6 +213151,25 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Emacs keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-emacs_0_14_1" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, semigroups, text + , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.14.1"; + sha256 = "17fx1vhj4sdgbvih6ha6jqp74bfq0bcxilxlgm1vwlcafvc2vyfl"; + libraryHaskellDepends = [ + base containers filepath Hclip microlens-platform mtl oo-prototypes + semigroups text transformers-base yi-core yi-language yi-misc-modes + yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207656,6 +213200,35 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Vim keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-vim_0_14_1" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers-base + , unordered-containers, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.14.1"; + sha256 = "19wdfhsvzy90jm9pskla40q94kvil5hvmx9r6a2frsbqjlbjk5ja"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe + semigroups text transformers-base unordered-containers yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe semigroups tasty tasty-hunit tasty-quickcheck text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207687,6 +213260,35 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.14.1"; + sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform pointedlist regex-base regex-tdfa tasty + tasty-hspec tasty-quickcheck template-haskell transformers-base + unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-misc-modes" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, semigroups, text, yi-core, yi-language @@ -207704,6 +213306,25 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-misc-modes_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, semigroups, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.14.1"; + sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform + semigroups text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207723,6 +213344,24 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor haskell mode"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-mode-haskell_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.14.1"; + sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform text + yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207743,6 +213382,25 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-mode-javascript_0_14_1" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, dlist + , filepath, microlens-platform, mtl, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.14.1"; + sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -207801,6 +213459,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-snippet_0_14_1" = callPackage + ({ mkDerivation, base, binary, containers, data-default, free + , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector + , yi-core, yi-rope + }: + mkDerivation { + pname = "yi-snippet"; + version = "0.14.1"; + sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h"; + libraryHaskellDepends = [ + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope + ]; + testHaskellDepends = [ + base containers tasty-hunit tasty-th yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Snippet support for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-solarized" = callPackage ({ mkDerivation, base, yi }: mkDerivation { @@ -207930,7 +213610,6 @@ self: { libraryHaskellDepends = [ base HaXml ]; description = "make SVG string from Haskell data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yjtools" = callPackage @@ -207968,11 +213647,12 @@ self: { pname = "yoctoparsec"; version = "0.1.0.0"; sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp"; + revision = "1"; + editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9"; libraryHaskellDepends = [ base free mtl ]; homepage = "https://github.com/mniip/yoctoparsec"; description = "A truly tiny monadic parsing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoga" = callPackage @@ -208036,6 +213716,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "youtube_0_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, process, utility-ht }: + mkDerivation { + pname = "youtube"; + version = "0.2.1.1"; + sha256 = "098fhkyw70sxb58bj9hbshg12j57s23qrv9r1r7m13rxbxw6lf9f"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ base bytestring process utility-ht ]; + description = "Upload video to YouTube via YouTube API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yql" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, cryptohash, data-default, ecma262, exceptions @@ -208161,7 +213856,6 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "z3" = callPackage @@ -208169,8 +213863,8 @@ self: { }: mkDerivation { pname = "z3"; - version = "4.1.0"; - sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9"; + version = "4.1.1"; + sha256 = "07nmaaa6dldvysvh9jbx3m2cakx1x824hgnbh22w4nyia9hqjd8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; @@ -208668,7 +214362,33 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; + + "zip_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, monad-control, mtl, path, path-io, plan-b + , QuickCheck, resourcet, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "0.2.0"; + sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath monad-control + mtl path path-io plan-b resourcet text time transformers + transformers-base + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage @@ -208812,6 +214532,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zippers_0_2_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest + , lens, profunctors, semigroupoids + }: + mkDerivation { + pname = "zippers"; + version = "0.2.4"; + sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb"; + revision = "1"; + editedCabalFile = "18a7wlklxvl9fhk8j7njf8ifn2781vfiqz0vxk6ljx30f1p7plq1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base lens profunctors semigroupoids ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion lens ]; + homepage = "http://github.com/ekmett/zippers/"; + description = "Traversal based zippers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zippo" = callPackage ({ mkDerivation, base, mtl, yall }: mkDerivation { @@ -208963,7 +214703,6 @@ self: { homepage = "http://github.com/tittoassini/zm"; description = "Language independent, reproducible, absolute types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zmcat" = callPackage diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 30d82d3efc93..c67b61acd78d 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -1,7 +1,9 @@ -{ pkgs }: +# TODO(@Ericson2314): Remove `pkgs` param, which is only used for +# `buildStackProject` and `justStaticExecutables` +{ pkgs, lib }: rec { - makePackageSet = pkgs.callPackage ./make-package-set.nix {}; + makePackageSet = import ./make-package-set.nix; overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; @@ -25,7 +27,7 @@ rec { dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; }); appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); - removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); }); + removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); }); addBuildTool = drv: x: addBuildTools drv [x]; addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; }); @@ -71,7 +73,7 @@ rec { disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); - sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { + sdistTarball = pkg: lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; buildPhase = "./Setup sdist"; haddockPhase = ":"; @@ -89,12 +91,11 @@ rec { isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - } // (if pkgs.stdenv.isDarwin then { + } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) { configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; - } else {}) - ); + }); - buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { + buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6ed8d0864cac..87f3a04ebf57 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,20 +1,34 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -# required dependencies: -{ pkgs, stdenv, all-cabal-hashes }: +{ # package-set used for non-haskell dependencies (all of nixpkgs) + pkgs -# arguments: -# * ghc package to use -# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second -# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality -{ ghc, package-set, extensible-self }: +, # stdenv to use for building haskell packages + stdenv + +, haskellLib + +, # hashes for downloading Hackage packages + all-cabal-hashes + +, # compiler to use + ghc + +, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self` + # as second, and returns a set of haskell packages + package-set + +, # The final, fully overriden package set usable with the nixpkgs fixpoint + # overriding functionality + extensible-self +}: # return value: a function from self to the package set self: let inherit (stdenv.lib) fix' extends makeOverridable; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + inherit (haskellLib) overrideCabal; mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 147a021ff534..ec7d961581a4 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -97,7 +97,7 @@ symlinkJoin { fi done '' + (lib.optionalString stdenv.isDarwin '' - # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix): + # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index 23c4db804d3f..e85d25002235 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.0"; - sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz"; + version = "1.5.1"; + sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1fdfe4ca61dd..897f84f94ada 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -47,9 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - buildInputs = - [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc - ] + nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + + buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 675616a5f21e..ed018a942273 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -330,12 +330,12 @@ in { }; php70 = generic { - version = "7.0.21"; - sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b"; + version = "7.0.22"; + sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48"; }; php71 = generic { - version = "7.1.7"; - sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7"; + version = "7.1.8"; + sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h"; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix deleted file mode 100644 index 9ff8ec51efe5..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ stdenv, fetchurl -, bzip2 -, gdbm -, lzma -, ncurses -, openssl -, readline -, sqlite -, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false -, zlib -, callPackage -, self -, CF, configd -, python-setup-hook -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) -}: - -assert x11Support -> tcl != null - && tk != null - && xproto != null - && libX11 != null; - -with stdenv.lib; - -let - majorVersion = "3.3"; - minorVersion = "6"; - minorVersionSuffix = ""; - pythonVersion = majorVersion; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite readline ncurses openssl ] - ++ optionals x11Support [ tcl tk libX11 xproto ] - ++ optionals stdenv.isDarwin [ CF configd ]; - -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - inherit buildInputs; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; - }; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python doesn't try to update them when we freeze timestamps in nix store. - DETERMINISTIC_BUILD=1; - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; - - postPatch = '' - # Determinism - substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" -# # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist. - '' + optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - - configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" - ) - ''; - - setupHook = python-setup-hook sitePackages; - - postInstall = '' - # needed for some packages, especially packages that backport functionality - # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* ]]; then - rm -rf "$item" - else - echo $item - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - # Determinism: Windows installers were not deterministic. - # We're also not interested in building Windows installers. - find "$out" -name 'wininst*.exe' | xargs -r rm -f - - # Use Python3 as default python - ln -s "$out/bin/idle3" "$out/bin/idle" - ln -s "$out/bin/pip3" "$out/bin/pip" - ln -s "$out/bin/pydoc3" "$out/bin/pydoc" - ln -s "$out/bin/python3" "$out/bin/python" - ln -s "$out/bin/python3-config" "$out/bin/python-config" - ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" - - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - # Note that the .pyc file of _sysconfigdata.py should be regenerated! - for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level - find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit libPrefix sitePackages x11Support; - executable = "${libPrefix}m"; - buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy3 = true; - isPy33 = true; - is_py3k = true; # deprecated - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = http://python.org; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 4d20a21a4d13..e188e7ff48a4 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "6"; + minorVersion = "7"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "0h2z248hkf8x1ix1z8npkqs9cq62i322sl4rcjdkp7mawsxjhd7i"; + sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index a47b10d1cbb3..32bc0e22d1da 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.5"; - minorVersion = "3"; + minorVersion = "4"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf"; + sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -65,11 +65,6 @@ in stdenv.mkDerivation { ''; patches = [ - (fetchpatch { - name = "glibc-2.25-enosys.patch"; - url = https://github.com/python/cpython/commit/035ba5da3e53e.patch; - sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71"; - }) ./no-ldconfig.patch ]; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix deleted file mode 100644 index 055224dd740b..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-html-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2; - sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix deleted file mode 100644 index 8c6b842d0b94..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-pdf-a4-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-a4.tar.bz2; - sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix deleted file mode 100644 index 046abe8f83d7..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-pdf-letter-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-letter.tar.bz2; - sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix deleted file mode 100644 index 4d99c25bf598..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python33-docs-text-3.3.0"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-text.tar.bz2; - sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n"; - }; - installPhase = '' - mkdir -p $out/share/doc/python33 - cp -R ./ $out/share/doc/python33/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index 89e60f961f63..60e0a0bf1e6e 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -4,36 +4,24 @@ let pythonDocs = { html = { recurseForDerivations = true; - python33 = import ./3.3-html.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; }; pdf_a4 = { recurseForDerivations = true; - python33 = import ./3.3-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; }; pdf_letter = { recurseForDerivations = true; - python33 = import ./3.3-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; }; text = { recurseForDerivations = true; - python33 = import ./3.3-text.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 1c74e612b559..37bd5b097395 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -66,7 +66,9 @@ wrapPythonProgramsIn() { # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH") + --prefix PATH ':' "$program_PATH" + --set PYTHONNOUSERSITE "true" + ) # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index b4bd532dc1d9..9f355ddefda7 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -6,8 +6,7 @@ # Create a python executable that knows about additional packages. let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; - env = ( - let + env = let paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; in buildEnv { name = "${python.name}-env"; @@ -29,26 +28,31 @@ let for prg in *; do if [ -f "$prg" ]; then rm -f "$out/bin/$prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" + if [ -x "$prg" ]; then + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" + fi fi done fi done '' + postBuild; - passthru.env = stdenv.mkDerivation { - name = "interactive-${python.name}-environment"; - nativeBuildInputs = [ env ]; + inherit (python) meta; + + passthru = python.passthru // { + interpreter = "${env}/bin/${python.executable}"; + inherit python; + env = stdenv.mkDerivation { + name = "interactive-${python.name}-environment"; + nativeBuildInputs = [ env ]; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; + buildCommand = '' + echo >&2 "" + echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; }; - }) // { - inherit python; - inherit (python) meta; }; in env diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 69f86e020c79..098378701d57 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -8,11 +8,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { name = "avahi-${version}"; - version = "0.6.32"; + version = "0.7"; src = fetchurl { url = "https://github.com/lathiat/avahi/releases/download/v${version}/avahi-${version}.tar.gz"; - sha256 = "0m5l3ny9i2z1l27y4wm731c0zdkmfn6l1szbajx0ljjiblc92jfm"; + sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; patches = [ ./no-mkdir-localstatedir.patch ]; diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch index a8a1878cc90e..72965c9f0282 100644 --- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch +++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch @@ -1,12 +1,12 @@ Don't "mkdir $(localstatedir)" since we can't do it (/var). ---- avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 05:06:35.000000000 +0200 -+++ avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 18:03:45.000000000 +0200 -@@ -1554,7 +1554,6 @@ xmllint: +--- a/avahi-daemon/Makefile.in ++++ b/avahi-daemon/Makefile.in +@@ -1625,7 +1625,6 @@ xmllint: done install-data-local: -- test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run" +- test -z "$(avahi_runtime_dir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_runtime_dir)" update-systemd: curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9f97b18b4d77..fe06bcfab6d3 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.153"; + version = "1.1.18"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08"; + sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix new file mode 100644 index 000000000000..42621a1792cc --- /dev/null +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "backward-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "bombela"; + repo = "backward-cpp"; + rev = "v${version}"; + sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp backward.hpp $out/include + + runHook postInstall + ''; + + meta = with lib; { + description = "Beautiful stack trace pretty printer for C++"; + homepage = "https://github.com/bombela/backward-cpp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 3a5378212987..ff48ffe67f0a 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, cmake, perl, go }: +# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { name = "boringssl-${version}"; - version = "2016-03-08"; + version = "2017-02-23"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122"; - sha256 = "0bm7vqg3bk716xmw2af99p44zizfhknq9z3cphf7klfdrr7ibqm5"; + rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; + sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; }; buildInputs = [ cmake perl go ]; @@ -17,8 +18,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/include $out/lib - mv tool/bssl $out/bin - mv ssl/libssl.a $out/lib + mv tool/bssl $out/bin + + mv ssl/libssl.a $out/lib + mv crypto/libcrypto.a $out/lib + mv decrepit/libdecrepit.a $out/lib + mv ../include/openssl $out/include ''; diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix deleted file mode 100644 index 4634a80ade61..000000000000 --- a/pkgs/development/libraries/ccnx/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, openssl, expat, libpcap }: -let - version = "0.8.2"; -in -stdenv.mkDerivation { - name = "ccnx-${version}"; - src = fetchurl { - url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; - sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; - }; - buildInputs = [ openssl expat libpcap ]; - preConfigure = '' - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/bin - substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" - ''; - meta = with stdenv.lib; { - homepage = http://www.ccnx.org/; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - To address the Internet’s modern-day requirements with a better - fitting model, PARC has created a new networking architecture - called Content-Centric Networking (CCN), which operates by addressing - and delivering Content Objects directly by Name instead of merely - addressing network end-points. In addition, the CCN security model - explicitly secures individual Content Objects rather than securing - the connection or “pipeâ€. Named and secured content resides in - distributed caches automatically populated on demand or selectively - pre-populated. When requested by name, CCN delivers named content to - the user from the nearest cache, thereby traversing fewer network hops, - eliminating redundant requests, and consuming less resources overall. - ''; - license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; - }; -} diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix deleted file mode 100644 index aa55a7f0d1dc..000000000000 --- a/pkgs/development/libraries/exosip/3.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, libosip, openssl, pkgconfig }: - -stdenv.mkDerivation rec { - version = "3.6.0"; - src = fetchurl { - url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; - }; - name = "libexosip2-${version}"; - - buildInputs = [ libosip openssl pkgconfig ]; - - meta = { - license = stdenv.lib.licenses.gpl2Plus; - description = "Library that hides the complexity of using the SIP protocol"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 205faa845fee..0a2deab796bb 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchpatch, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.2"; + name = "expat-2.2.3"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"; + sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; + patches = [ + (fetchpatch { + name = "fix-aarch-build.patch"; + url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch"; + sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w"; + stripLen = 1; + excludes = [ "coverage.sh" ]; + }) + ]; + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4a02c034cf38..d9239989cf65 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -100,7 +100,7 @@ , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code -#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder +, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder @@ -155,7 +155,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame + * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r"; + sha256 = "07is8msrhxr1dk6vgwa192k2pl2a0in1h9w8f9cknlvbvhn01afj"; }; patchPhase = ''patchShebangs . @@ -360,7 +360,7 @@ stdenv.mkDerivation rec { (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") - #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") + (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") #(enableFeature (openh264 != null) "openh264") @@ -403,7 +403,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump + libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals nonfreeLicensing [ fdk_aac openssl ] diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index 342137553135..bf414e0865d1 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.2"; - sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91"; + branch = "3.3.3"; + sha256 = "0wx421d7vp4nz8kgp0kg16sswikj8ff1pd18x9mmcbpmqy7sqs8h"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 145d2b42a9db..eda18bc432c2 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,18 +1,17 @@ -{stdenv, fetchurl, unzip, cmake, python}: +{stdenv, fetchFromGitHub, unzip, cmake, python}: stdenv.mkDerivation { - name = "flann-1.8.4"; + name = "flann-1.9.1"; - src = fetchurl { - url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; - sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; + src = fetchFromGitHub { + owner = "mariusmuja"; + repo = "flann"; + rev = "1.9.1"; + sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; buildInputs = [ unzip cmake python ]; - # patch out examples in Darwin because they do not compile. - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ]; - meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch deleted file mode 100644 index 95a6f0eed8eb..000000000000 --- a/pkgs/development/libraries/flann/no-examples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,7 +155,7 @@ - - add_subdirectory( cmake ) - add_subdirectory( src ) --add_subdirectory( examples ) -+#add_subdirectory( examples ) - add_subdirectory( test ) - add_subdirectory( doc ) diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 136f18b06143..c77c3b3640b7 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X"; + description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; inherit version; homepage = http://openkinect.org; license = with stdenv.lib.licenses; [ gpl2 asl20 ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index eb8f17980c2c..0bb91951a28d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; -composableDerivation.composableDerivation {} (fixed: rec { - version = "2.1.3"; +stdenv.mkDerivation rec { + version = "2.2.1"; name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -22,16 +22,6 @@ composableDerivation.composableDerivation {} (fixed: rec { ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; - hardeningDisable = [ "format" ]; - - # - Unset CC and CXX as they confuse libtool. - # - teach gdal that libdf is the legacy name for libhdf - preConfigure = '' - unset CC CXX - substituteInPlace configure \ - --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" - ''; - configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) @@ -50,6 +40,25 @@ composableDerivation.composableDerivation {} (fixed: rec { (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; + hardeningDisable = [ "format" ]; + + CXXFLAGS = "-fpermissive"; + + postPatch = '' + sed -i '/ifdef bool/i\ + #ifdef swap\ + #undef swap\ + #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + ''; + + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; + preBuild = '' substituteInPlace swig/python/GNUmakefile \ --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" @@ -68,4 +77,4 @@ composableDerivation.composableDerivation {} (fixed: rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; -}) +} diff --git a/pkgs/development/libraries/glibc/avoid-semver-on-common.patch b/pkgs/development/libraries/glibc/avoid-semver-on-common.patch new file mode 100644 index 000000000000..966325d6f183 --- /dev/null +++ b/pkgs/development/libraries/glibc/avoid-semver-on-common.patch @@ -0,0 +1,65 @@ +From 0edeadc0d396aa713b808ae50a0058aca5d3837e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Wed, 26 Jul 2017 10:08:46 -0700 +Subject: [PATCH] Avoid .symver on common symbols [BZ #21666] + +The .symver directive on common symbol just creates a new common symbol, +not an alias and the newer assembler with the bug fix for + +https://sourceware.org/bugzilla/show_bug.cgi?id=21661 + +will issue an error. Before the fix, we got + +$ readelf -sW libc.so | grep "loc[12s]" + 5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1 + 5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2 + 5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs + 6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs@GLIBC_2.2.5 + 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1@GLIBC_2.2.5 + 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2@GLIBC_2.2.5 + +in libc.so. The versioned loc1, loc2 and locs have the wrong addresses. +After the fix, we got + +$ readelf -sW libc.so | grep "loc[12s]" + 6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs@GLIBC_2.2.5 + 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1@GLIBC_2.2.5 + 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2@GLIBC_2.2.5 + + [BZ #21666] + * misc/regexp.c (loc1): Add __attribute__ ((nocommon)); + (loc2): Likewise. + (locs): Likewise. + +(cherry picked from commit 388b4f1a02f3a801965028bbfcd48d905638b797) +--- + ChangeLog | 7 +++++++ + misc/regexp.c | 9 +++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/misc/regexp.c b/misc/regexp.c +index 19d76c0..eaea7c3 100644 +--- a/misc/regexp.c ++++ b/misc/regexp.c +@@ -29,14 +29,15 @@ + + #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23) + +-/* Define the variables used for the interface. */ +-char *loc1; +-char *loc2; ++/* Define the variables used for the interface. Avoid .symver on common ++ symbol, which just creates a new common symbol, not an alias. */ ++char *loc1 __attribute__ ((nocommon)); ++char *loc2 __attribute__ ((nocommon)); + compat_symbol (libc, loc1, loc1, GLIBC_2_0); + compat_symbol (libc, loc2, loc2, GLIBC_2_0); + + /* Although we do not support the use we define this variable as well. */ +-char *locs; ++char *locs __attribute__ ((nocommon)); + compat_symbol (libc, locs, locs, GLIBC_2_0); + + +-- +2.9.3 diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1b53acf12b17..d1c5446e807f 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation ({ ./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch ./CVE-2017-1000366-rtld-LD_PRELOAD.patch ./CVE-2017-1000366-rtld-LD_AUDIT.patch + + /* https://sourceware.org/bugzilla/show_bug.cgi?id=21666 */ + ./avoid-semver-on-common.patch ] ++ lib.optionals stdenv.isi686 [ ./fix-i686-memchr.patch diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 2a73682a7461..0b633f0a2f17 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,7 +1,7 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring -, unbound, dns-root-data +, unbound, dns-root-data, gettext # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -41,6 +41,7 @@ stdenv.mkDerivation { buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv + ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f225f34c3364..11c3134e10bb 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # ToDo: one probably should specify schemas for samba and others here preFixup = '' - wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + for f in $out/libexec/*; do + wrapProgram $f \ + ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 952050f0e8f7..dfb45aa598d7 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla Firefox 3 & Thunderbird, Google Chrome, and it is also used by - proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and + proprietary software packages, like macOS, InDesign, memoQ, Opera and SDL Trados. Main features: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { * C++ library under GPL/LGPL/MPL tri-license. * Interfaces and ports: * Enchant (Generic spelling library from the Abiword project), - * XSpell (Mac OS X port, but Hunspell is part of the OS X from version 10.6 (Snow Leopard), and + * XSpell (macOS port, but Hunspell is part of the macOS from version 10.6 (Snow Leopard), and now it is enough to place Hunspell dictionary files into ~/Library/Spelling or /Library/Spelling for spell checking), * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO. diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index cbc66dd6ae68..b4fea7c1fa4a 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 778997e5674d..03afd6f1e878 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation rec { --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ "DBUSSERVICEDIR=$out/share/dbus-1/services" autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done substituteInPlace src/Makefile.in \ --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" ''; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index d45a616606d9..a9c7a9b70bb4 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.11.2"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; + sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 8f005d6a5a40..3a26dd407e4e 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -43,8 +43,10 @@ in stdenv.mkDerivation rec { substituteInPlace configure.ac \ --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 5d697489638b..96e9c0624f21 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d2ba84bb5dd9..6fa0caa97e91 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,28 +1,14 @@ { stdenv, fetchurl, openssl, findutils }: -let version = "2.0.22"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libevent-${version}"; + version = "2.1.8"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; + sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"; }; - prePatch = let - # https://lwn.net/Vulnerabilities/714581/ - debian = fetchurl { - url = "http://http.debian.net/debian/pool/main/libe/libevent/" - + "libevent_2.0.21-stable-3.debian.tar.xz"; - sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5"; - }; - in '' - tar xf '${debian}' - patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \ - | grep -v '^20d6d445.patch' \ - | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')" - ''; - # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" "openssl" ]; diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix deleted file mode 100644 index fb92d6aa4cad..000000000000 --- a/pkgs/development/libraries/libevhtp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: - -stdenv.mkDerivation rec { - name = "libevhtp-${version}"; - version = "1.2.11"; - - src = fetchFromGitHub { - owner = "ellzey"; - repo = "libevhtp"; - rev = version; - sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg"; - }; - - buildInputs = [ cmake openssl libevent ]; - - buildPhase = "cmake"; - - meta = with stdenv.lib; { - description = "A more flexible replacement for libevent's httpd API"; - homepage = https://github.com/ellzey/libevhtp; - license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index c32866a0d26a..d42425c8e185 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34 -, extraOnly ? false }: +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34 +, extraOnly ? false +, withGtk3 ? false, gtk2, gtk3 }: let + gtk = if withGtk3 then gtk3 else gtk2; inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { @@ -14,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ] + buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only"; + configureFlags = [ (optional extraOnly "--with-extra-only") + (optional withGtk3 "--with-gtk=3") ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://blog.lxde.org/?cat=28/; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ed742bee8741..5bcb8c5fe98a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -14,9 +14,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; - buildInputs = - [ libgpgerror ] - ++ lib.optional enableCapabilities libcap; + # The CPU Jitter random number generator must not be compiled with + # optimizations and the optimize -O0 pragma only works for gcc. + # The build enables -O2 by default for everything else. + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + + buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 2495c1505f0f..e46da4dc9fb2 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, perl, zlib, gnutls, gss, openssl, libssh2, libidn, libpsl, openldap }: +{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl +, libssh2, libidn, libpsl, openldap }: stdenv.mkDerivation rec { - version = "7.48.0"; + version = "7.54.1"; name = "libgnurl-${version}"; src = fetchurl { - url = "https://gnunet.org/sites/default/files/gnurl-7_48_0.tar.bz2"; - sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a"; + url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2"; + sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ]; preConfigure = '' diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index ba1f8913501c..9f75f17caeed 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -38,8 +38,10 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \ --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python' autoconf - substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {configure,ltmain.sh,m4/libtool.m4}; do + substituteInPlace $f \ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 1ebdcb365afc..67936fecdf4e 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure \ --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' - substituteInPlace {build-aux/ltmain.sh,configure,m4/libtool.m4} \ - --replace /usr/bin/file ${file}/bin/file + for f in {build-aux/ltmain.sh,configure,m4/libtool.m4}; do + substituteInPlace $f\ + --replace /usr/bin/file ${file}/bin/file + done ''; configureFlags = [ diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index a0e3bb52dfe2..086ba8f32d21 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Fix linking against libpthread (patch from Fedora) # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 # https://bugs.launchpad.net/libmemcached/+bug/1281907 - # Fix building on OS X (patch from Homebrew) + # Fix building on macOS (patch from Homebrew) # https://bugs.launchpad.net/libmemcached/+bug/1245562 patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix deleted file mode 100644 index 703c5e36b8b7..000000000000 --- a/pkgs/development/libraries/libmsn/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, openssl}: - -stdenv.mkDerivation rec { - name = "libmsn-4.2.1"; - src = fetchurl { - url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; - sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde"; - }; - patches = [ ./fix-ftbfs-gcc4.7.diff ]; - buildInputs = [ cmake openssl ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff deleted file mode 100644 index 46aeab31c842..000000000000 --- a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff +++ /dev/null @@ -1,16 +0,0 @@ -Fix g++ 4.7 build failure - -Kudos to Matthias Klose for the patch - -Index: libmsn-4.2/msn/util.cpp -=================================================================== ---- libmsn-4.2.orig/msn/util.cpp 2009-07-22 19:57:10.000000000 +0000 -+++ libmsn-4.2/msn/util.cpp 2012-04-16 20:52:18.068767213 +0000 -@@ -25,6 +25,7 @@ - #include <msn/util.h> - #include <sstream> - #include <errno.h> -+#include <unistd.h> - #include <cctype> - #include <fstream> - #include <openssl/rand.h> diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 12922d4612d0..0457c0eb9c49 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.0.7"; - seafileVersion = "5.0.7"; + seafileVersion = "6.1.0"; name = "libsearpc-${version}"; src = fetchurl diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index e7ee188c29f0..ab10e34e2301 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Cross-platform shared library for serial port access"; homepage = http://sigrok.org/; license = licenses.gpl3Plus; - # Mac OS X, Windows and Android is also supported (according to upstream). + # macOS, Windows and Android is also supported (according to upstream). platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index bd5d0fd733c7..180d217ddf10 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { code format under the GNU Lesser General Public License. The library was written to compile and run on a Linux system but - should compile and run on just about any Unix (including MacOS X). + should compile and run on just about any Unix (including macOS). There are also pre-compiled binaries available for 32 and 64 bit windows. diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b508b2fea0eb..4fc1a5d27898 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.12"; + name = "libsodium-1.0.13"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"; + sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 030d800f4a5b..d1b476d94d20 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,15 +4,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.56"; - version = "${majorVersion}.0"; + majorVersion = "2.59"; + version = "${majorVersion}.90.1"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5"; + sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0"; }; prePatch = '' diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index dbd203b97cfc..516005b874fc 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.10"; + name = "libtasn1-4.12"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; + sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; }; patches = [ (fetchurl { - name = "CVE-2017-6891.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484"; - sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k"; + name = "CVE-2017-9310.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; + sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; }) ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 595ec9d01ccf..7f6faa996bd6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { prePatch =let debian = fetchurl { - url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; + url = http://snapshot.debian.org/archive/debian-debug/20170602T031313Z/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng"; }; in '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index b6aace0de2d6..ed52902938db 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1.1"; - sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; + version = "1.1.4"; + sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; }) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index dc9e1d01df43..bac29bc0ca8d 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }: +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "libtsm-3"; @@ -9,12 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ - autoconf automake - ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - aclocal - ''; + autoreconfHook + ]; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 805a4c0b63db..b3066c4eed82 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9"; + sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s"; }; patches = [ ./build-on-bsd.patch ]; @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' + + # the path to qemu-kvm will be stored in VM's .xml and .save files + # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations + substituteInPlace src/qemu/qemu_capabilities.c \ + --replace '"/usr/libexec/qemu-kvm"' '"/run/libvirt/nix-emulators/${if stdenv.isAarch64 then "qemu-system-aarch64" else "qemu-kvm"}"' + substituteInPlace src/lxc/lxc_conf.c \ + --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' '' + '' PATH=${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references @@ -77,6 +84,8 @@ stdenv.mkDerivation rec { --replace "lock/subsys" "lock" sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ -i "$out/libexec/libvirt-guests.sh" + + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill '' + optionalString stdenv.isLinux '' rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix new file mode 100644 index 000000000000..e13796229ce1 --- /dev/null +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake +, autoreconfHook, zlib +, enableGrpc ? false +}: + +let + # be sure to use the right revision based on the submodule! + common = + fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-common"; + rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded"; + sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln"; + }; + +in + +stdenv.mkDerivation rec { + name = "lightstep-tracer-cpp-${version}"; + version = "0.36"; + + src = fetchFromGitHub { + owner = "lightstep"; + repo = "lightstep-tracer-cpp"; + rev = "v0_36"; + sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16"; + }; + + postUnpack = '' + cp -r ${common}/* $sourceRoot/lightstep-tracer-common + ''; + + preConfigure = lib.optionalString (!enableGrpc) '' + configureFlagsArray+=("--disable-grpc") + ''; + + nativeBuildInputs = [ + pkgconfig automake autoreconfHook + ]; + + buildInputs = [ + protobuf3_2 zlib + ]; + + meta = with lib; { + description = "Distributed tracing system built on top of the OpenTracing standard"; + homepage = "http://lightstep.com/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 15a62f264148..168b94495a97 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; + homepage = https://www.mltframework.org; license = licenses.gpl3; maintainers = [ maintainers.tohl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 5275f4ecb737..67d2bdf1559b 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool +{ stdenv, fetchzip, perl, pkgconfig, libbson , openssl, which }: stdenv.mkDerivation rec { name = "mongoc-${version}"; - version = "1.5.4"; + version = "1.7.0"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q"; + sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn"; }; propagatedBuildInputs = [ libbson ]; - buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ]; + buildInputs = [ openssl perl pkgconfig which ]; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 907e628b767c..a344b8fa92f4 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.2.0"; + version = "1.5.1"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf"; + sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44"; }; outputs = [ "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = http://movits.sesse.net; + homepage = http://movit.sesse.net; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix new file mode 100644 index 000000000000..9a8787ad7f49 --- /dev/null +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +let + version = "0.1.5"; +in +stdenv.mkDerivation { + name = "opencore-amr-${version}"; + src = fetchurl { + url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + }; + + meta = { + homepage = https://opencore-amr.sourceforge.io/; + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.kiloreux ]; + }; +} diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0443d00a258d..29d0a1a3a4cd 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -37,7 +37,7 @@ let sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; }; - # This fixes the build on OS X. + # This fixes the build on macOS. # See: https://github.com/opencv/opencv_contrib/pull/926 contribOSXFix = fetchpatch { url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch"; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { (lib.optionalString enableContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" - # This fixes the build on OS X. + # This fixes the build on macOS. patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}" for name in vgg_generated_48.i \ diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 7155d0f48a80..94a4db43fda6 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "--disable-dependency-tracking" # speeds up one-time build "--enable-modules" "--sysconfdir=/etc" + "--enable-crypt" ] ++ stdenv.lib.optional (openssl == null) "--without-tls" ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c0296f42406d..394eab6c9db3 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,7 +48,8 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.isAarch64) "no-afalgeng"; makeFlags = [ "MANDIR=$(man)/share/man" ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 0888fba4ecac..7a7a6d9d23f1 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv +, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "p11-kit-0.23.2"; + name = "p11-kit-${version}"; + version = "0.23.7"; - src = fetchurl { - url = "${meta.homepage}releases/${name}.tar.gz"; - sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms"; + src = fetchFromGitHub { + owner = "p11-glue"; + repo = "p11-kit"; + rev = version; + sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; + nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ]; + buildInputs = [ libffi libtasn1 libiconv ]; + + autoreconfPhase = '' + NOCONFIGURE=1 ./autogen.sh + ''; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" + "--enable-doc" ]; installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix new file mode 100644 index 000000000000..09cbd86eb92b --- /dev/null +++ b/pkgs/development/libraries/pangolin/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, Carbon ? null, Cocoa ? null +}: + +stdenv.mkDerivation rec { + name = "pangolin-${version}"; + + version = "2017-08-02"; + + src = fetchFromGitHub { + owner = "stevenlovegrove"; + repo = "Pangolin"; + rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; + sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + }; + + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + buildInputs = [ + mesa_noglu + glew + xorg.libX11 + ffmpeg + python3 + libjpeg + libpng + libtiff + eigen + ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + + enableParallelBuilding = true; + + # The tests use cmake's findPackage to find the installed version of + # pangolin, which isn't what we want (or available). + doCheck = false; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + meta = { + description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + longDescription = '' + Pangolin is a lightweight portable rapid development library for managing + OpenGL display / interaction and abstracting video input. At its heart is + a simple OpenGl viewport manager which can help to modularise 3D + visualisation without adding to its complexity, and offers an advanced + but intuitive 3D navigation handler. Pangolin also provides a mechanism + for manipulating program variables through config files and ui + integration, and has a flexible real-time plotter for visualising + graphical data. + ''; + homepage = https://github.com/stevenlovegrove/Pangolin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 4e7c7ea54568..f2e18233d913 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation { preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES + # We need to set LD to CXX or otherwise we get nasty compile errors + export LD=$CXX configureFlags+="\ -plugindir $out/$qtPluginPrefix \ @@ -111,6 +113,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\"" + + unset LD ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 7aba54fb883b..8f9be38fc882 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -99,6 +99,7 @@ let inherit developerBuild decryptSslTraffic; }; + qtcharts = callPackage ./qtcharts.nix {}; qtconnectivity = callPackage ./qtconnectivity.nix {}; qtdeclarative = callPackage ./qtdeclarative {}; qtdoc = callPackage ./qtdoc.nix {}; @@ -128,10 +129,10 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" ([ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations - qtwebsockets qtx11extras qtxmlpatterns + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 60acf2cea9d2..2ae85bba391d 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,3 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/ \ - http://download.qt.io/community_releases/5.9/5.9.0-final/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix new file mode 100644 index 000000000000..46713eb7a9e7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtcharts"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 021cd935a14c..247800b75780 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,331 +3,331 @@ { qt3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qt3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1a8v70svsqxissj0rmna71f9g2w56w0zgk5s41m5acgvi9byzywy"; - name = "qt3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; + sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; + name = "qt3d-opensource-src-5.9.1.tar.xz"; }; }; qtactiveqt = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtactiveqt-opensource-src-5.9.0.tar.xz"; - sha256 = "0d8n4q3r54kkb340ap802cc97jznhffzx1m7h2775q0h2nzvmiyp"; - name = "qtactiveqt-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; + sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; + name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; }; }; qtandroidextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtandroidextras-opensource-src-5.9.0.tar.xz"; - sha256 = "0xq3nd8nlbmd617lq60nb2lxblc84lk8wh14n18b3q81nsvc2yln"; - name = "qtandroidextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; + name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; }; }; qtbase = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz"; - sha256 = "0v19spxa4sfq0a35nab9n8n2s3jd0443px0k45zhhg103apv4zi6"; - name = "qtbase-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; + sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; + name = "qtbase-opensource-src-5.9.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcanvas3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1jrv79rhpqyp4ip5fnf40plqcq9byl1fy8287ghq4jfhpm9bq5yq"; - name = "qtcanvas3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; + sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; + name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; }; }; qtcharts = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcharts-opensource-src-5.9.0.tar.xz"; - sha256 = "17m86csjymvcnprk8m4y6hx1qhlk9811rhqwwkqdymyyswx6xs3l"; - name = "qtcharts-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; + sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; + name = "qtcharts-opensource-src-5.9.1.tar.xz"; }; }; qtconnectivity = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtconnectivity-opensource-src-5.9.0.tar.xz"; - sha256 = "0k52acsywr849nw86dfjqcv1lqgnq01akqrm0qjs7ysm1ayg8mcp"; - name = "qtconnectivity-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; + sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; + name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdatavis3d-opensource-src-5.9.0.tar.xz"; - sha256 = "1wvilla48jlw6zv2hc32ra0bs8p13s68sqbgr91bzbn7h7qaysv9"; - name = "qtdatavis3d-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; + sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; + name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; }; }; qtdeclarative = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdeclarative-opensource-src-5.9.0.tar.xz"; - sha256 = "1g9yz7q2laqs80m4i6zngxrq3pd7z5khr2f48glma8cmiw4p56rw"; - name = "qtdeclarative-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; + sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; + name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; }; }; qtdoc = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdoc-opensource-src-5.9.0.tar.xz"; - sha256 = "1k67i67npcjyr89hlnljjxw5jkh49ql8yzw9m9b4gld7nk9dr4kr"; - name = "qtdoc-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; + sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; + name = "qtdoc-opensource-src-5.9.1.tar.xz"; }; }; qtgamepad = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgamepad-opensource-src-5.9.0.tar.xz"; - sha256 = "0lpj2qspidx6s2568m5v40j2zdnrl8zwjdp40zg4y2q6hy2gg597"; - name = "qtgamepad-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; + sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; + name = "qtgamepad-opensource-src-5.9.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgraphicaleffects-opensource-src-5.9.0.tar.xz"; - sha256 = "1cz4ykwlm1c0hbv4d8y07bwyz87nkz5l9ss3f65vadm8zcabqw55"; - name = "qtgraphicaleffects-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; + name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; }; }; qtimageformats = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtimageformats-opensource-src-5.9.0.tar.xz"; - sha256 = "10alm3kz3md835hf5hx7322bak9pp9igi2knvymxsjqr8x87jq94"; - name = "qtimageformats-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; + sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; + name = "qtimageformats-opensource-src-5.9.1.tar.xz"; }; }; qtlocation = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtlocation-opensource-src-5.9.0.tar.xz"; - sha256 = "1xia1y1pjill9m880rgmsl2zshcg1nvwkyfdb2lz8g8x9fj0pvp3"; - name = "qtlocation-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; + sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; + name = "qtlocation-opensource-src-5.9.1.tar.xz"; }; }; qtmacextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmacextras-opensource-src-5.9.0.tar.xz"; - sha256 = "1przk4dbyjdy18a5x1c4m04v40d70nkgwc569zjccpbqz0a0agbx"; - name = "qtmacextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; + name = "qtmacextras-opensource-src-5.9.1.tar.xz"; }; }; qtmultimedia = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmultimedia-opensource-src-5.9.0.tar.xz"; - sha256 = "1vk0vlp9wapj1pip5v0v0sxynlig38m3a1qbjhid3rm27f971cqb"; - name = "qtmultimedia-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; + sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; + name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtnetworkauth-opensource-src-5.9.0.tar.xz"; - sha256 = "157byylzir8cr5y407qpjmz9ag0b0qaz99n99nl2xjxkyll8ph0g"; - name = "qtnetworkauth-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; + sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; + name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; }; }; qtpurchasing = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtpurchasing-opensource-src-5.9.0.tar.xz"; - sha256 = "0xcka24qjdydqhf7fhn2i2ycn3zsi4vzqv9s77wzmaksrazwb13q"; - name = "qtpurchasing-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; + sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; + name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols-opensource-src-5.9.0.tar.xz"; - sha256 = "1zjl2wp5407y8iabwi30j4jpxh2j4y0ijb5jvvpdq583nbzgyg8p"; - name = "qtquickcontrols-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; + sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; + name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols2-opensource-src-5.9.0.tar.xz"; - sha256 = "170xgk4jw1b1rpq8838dc5sb0dyv1jap3yfgg5hymrjzrk0nzaq9"; - name = "qtquickcontrols2-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; + name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtremoteobjects-opensource-src-5.9.0.tar.xz"; - sha256 = "0f8dv7sswzck0l2md1zl44cbvi54mm6iiz4qh2hh3vqwyj9k5xyr"; - name = "qtremoteobjects-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; + sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; + name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; }; }; qtscript = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscript-opensource-src-5.9.0.tar.xz"; - sha256 = "0r697ap324l8lnbqbhrrqzsl9k4nmk6lcijxlaqn3ksxgfzbcciw"; - name = "qtscript-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; + sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; + name = "qtscript-opensource-src-5.9.1.tar.xz"; }; }; qtscxml = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscxml-opensource-src-5.9.0.tar.xz"; - sha256 = "0f2jnhl30ij6y4wzlvgjsqgpaywq4g0wc4yjw8s888vcfl062nb4"; - name = "qtscxml-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; + sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; + name = "qtscxml-opensource-src-5.9.1.tar.xz"; }; }; qtsensors = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsensors-opensource-src-5.9.0.tar.xz"; - sha256 = "0jdaw0i6rirs66x4cjh8l24fsyp020x1mv1psyf3ffbkdq1pngjx"; - name = "qtsensors-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; + sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; + name = "qtsensors-opensource-src-5.9.1.tar.xz"; }; }; qtserialbus = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialbus-opensource-src-5.9.0.tar.xz"; - sha256 = "1zw32ha5hz7zsdp8m2dk58kivxd66vkzijbnhi8jvzjp4nf0pm1f"; - name = "qtserialbus-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; + sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; + name = "qtserialbus-opensource-src-5.9.1.tar.xz"; }; }; qtserialport = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialport-opensource-src-5.9.0.tar.xz"; - sha256 = "0zwxfbyn5rg6vyrgpi5c3n852vd32m37ghzyj4l50ljndlz2w0l0"; - name = "qtserialport-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; + sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; + name = "qtserialport-opensource-src-5.9.1.tar.xz"; }; }; qtspeech = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtspeech-opensource-src-5.9.0.tar.xz"; - sha256 = "0da7q3j49hn9j2wy0ny4ym4nxy33yi8p62v9vrq9r9lb4xqjipcl"; - name = "qtspeech-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; + sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; + name = "qtspeech-opensource-src-5.9.1.tar.xz"; }; }; qtsvg = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsvg-opensource-src-5.9.0.tar.xz"; - sha256 = "0zpy53vb0ckaj71ffl450qv9kipl8gwwcbbras8kbg6bpl8srl8g"; - name = "qtsvg-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; + sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; + name = "qtsvg-opensource-src-5.9.1.tar.xz"; }; }; qttools = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttools-opensource-src-5.9.0.tar.xz"; - sha256 = "1vl5lapnbaam51pfw89pshh6rxqwfrbpj0j8gdhzdngr6n79dzk4"; - name = "qttools-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; + sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; + name = "qttools-opensource-src-5.9.1.tar.xz"; }; }; qttranslations = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttranslations-opensource-src-5.9.0.tar.xz"; - sha256 = "0xsgvk8j7zl4infgmrkhdmjkizcihddqn9sc5g1dv2d94gc83jaw"; - name = "qttranslations-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; + sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; + name = "qttranslations-opensource-src-5.9.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtvirtualkeyboard-opensource-src-5.9.0.tar.xz"; - sha256 = "0xks7n70631p5ij7vbww5ihni6iscx9hkdw8c97nnzb1bvvaqx19"; - name = "qtvirtualkeyboard-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; + name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; }; }; qtwayland = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwayland-opensource-src-5.9.0.tar.xz"; - sha256 = "0zlxlxrc15x69jwhcc6h0xi4mfchbb3pf27y3zy22yi3ynv2p04v"; - name = "qtwayland-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; + sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; + name = "qtwayland-opensource-src-5.9.1.tar.xz"; }; }; qtwebchannel = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebchannel-opensource-src-5.9.0.tar.xz"; - sha256 = "1fg1g2h9s9v6lg10ix59pzws35fyh3hh5x2005pyp84xdg47mvqj"; - name = "qtwebchannel-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; + sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; + name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; }; }; qtwebengine = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebengine-opensource-src-5.9.0.tar.xz"; - sha256 = "085qq852kwb8rqw12w96647vfvsgqvw33wc4xn3cb2gwn1wsbm1f"; - name = "qtwebengine-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; + sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; + name = "qtwebengine-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz"; - sha256 = "012fd8khiasfn8wx5ci310y94ap3y90a011f66cajm80fhxikbcd"; - name = "qtwebkit-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz"; + sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998"; + name = "qtwebkit-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit-examples = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-examples-opensource-src-5.9.0.tar.xz"; - sha256 = "0zj700z90k4sss1b5zg4rlg5pkq79q72pql1d6zglrgp505s9a7x"; - name = "qtwebkit-examples-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz"; + sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4"; + name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; }; }; qtwebsockets = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebsockets-opensource-src-5.9.0.tar.xz"; - sha256 = "1ml60p50hr3f68l0fiyqg2pf6n37flzxafzasis42jm4m757m5v2"; - name = "qtwebsockets-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; + sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; + name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; }; }; qtwebview = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebview-opensource-src-5.9.0.tar.xz"; - sha256 = "0ayjsdyymg9hrryn2y0c796cbwdf4hdpjdwjqkib57rblh5g39qw"; - name = "qtwebview-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; + sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; + name = "qtwebview-opensource-src-5.9.1.tar.xz"; }; }; qtwinextras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwinextras-opensource-src-5.9.0.tar.xz"; - sha256 = "12xh6wqjn1wmvy7rzay6a0wyc31lgv1zida87kr67dbwblmax03j"; - name = "qtwinextras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; + sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; + name = "qtwinextras-opensource-src-5.9.1.tar.xz"; }; }; qtx11extras = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtx11extras-opensource-src-5.9.0.tar.xz"; - sha256 = "0smzs29zqi77s1038ddkj3wzcchajqrjymwa5jgva7n2dn2x40wy"; - name = "qtx11extras-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; + sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; + name = "qtx11extras-opensource-src-5.9.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtxmlpatterns-opensource-src-5.9.0.tar.xz"; - sha256 = "1f2mly7ddw4hpr3x0lpdahcikivwhiwa3238yrg4gz2c3lxj5y21"; - name = "qtxmlpatterns-opensource-src-5.9.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; + name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix new file mode 100644 index 000000000000..5e9a11d42512 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: + +stdenv.mkDerivation rec { + name = "rapidjson-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "miloyip"; + repo = "rapidjson"; + rev = "v${version}"; + sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index c10a355dee02..001199cd8212 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }: +{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos +, pkgconfig, gnused, expat, openldap, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -8,18 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - buildInputs = [ apr scons openssl aprutil zlib ] - ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos - ++ [ pkgconfig ]; - - configurePhase = '' - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct - ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apr scons openssl aprutil zlib libiconv ] + ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; + + postPatch = '' + sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \ + -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \ + -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \ + -e 's,$OPENSSL/lib,${openssl.out}/lib,' \ + -e 's,$OPENSSL/include,${openssl.dev}/include,' \ + -i SConstruct ''; buildPhase = '' - scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \ + scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \ + LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \ APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 529dee9376a9..b481bd0cf651 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.0"; src = fetchurl { - url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; }; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 1c3952e7adfb..a47eabe5d8d5 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { name = "spdlog-${version}"; - version = stdenv.lib.strings.substring 0 7 rev; - rev = "292bdc5eb4929f183c78d2c67082b715306f81c9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; - inherit rev; - sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn"; + rev = "v${version}"; + sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index e5fffc076f7b..f6a96df3eb61 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.19.2"; + name = "sqlite3_analyzer-3.20.0"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip"; - sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749"; + url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip"; + sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index c122928eddde..2910e8b7dbbc 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -6,11 +6,11 @@ let # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... in stdenv.mkDerivation rec { name = "vigra-${version}"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz"; - sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0"; + sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 6231a59dbd12..7d7424d914de 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.4"; + version = "2.16.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr"; + sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; }; # see if we can clean this up.... diff --git a/pkgs/development/libraries/wvstreams/compile.patch b/pkgs/development/libraries/wvstreams/compile.patch deleted file mode 100644 index c71e7396e918..000000000000 --- a/pkgs/development/libraries/wvstreams/compile.patch +++ /dev/null @@ -1,43 +0,0 @@ -Debian's patch to build with fresher GCC - -Index: wvstreams-4.6.1/crypto/wvx509.cc -=================================================================== ---- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 -+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 -@@ -1157,7 +1157,7 @@ - - if (ext) - { -- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); - if (!method) - { - WvDynBuf buf; -Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc -=================================================================== ---- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 -+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 -@@ -1,8 +1,6 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS - #include <sys/types.h> - #include <sys/stat.h> --#endif - - WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) - : socketfile(filename) -Index: wvstreams-4.6.1/streams/wvatomicfile.cc -=================================================================== ---- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 -+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 -@@ -10,10 +10,7 @@ - #include "wvatomicfile.h" - #include "wvfileutils.h" - #include "wvstrutils.h" -- --#ifdef MACOS - #include <sys/stat.h> --#endif - - WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) - : tmp_file(WvString::null) diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix deleted file mode 100644 index ecfc9b88a0e4..000000000000 --- a/pkgs/development/libraries/wvstreams/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }: - -stdenv.mkDerivation { - name = "wvstreams-4.6.1"; - - src = fetchurl { - url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz; - sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4"; - }; - - patches = [ ./compile.patch ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - - sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc') - ''; - - buildInputs = [ qt4 dbus zlib openssl readline perl ]; - - meta = { - description = "Network programming library in C++"; - homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index d9e84008b31d..9ce8e95d9e94 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.wxWindows; homepage = https://www.wxwidgets.org/; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index a42189331d00..56080841ca3d 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; homepage = https://www.wxwidgets.org/; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 6e33f5580cd6..35300ed9419a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; homepage = https://www.wxwidgets.org/; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 0e2468294397..9c307b2d15ae 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; homepage = https://www.wxwidgets.org/; - description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index d9b478266487..05b545420336 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:05:03.785544 with ADRT.--> + <!--Generated on 2017-07-26 17:22:37.387749 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:path>m2repository</sdk:path> </sdk:extra> <sdk:extra> - <!--Generated from bid:158324354, branch:perforce--> + <!--Generated from bid:163087974, branch:perforce--> <sdk:revision> - <sdk:major>53</sdk:major> + <sdk:major>57</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Wed Jun 7 15:15:19 2017.--> - <sdk:size>194148491</sdk:size> - <sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum> - <sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url> + <!--Built on: Tue Jul 25 14:44:09 2017.--> + <sdk:size>214565802</sdk:size> + <sdk:checksum type="sha1">4bc48d6d4d39944cf2b061e3f618cd9d447c75bb</sdk:checksum> + <sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:path>google_play_services_froyo</sdk:path> </sdk:extra> <sdk:extra> - <!--Generated from bid:158051086, branch:perforce--> + <!--Generated from bid:163088463, branch:perforce--> <sdk:revision> - <sdk:major>41</sdk:major> + <sdk:major>43</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Jun 6 11:50:00 2017.--> - <sdk:size>13165315</sdk:size> - <sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum> - <sdk:url>google_play_services_v11_rc16.zip</sdk:url> + <!--Built on: Tue Jul 25 14:44:00 2017.--> + <sdk:size>21391284</sdk:size> + <sdk:checksum type="sha1">6b072d5b96fb8726405d363ccdbb4d26bec0b54f</sdk:checksum> + <sdk:url>google_play_services_v11_3_rc05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 06be6515ee53..71ce2c3d0792 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -296,8 +296,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip; - sha1 = "55be81c50041f6a8f62947418f74f683369c971f"; + url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip; + sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 7587fb3e0c48..7c4792f560d5 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -11,16 +11,16 @@ let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.3"; + version = "25.2.5"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v"; + sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar"; + sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09d643146ba..c09fd6142703 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "25.0.1"; + version = "26.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7"; + sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki"; + sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a233333986ae..56c810dfc545 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -195,6 +195,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_8_0 = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_8_0_extras = androidsdk { + platformVersions = [ "26" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 6205b98eee15..bc99837d27af 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "25.0.1"; + version = "26.0.0"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx"; + sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln"; + url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; + sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 1caa6cebb14f..e24a9c431602 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a4903cd0d402..3775872514ca 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -307,8 +307,8 @@ in platform_26 = buildPlatform { name = "android-platform-8.0.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r01.zip; - sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; meta = { description = "Android SDK Platform 26"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index 9f46af93a880..6d2c87178a6d 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:04:43.441919 with ADRT.--> + <!--Generated on 2017-07-26 17:22:12.162164 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014.</sdk:license> <sdk:ndk> - <!--Generated from bid:4075724, branch:aosp-ndk-r15-release--> + <!--Generated from bid:4119039, branch:aosp-ndk-r15-release--> <sdk:description>NDK</sdk:description> <sdk:revision>15</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Wed Jun 7 14:50:43 2017.--> - <sdk:size>959176682</sdk:size> - <sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum> - <sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:06:49 2017.--> + <sdk:size>959321525</sdk:size> + <sdk:checksum type="sha1">05e3eec7e9ce1d09bb5401b41cf778a2ec19c819</sdk:checksum> + <sdk:url>android-ndk-r15b-darwin-x86_64.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:51:08 2017.--> - <sdk:size>973898016</sdk:size> - <sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum> - <sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:07:17 2017.--> + <sdk:size>974035125</sdk:size> + <sdk:checksum type="sha1">2690d416e54f88f7fa52d0dcb5f539056a357b3b</sdk:checksum> + <sdk:url>android-ndk-r15b-linux-x86_64.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:49:52 2017.--> - <sdk:size>783705009</sdk:size> - <sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum> - <sdk:url>android-ndk-r15-windows-x86.zip</sdk:url> + <!--Built on: Wed Jun 21 12:05:55 2017.--> + <sdk:size>783838327</sdk:size> + <sdk:checksum type="sha1">74e45891d0cc99b077b3951aeba87d9c91df20a8</sdk:checksum> + <sdk:url>android-ndk-r15b-windows-x86.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> <sdk:host-bits>32</sdk:host-bits> </sdk:archive> <sdk:archive> - <!--Built on: Wed Jun 7 14:50:17 2017.--> - <sdk:size>848657615</sdk:size> - <sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum> - <sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url> + <!--Built on: Wed Jun 21 12:06:20 2017.--> + <sdk:size>848796389</sdk:size> + <sdk:checksum type="sha1">126a1cd8985132c0383ab96579feed09ba402e22</sdk:checksum> + <sdk:url>android-ndk-r15b-windows-x86_64.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> <sdk:host-bits>64</sdk:host-bits> </sdk:archive> @@ -336,17 +336,17 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:ndk> <sdk:platform> - <!--Generated from bid:4062713, branch:git_oc-preview3-sdk--> + <!--Generated from bid:4187382, branch:git_oc-release--> <sdk:version>8.0.0</sdk:version> <sdk:api-level>26</sdk:api-level> <sdk:description>Android SDK Platform 26</sdk:description> - <sdk:revision>1</sdk:revision> + <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jun 2 13:22:35 2017.--> - <sdk:size>63467872</sdk:size> - <sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum> - <sdk:url>platform-26_r01.zip</sdk:url> + <!--Built on: Tue Jul 18 10:38:38 2017.--> + <sdk:size>63623734</sdk:size> + <sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum> + <sdk:url>platform-26_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1170,6 +1170,38 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:source> <sdk:build-tool> + <!--Generated from bid:4187382, branch:git_oc-release--> + <sdk:revision> + <sdk:major>26</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>1</sdk:micro> + </sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:26 2017.--> + <sdk:size>54113329</sdk:size> + <sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum> + <sdk:url>build-tools_r26.0.1-linux.zip</sdk:url> + <sdk:host-os>linux</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:23 2017.--> + <sdk:size>53266653</sdk:size> + <sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum> + <sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url> + <sdk:host-os>macosx</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Jul 18 10:38:21 2017.--> + <sdk:size>54936185</sdk:size> + <sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum> + <sdk:url>build-tools_r26.0.1-windows.zip</sdk:url> + <sdk:host-os>windows</sdk:host-os> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:build-tool> + <sdk:build-tool> <!--Generated from bid:4062713, branch:git_oc-preview3-sdk--> <sdk:revision> <sdk:major>26</sdk:major> diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 84ebee5a75f9..55c1b60e965d 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "40"; + version = "47"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "782e7233f18c890463e8602571d304e680ce354c"; + sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 8ea0cfb5b802..06754b250763 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2017-06-07 21:04:43.770481 with ADRT.--> + <!--Generated on 2017-07-26 17:22:12.517198 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -746,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3462041, branch:git_klp-emu-release--> + <!--Generated from bid:4174703, branch:git_klp-emu-release--> <sdk:api-level>19</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu Nov 10 17:21:38 2016.--> - <sdk:size>183968605</sdk:size> - <sdk:checksum type="sha1">1d98426467580abfd03c724c5344450f5d0df379</sdk:checksum> - <sdk:url>x86-19_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:41:20 2017.--> + <sdk:size>185886274</sdk:size> + <sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum> + <sdk:url>x86-19_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -763,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079185, branch:git_lmp-emu-release--> + <!--Generated from bid:4174711, branch:git_lmp-emu-release--> <sdk:api-level>21</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> + <sdk:revision>5</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:12:20 2016.--> - <sdk:size>206305926</sdk:size> - <sdk:checksum type="sha1">c7732f45c931c0eaa064e57e8c054bce86c30e54</sdk:checksum> - <sdk:url>x86-21_r04.zip</sdk:url> + <!--Built on: Thu Jul 13 12:42:18 2017.--> + <sdk:size>208212529</sdk:size> + <sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum> + <sdk:url>x86-21_r05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -780,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079158, branch:git_lmp-mr1-emu-release--> + <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> <sdk:api-level>22</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:12:40 2016.--> - <sdk:size>212327460</sdk:size> - <sdk:checksum type="sha1">7e2c93891ea9efec07dccccf6b9ab051a014dbdf</sdk:checksum> - <sdk:url>x86-22_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:43:18 2017.--> + <sdk:size>214268954</sdk:size> + <sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum> + <sdk:url>x86-22_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -797,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079352, branch:git_mnc-emu-release--> + <!--Generated from bid:4174734, branch:git_mnc-emu-release--> <sdk:api-level>23</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>9</sdk:revision> + <sdk:revision>10</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:13:52 2016.--> - <sdk:size>260241399</sdk:size> - <sdk:checksum type="sha1">d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1</sdk:checksum> - <sdk:url>x86-23_r09.zip</sdk:url> + <!--Built on: Thu Jul 13 12:44:25 2017.--> + <sdk:size>260804863</sdk:size> + <sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum> + <sdk:url>x86-23_r10.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -814,16 +814,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> + <!--Generated from bid:4174735, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>7</sdk:revision> + <sdk:revision>8</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Sep 6 08:29:27 2016.--> - <sdk:size>302213276</sdk:size> - <sdk:checksum type="sha1">566fdee283a907854bfa3c174265bc31f396eabd</sdk:checksum> - <sdk:url>x86-24_r07.zip</sdk:url> + <!--Built on: Thu Jul 13 12:45:47 2017.--> + <sdk:size>313489224</sdk:size> + <sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum> + <sdk:url>x86-24_r08.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -831,16 +831,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079185, branch:git_lmp-emu-release--> + <!--Generated from bid:4174711, branch:git_lmp-emu-release--> <sdk:api-level>21</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>4</sdk:revision> + <sdk:revision>5</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:08:22 2016.--> - <sdk:size>290608820</sdk:size> - <sdk:checksum type="sha1">9b2d64a69a72fa596c386899a742a404308f2c92</sdk:checksum> - <sdk:url>x86_64-21_r04.zip</sdk:url> + <!--Built on: Thu Jul 13 12:46:57 2017.--> + <sdk:size>292623982</sdk:size> + <sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum> + <sdk:url>x86_64-21_r05.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -848,16 +848,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release--> + <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> <sdk:api-level>22</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>6</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:08:46 2016.--> - <sdk:size>297850561</sdk:size> - <sdk:checksum type="sha1">99d1d6c77e92284b4210640edf6c81eceb28520d</sdk:checksum> - <sdk:url>x86_64-22_r05.zip</sdk:url> + <!--Built on: Thu Jul 13 12:48:15 2017.--> + <sdk:size>299976630</sdk:size> + <sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum> + <sdk:url>x86_64-22_r06.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -865,16 +865,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3079352, branch:git_mnc-emu-release--> + <!--Generated from bid:4174734, branch:git_mnc-emu-release--> <sdk:api-level>23</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>9</sdk:revision> + <sdk:revision>10</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Sep 16 16:09:15 2016.--> - <sdk:size>363794271</sdk:size> - <sdk:checksum type="sha1">84cc076eacec043c8e88382c6ab391b0cd5c0695</sdk:checksum> - <sdk:url>x86_64-23_r09.zip</sdk:url> + <!--Built on: Thu Jul 13 12:49:37 2017.--> + <sdk:size>365009313</sdk:size> + <sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum> + <sdk:url>x86_64-23_r10.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -882,16 +882,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> + <!--Generated from bid:4174735, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>7</sdk:revision> + <sdk:revision>8</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Sep 6 08:29:51 2016.--> - <sdk:size>407148033</sdk:size> - <sdk:checksum type="sha1">a379932395ced0a8f572b39c396d86e08827a9ba</sdk:checksum> - <sdk:url>x86_64-24_r07.zip</sdk:url> + <!--Built on: Thu Jul 13 12:51:15 2017.--> + <sdk:size>419261998</sdk:size> + <sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum> + <sdk:url>x86_64-24_r08.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 89c48e5fb59e..c5d075d63076 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -138,8 +138,8 @@ in sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip; - sha1 = "1d98426467580abfd03c724c5344450f5d0df379"; + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; }; }; @@ -154,16 +154,16 @@ in sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip; - sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54"; + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; }; }; sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip; - sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; }; }; @@ -178,16 +178,16 @@ in sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip; - sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf"; + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; }; }; sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip; - sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; }; }; @@ -202,16 +202,16 @@ in sysimg_x86_23 = buildSystemImage { name = "sysimg-x86-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip; - sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1"; + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; }; }; sysimg_x86_64_23 = buildSystemImage { name = "sysimg-x86_64-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip; - sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; }; }; @@ -234,16 +234,16 @@ in sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; - sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; - sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; }; }; @@ -263,4 +263,4 @@ in }; }; } - + diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index cf699c34e2be..0c9c3e3f42ca 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -21,7 +21,7 @@ let security delete-keychain $keychainName ''; - # On Mac OS X, the java executable shows an -unoffical postfix in the version + # On macOS, the java executable shows an -unoffical postfix in the version # number. This confuses the build script's version detector. # We fix this by creating a wrapper that strips it out of the output. @@ -72,7 +72,7 @@ stdenv.mkDerivation { ${if target == "android" then '' ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' - # Hack to make version detection work with OpenJDK on Mac OS X + # Hack to make version detection work with OpenJDK on macOS export PATH=${javaVersionFixWrapper}/bin:$PATH export JAVA_HOME=${javaVersionFixWrapper} javac -version diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index d22e217efbb5..c8924937cac5 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -787,13 +787,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "resolve-1.3.3" = { + "resolve-1.4.0" = { name = "resolve"; packageName = "resolve"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; - sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; + sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86"; }; }; "detect-file-0.1.0" = { @@ -1210,13 +1210,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "which-1.2.14" = { + "which-1.3.0" = { name = "which"; packageName = "which"; - version = "1.2.14"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a"; }; }; "parse-passwd-1.0.0" = { @@ -2029,13 +2029,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.15" = { + "mime-types-2.1.16" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"; + sha1 = "2b858a52e5ecd516db897ac2be87487830698e23"; }; }; "oauth-sign-0.8.2" = { @@ -2209,13 +2209,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.4.0" = { + "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; "sshpk-1.13.1" = { @@ -2236,13 +2236,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "extsprintf-1.0.2" = { + "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; - version = "1.0.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; "json-schema-0.2.3" = { @@ -2254,13 +2254,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "verror-1.3.6" = { + "verror-1.10.0" = { name = "verror"; packageName = "verror"; - version = "1.3.6"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; "asn1-0.2.3" = { @@ -2326,13 +2326,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.27.0" = { + "mime-db-1.29.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.27.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "punycode-1.4.1" = { @@ -2380,13 +2380,13 @@ let sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; }; }; - "express-4.15.3" = { + "express-4.15.4" = { name = "express"; packageName = "express"; - version = "4.15.3"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; + sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; }; }; "rc-1.2.1" = { @@ -3001,22 +3001,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; - "depd-1.1.0" = { + "depd-1.1.1" = { name = "depd"; packageName = "depd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; "encodeurl-1.0.1" = { @@ -3046,13 +3037,13 @@ let sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-1.0.3" = { + "finalhandler-1.0.4" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz"; - sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; + sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"; }; }; "fresh-0.5.0" = { @@ -3109,13 +3100,22 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.4" = { + "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; - sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + }; + }; + "qs-6.5.0" = { + name = "qs"; + packageName = "qs"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49"; }; }; "range-parser-1.2.0" = { @@ -3127,22 +3127,22 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "send-0.15.3" = { + "send-0.15.4" = { name = "send"; packageName = "send"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; + sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; }; }; - "serve-static-1.12.3" = { + "serve-static-1.12.4" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; + sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; }; }; "setprototypeof-1.0.3" = { @@ -3226,13 +3226,13 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; - "ipaddr.js-1.3.0" = { + "ipaddr.js-1.4.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; - sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; "destroy-1.0.4" = { @@ -3244,13 +3244,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.1" = { + "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; "mime-1.3.4" = { @@ -3334,6 +3334,15 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; + "semver-5.4.1" = { + name = "semver"; + packageName = "semver"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; + }; + }; "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; @@ -3622,13 +3631,13 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; - "libnpx-9.0.7" = { + "libnpx-9.2.3" = { name = "libnpx"; packageName = "libnpx"; - version = "9.0.7"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz"; - sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b"; + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz"; + sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304"; }; }; "lockfile-1.0.3" = { @@ -3955,6 +3964,15 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; + "which-1.2.14" = { + name = "which"; + packageName = "which"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + }; + }; "worker-farm-1.4.1" = { name = "worker-farm"; packageName = "worker-farm"; @@ -4126,13 +4144,13 @@ let sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "os-locale-2.0.0" = { + "os-locale-2.1.0" = { name = "os-locale"; packageName = "os-locale"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; - sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; }; }; "read-pkg-up-2.0.0" = { @@ -4162,13 +4180,13 @@ let sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; - "string-width-2.1.0" = { + "string-width-2.1.1" = { name = "string-width"; packageName = "string-width"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz"; - sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0"; + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; }; "which-module-2.0.0" = { @@ -4189,13 +4207,13 @@ let sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; }; }; - "execa-0.5.1" = { + "execa-0.7.0" = { name = "execa"; packageName = "execa"; - version = "0.5.1"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; - sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; }; }; "mem-1.1.0" = { @@ -4207,22 +4225,22 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "cross-spawn-4.0.2" = { + "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "4.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "get-stream-2.3.1" = { + "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; "is-stream-1.1.0" = { @@ -4261,6 +4279,24 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -4405,13 +4441,13 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; - "duplexify-3.5.0" = { + "duplexify-3.5.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; - sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; + sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd"; }; }; "end-of-stream-1.4.0" = { @@ -4486,15 +4522,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "end-of-stream-1.0.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; - }; - }; "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; @@ -4612,13 +4639,13 @@ let sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-2.0.0" = { + "https-proxy-agent-2.1.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"; - sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; + sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443"; }; }; "node-fetch-npm-2.0.1" = { @@ -4648,13 +4675,13 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-4.1.0" = { + "agent-base-4.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz"; - sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; + sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4"; }; }; "es6-promisify-5.0.0" = { @@ -4810,22 +4837,22 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.2.0" = { + "boxen-1.2.1" = { name = "boxen"; packageName = "boxen"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz"; - sha1 = "03478d84be7fe02189b80904d81d6a80384368f1"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; + sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; }; }; - "configstore-3.1.0" = { + "configstore-3.1.1" = { name = "configstore"; packageName = "configstore"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz"; - sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; }; }; "import-lazy-2.1.0" = { @@ -4882,13 +4909,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "chalk-2.0.1" = { + "chalk-2.1.0" = { name = "chalk"; packageName = "chalk"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; - sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"; }; }; "cli-boxes-1.0.0" = { @@ -4918,22 +4945,22 @@ let sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; }; }; - "ansi-styles-3.1.0" = { + "ansi-styles-3.2.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; - sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88"; }; }; - "supports-color-4.2.0" = { + "supports-color-4.2.1" = { name = "supports-color"; packageName = "supports-color"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; - sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"; + sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836"; }; }; "color-convert-1.9.0" = { @@ -4945,13 +4972,13 @@ let sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-name-1.1.2" = { + "color-name-1.1.3" = { name = "color-name"; packageName = "color-name"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; "has-flag-2.0.0" = { @@ -4963,58 +4990,13 @@ let sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; - "dot-prop-4.1.1" = { + "dot-prop-4.2.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; - sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; }; "make-dir-1.0.0" = { @@ -5725,10 +5707,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; buildInputs = globalBuildInputs; meta = { @@ -6039,7 +6021,7 @@ in ]; }) sources."ini-1.3.4" - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -6121,7 +6103,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - (sources."resolve-1.3.3" // { + (sources."resolve-1.4.0" // { dependencies = [ sources."path-parse-1.0.5" ]; @@ -6417,12 +6399,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -6442,9 +6428,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -6469,7 +6455,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -6678,13 +6664,13 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.15.3" // { + (sources."express-4.15.4" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."negotiator-0.6.1" @@ -6695,16 +6681,11 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."debug-2.6.7" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { + (sources."finalhandler-1.0.4" // { dependencies = [ sources."unpipe-1.0.0" ]; @@ -6719,18 +6700,18 @@ in }) sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - (sources."proxy-addr-1.1.4" // { + (sources."proxy-addr-1.1.5" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" ]; }) - sources."qs-6.4.0" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { + (sources."send-0.15.4" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.6.1" // { + (sources."http-errors-1.6.2" // { dependencies = [ sources."inherits-2.0.3" ]; @@ -6739,15 +6720,15 @@ in sources."ms-2.0.0" ]; }) - sources."serve-static-1.12.3" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) ]; @@ -6915,12 +6896,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -6940,9 +6925,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -6989,7 +6974,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7157,12 +7142,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -7182,9 +7171,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -7231,7 +7220,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7289,7 +7278,7 @@ in }) ]; }) - (sources."which-1.2.14" // { + (sources."which-1.3.0" // { dependencies = [ sources."isexe-2.0.0" ]; @@ -7472,12 +7461,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -7497,9 +7490,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -7547,7 +7540,7 @@ in }) ]; }) - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7618,10 +7611,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz"; - sha1 = "0014eb05ead6870587fa1c068108935c898e9847"; + url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz"; + sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7725,7 +7718,7 @@ in ]; }) sources."lazy-property-1.0.0" - (sources."libnpx-9.0.7" // { + (sources."libnpx-9.2.3" // { dependencies = [ sources."dotenv-4.0.0" sources."y18n-3.2.1" @@ -7754,21 +7747,20 @@ in }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - (sources."os-locale-2.0.0" // { + (sources."os-locale-2.1.0" // { dependencies = [ - (sources."execa-0.5.1" // { + (sources."execa-0.7.0" // { dependencies = [ - sources."cross-spawn-4.0.2" - (sources."get-stream-2.3.1" // { + (sources."cross-spawn-5.1.0" // { dependencies = [ - sources."object-assign-4.1.1" - (sources."pinkie-promise-2.0.1" // { + (sources."shebang-command-1.2.0" // { dependencies = [ - sources."pinkie-2.0.4" + sources."shebang-regex-1.0.0" ]; }) ]; }) + sources."get-stream-3.0.0" sources."is-stream-1.1.0" (sources."npm-run-path-2.0.2" // { dependencies = [ @@ -7837,7 +7829,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."set-blocking-2.0.0" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; @@ -7872,13 +7864,8 @@ in sources."typedarray-0.0.6" ]; }) - (sources."duplexify-3.5.0" // { + (sources."duplexify-3.5.1" // { dependencies = [ - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) sources."stream-shift-1.0.0" ]; }) @@ -8010,7 +7997,7 @@ in sources."http-cache-semantics-3.7.3" (sources."http-proxy-agent-2.0.0" // { dependencies = [ - (sources."agent-base-4.1.0" // { + (sources."agent-base-4.1.1" // { dependencies = [ (sources."es6-promisify-5.0.0" // { dependencies = [ @@ -8026,9 +8013,9 @@ in }) ]; }) - (sources."https-proxy-agent-2.0.0" // { + (sources."https-proxy-agent-2.1.0" // { dependencies = [ - (sources."agent-base-4.1.0" // { + (sources."agent-base-4.1.1" // { dependencies = [ (sources."es6-promisify-5.0.0" // { dependencies = [ @@ -8060,7 +8047,7 @@ in }) (sources."socks-proxy-agent-3.0.0" // { dependencies = [ - (sources."agent-base-4.1.0" // { + (sources."agent-base-4.1.1" // { dependencies = [ (sources."es6-promisify-5.0.0" // { dependencies = [ @@ -8193,12 +8180,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -8218,9 +8209,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" @@ -8280,23 +8271,23 @@ in sources."unpipe-1.0.0" (sources."update-notifier-2.2.0" // { dependencies = [ - (sources."boxen-1.2.0" // { + (sources."boxen-1.2.1" // { dependencies = [ sources."ansi-align-2.0.0" sources."camelcase-4.1.0" - (sources."chalk-2.0.1" // { + (sources."chalk-2.1.0" // { dependencies = [ - (sources."ansi-styles-3.1.0" // { + (sources."ansi-styles-3.2.0" // { dependencies = [ (sources."color-convert-1.9.0" // { dependencies = [ - sources."color-name-1.1.2" + sources."color-name-1.1.3" ]; }) ]; }) sources."escape-string-regexp-1.0.5" - (sources."supports-color-4.2.0" // { + (sources."supports-color-4.2.1" // { dependencies = [ sources."has-flag-2.0.0" ]; @@ -8304,7 +8295,7 @@ in ]; }) sources."cli-boxes-1.0.0" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; @@ -8374,9 +8365,9 @@ in sources."supports-color-2.0.0" ]; }) - (sources."configstore-3.1.0" // { + (sources."configstore-3.1.1" // { dependencies = [ - (sources."dot-prop-4.1.1" // { + (sources."dot-prop-4.2.0" // { dependencies = [ sources."is-obj-1.0.1" ]; @@ -8675,12 +8666,16 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) ]; }) (sources."sshpk-1.13.1" // { @@ -8700,9 +8695,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { + (sources."mime-types-2.1.16" // { dependencies = [ - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; }) sources."oauth-sign-0.8.2" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index b50b47ac0a93..10ab75e3dca4 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -33,11 +33,14 @@ , "jshint" , "json" , "js-beautify" +, "jsonlint" , "jsontool" +, "json-refs" , "json-server" , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } +, "lerna" , "lcov-result-merger" , "meat" , "mocha" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 31e5dddd6fdb..bff856d910de 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -76,13 +76,13 @@ let sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "resolve-1.3.3" = { + "resolve-1.4.0" = { name = "resolve"; packageName = "resolve"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; - sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; + sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86"; }; }; "global-paths-0.1.2" = { @@ -418,13 +418,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "which-1.2.14" = { + "which-1.3.0" = { name = "which"; packageName = "which"; - version = "1.2.14"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; + sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a"; }; }; "parse-passwd-1.0.0" = { @@ -1012,13 +1012,13 @@ let sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377"; }; }; - "ms-rest-azure-2.2.1" = { + "ms-rest-azure-2.2.3" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz"; - sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.3.tgz"; + sha1 = "a11fc443b276ee26adbd159b2c5b2107d6197266"; }; }; "node-forge-0.6.23" = { @@ -1615,13 +1615,13 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-7.0.37" = { + "@types/node-7.0.39" = { name = "@types/node"; packageName = "@types/node"; - version = "7.0.37"; + version = "7.0.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.37.tgz"; - sha1 = "f129fff94d14a60c3d99eadb9fe0c98119e09c8f"; + url = "https://registry.npmjs.org/@types/node/-/node-7.0.39.tgz"; + sha1 = "8aced4196387038113f6f9aa4014ab4c51edab3c"; }; }; "@types/request-0.0.45" = { @@ -1651,13 +1651,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "@types/form-data-0.0.33" = { + "@types/form-data-2.2.0" = { name = "@types/form-data"; packageName = "@types/form-data"; - version = "0.0.33"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; - sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz"; + sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565"; }; }; "debug-0.7.4" = { @@ -2020,13 +2020,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.15" = { + "mime-types-2.1.16" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"; + sha1 = "2b858a52e5ecd516db897ac2be87487830698e23"; }; }; "oauth-sign-0.8.2" = { @@ -2290,13 +2290,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.4.0" = { + "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; "sshpk-1.13.1" = { @@ -2317,13 +2317,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "extsprintf-1.0.2" = { + "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; - version = "1.0.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; "json-schema-0.2.3" = { @@ -2335,13 +2335,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "verror-1.3.6" = { + "verror-1.10.0" = { name = "verror"; packageName = "verror"; - version = "1.3.6"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; "asn1-0.2.3" = { @@ -2407,13 +2407,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.27.0" = { + "mime-db-1.29.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.27.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "punycode-1.4.1" = { @@ -2659,13 +2659,13 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "semver-5.3.0" = { + "semver-5.4.1" = { name = "semver"; packageName = "semver"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; }; }; "temp-0.8.3" = { @@ -2767,15 +2767,6 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "mime-db-1.29.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.29.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; - sha1 = "48d26d235589651704ac5916ca06001914266878"; - }; - }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -3253,13 +3244,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.6" = { + "buffer-5.0.7" = { name = "buffer"; packageName = "buffer"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; - sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz"; + sha1 = "570a290b625cf2603290c1149223d27ccf04db97"; }; }; "cached-path-relative-1.0.1" = { @@ -3730,13 +3721,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.12" = { + "pbkdf2-3.0.13" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz"; - sha1 = "be36785c5067ea48d806ff923288c5f750b6b8a2"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz"; + sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25"; }; }; "public-encrypt-4.0.0" = { @@ -3820,13 +3811,13 @@ let sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; }; }; - "bn.js-4.11.7" = { + "bn.js-4.11.8" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.7"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz"; - sha1 = "ddb048e50d9482790094c13eb3fcfc833ce7ab46"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; }; }; "browserify-rsa-4.0.1" = { @@ -5674,22 +5665,22 @@ let sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; }; }; - "voc-0.5.0" = { + "voc-1.0.0" = { name = "voc"; packageName = "voc"; - version = "0.5.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-0.5.0.tgz"; - sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; + url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; + sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae"; }; }; - "exit-on-epipe-1.0.0" = { + "exit-on-epipe-1.0.1" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz"; - sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; }; }; "sax-1.2.4" = { @@ -6097,6 +6088,15 @@ let sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; "shelljs-0.3.0" = { name = "shelljs"; packageName = "shelljs"; @@ -6277,13 +6277,13 @@ let sha1 = "030c9f198f1643a057d776a738e922da4373012d"; }; }; - "express-4.15.3" = { + "express-4.15.4" = { name = "express"; packageName = "express"; - version = "4.15.3"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz"; + sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1"; }; }; "accepts-1.3.3" = { @@ -6304,13 +6304,13 @@ let sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; }; }; - "compressible-2.0.10" = { + "compressible-2.0.11" = { name = "compressible"; packageName = "compressible"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; - sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz"; + sha1 = "16718a75de283ed8e604041625a2064586797d8a"; }; }; "on-headers-1.0.1" = { @@ -6385,22 +6385,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; - }; - }; - "depd-1.1.0" = { + "depd-1.1.1" = { name = "depd"; packageName = "depd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; "encodeurl-1.0.1" = { @@ -6430,13 +6421,13 @@ let sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-1.0.3" = { + "finalhandler-1.0.4" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz"; - sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz"; + sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"; }; }; "fresh-0.5.0" = { @@ -6493,40 +6484,40 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.4" = { + "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; - sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "qs-6.4.0" = { + "qs-6.5.0" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49"; }; }; - "send-0.15.3" = { + "send-0.15.4" = { name = "send"; packageName = "send"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz"; + sha1 = "985faa3e284b0273c793364a35c6737bd93905b9"; }; }; - "serve-static-1.12.3" = { + "serve-static-1.12.4" = { name = "serve-static"; packageName = "serve-static"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz"; + sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"; }; }; "setprototypeof-1.0.3" = { @@ -6592,15 +6583,6 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; - "ipaddr.js-1.3.0" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; - sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; - }; - }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -6610,13 +6592,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.6.1" = { + "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; "mime-1.3.4" = { @@ -7132,6 +7114,15 @@ let sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; }; }; + "which-1.2.14" = { + name = "which"; + packageName = "which"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; + }; + }; "write-file-atomic-1.1.4" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -7636,13 +7627,13 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; - "duplexify-3.5.0" = { + "duplexify-3.5.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; - sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; + sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd"; }; }; "infinity-agent-2.0.3" = { @@ -7717,6 +7708,15 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; + "end-of-stream-1.4.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; + sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; + }; + }; "stream-shift-1.0.0" = { name = "stream-shift"; packageName = "stream-shift"; @@ -8159,13 +8159,13 @@ let sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; - "bindings-1.2.1" = { + "bindings-1.3.0" = { name = "bindings"; packageName = "bindings"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; + sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"; }; }; "nan-2.6.2" = { @@ -8306,24 +8306,6 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -8441,15 +8423,6 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "end-of-stream-1.4.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; - sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; - }; - }; "from2-1.3.0" = { name = "from2"; packageName = "from2"; @@ -8855,6 +8828,15 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "nan-2.1.0" = { name = "nan"; packageName = "nan"; @@ -8918,13 +8900,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.85.0" = { + "aws-sdk-2.95.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.85.0"; + version = "2.95.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.85.0.tgz"; - sha1 = "e3860761c9a2f8a9017461ab7f3bd075f69dfa8f"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.95.0.tgz"; + sha1 = "26e21db149443b1f063949dc87984f0d17700e6a"; }; }; "request-2.81.0" = { @@ -8999,6 +8981,15 @@ let sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -9044,13 +9035,22 @@ let sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "clipboardy-0.1.2" = { + "auto-bind-1.1.0" = { + name = "auto-bind"; + packageName = "auto-bind"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz"; + sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961"; + }; + }; + "clipboardy-1.1.4" = { name = "clipboardy"; packageName = "clipboardy"; - version = "0.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz"; - sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.1.4.tgz"; + sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee"; }; }; "conf-1.1.2" = { @@ -9062,13 +9062,49 @@ let sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50"; }; }; - "got-6.7.1" = { + "got-7.1.0" = { name = "got"; packageName = "got"; - version = "6.7.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; + sha1 = "05450fd84094e6bbea56f451a43a9c289166385a"; + }; + }; + "has-ansi-3.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; + sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; + }; + }; + "import-jsx-1.3.0" = { + name = "import-jsx"; + packageName = "import-jsx"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; + sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb"; + }; + }; + "ink-0.3.1" = { + name = "ink"; + packageName = "ink"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; + sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213"; + }; + }; + "ink-text-input-1.1.0" = { + name = "ink-text-input"; + packageName = "ink-text-input"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz"; + sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1"; }; }; "lodash.debounce-4.0.8" = { @@ -9080,15 +9116,6 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; - }; - }; "mem-1.1.0" = { name = "mem"; packageName = "mem"; @@ -9107,31 +9134,31 @@ let sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; }; }; - "execa-0.5.1" = { + "execa-0.6.3" = { name = "execa"; packageName = "execa"; - version = "0.5.1"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; - sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; }; }; - "cross-spawn-4.0.2" = { + "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "4.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "get-stream-2.3.1" = { + "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; "npm-run-path-2.0.2" = { @@ -9170,6 +9197,24 @@ let sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -9179,13 +9224,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "dot-prop-4.1.1" = { + "dot-prop-4.2.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; - sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; }; "env-paths-1.0.0" = { @@ -9260,13 +9305,13 @@ let sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; "duplexer3-0.1.4" = { @@ -9278,15 +9323,6 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "is-retry-allowed-1.1.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -9296,6 +9332,33 @@ let sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"; + }; + }; + "p-cancelable-0.3.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa"; + }; + }; + "p-timeout-1.2.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz"; + sha1 = "9820f99434c5817868b4f34809ee5291660d5b6c"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -9314,13 +9377,562 @@ let sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; }; }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "mimic-response-1.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + }; + }; + "has-to-string-tag-x-1.4.0" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz"; + sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "has-symbol-support-x-1.4.0" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz"; + sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "babel-core-6.25.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz"; + sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729"; + }; + }; + "babel-plugin-transform-es2015-destructuring-6.23.0" = { + name = "babel-plugin-transform-es2015-destructuring"; + packageName = "babel-plugin-transform-es2015-destructuring"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; + }; + }; + "babel-plugin-transform-object-rest-spread-6.23.0" = { + name = "babel-plugin-transform-object-rest-spread"; + packageName = "babel-plugin-transform-object-rest-spread"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz"; + sha1 = "875d6bc9be761c58a2ae3feee5dc4895d8c7f921"; + }; + }; + "babel-plugin-transform-react-jsx-6.24.1" = { + name = "babel-plugin-transform-react-jsx"; + packageName = "babel-plugin-transform-react-jsx"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; + sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "require-from-string-1.2.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; + sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "babel-code-frame-6.22.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; + sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; + }; + }; + "babel-generator-6.25.0" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz"; + sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"; + }; + }; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + }; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + }; + "babel-template-6.25.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz"; + sha1 = "665241166b7c2aa4c619d71e192969552b10c071"; + }; + }; + "babel-runtime-6.25.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz"; + sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"; + }; + }; + "babel-register-6.24.1" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz"; + sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f"; + }; + }; + "babel-traverse-6.25.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz"; + sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1"; + }; + }; + "babel-types-6.25.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz"; + sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e"; + }; + }; + "babylon-6.17.4" = { + name = "babylon"; + packageName = "babylon"; + version = "6.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz"; + sha1 = "3e8b7402b88d22c3423e137a1577883b15ff869a"; + }; + }; + "convert-source-map-1.5.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "private-0.1.7" = { + name = "private"; + packageName = "private"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; + }; + }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + }; + "trim-right-1.0.1" = { + name = "trim-right"; + packageName = "trim-right"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + }; + "core-js-2.5.0" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz"; + sha1 = "569c050918be6486b3837552028ae0466b717086"; + }; + }; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + }; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + }; + "source-map-support-0.4.15" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz"; + sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1"; + }; + }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + }; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + }; + }; + "to-fast-properties-1.0.3" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + }; + "babel-plugin-syntax-object-rest-spread-6.13.0" = { + name = "babel-plugin-syntax-object-rest-spread"; + packageName = "babel-plugin-syntax-object-rest-spread"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; + }; + }; + "babel-helper-builder-react-jsx-6.24.1" = { + name = "babel-helper-builder-react-jsx"; + packageName = "babel-helper-builder-react-jsx"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz"; + sha1 = "0ad7917e33c8d751e646daca4e77cc19377d2cbc"; + }; + }; + "babel-plugin-syntax-jsx-6.18.0" = { + name = "babel-plugin-syntax-jsx"; + packageName = "babel-plugin-syntax-jsx"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "log-update-2.1.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-2.1.0.tgz"; + sha1 = "ea37258b5354edb02e73b29190016c87d1c87141"; + }; + }; + "prop-types-15.5.10" = { + name = "prop-types"; + packageName = "prop-types"; + version = "15.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz"; + sha1 = "2797dfc3126182e3a95e3dfbb2e893ddd7456154"; + }; + }; + "ansi-styles-3.2.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88"; + }; + }; + "supports-color-4.2.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz"; + sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "ansi-escapes-2.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; + sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; "mimic-fn-1.1.0" = { @@ -9332,6 +9944,114 @@ let sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; }; }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "fbjs-0.8.14" = { + name = "fbjs"; + packageName = "fbjs"; + version = "0.8.14"; + src = fetchurl { + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz"; + sha1 = "d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"; + }; + }; + "core-js-1.2.7" = { + name = "core-js"; + packageName = "core-js"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; + sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; + }; + }; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "ua-parser-js-0.7.14" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.14"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz"; + sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca"; + }; + }; + "node-fetch-1.7.2" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz"; + sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7"; + }; + }; + "whatwg-fetch-2.0.3" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "iconv-lite-0.4.18" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; + sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; + }; + }; "unicode-emoji-modifier-base-1.0.0" = { name = "unicode-emoji-modifier-base"; packageName = "unicode-emoji-modifier-base"; @@ -9350,15 +10070,6 @@ let sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; }; }; - "babel-code-frame-6.22.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; - sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; - }; - }; "doctrine-2.0.0" = { name = "doctrine"; packageName = "doctrine"; @@ -9377,13 +10088,13 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "espree-3.4.3" = { + "espree-3.5.0" = { name = "espree"; packageName = "espree"; - version = "3.4.3"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz"; - sha1 = "2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz"; + sha1 = "98358625bdd055861ea27e2867ea729faf463d8d"; }; }; "esquery-1.0.0" = { @@ -9404,15 +10115,6 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -9422,13 +10124,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; "ignore-3.3.3" = { @@ -9440,13 +10142,13 @@ let sha1 = "432352e57accd87ab3110e82d3fea0e47812156d"; }; }; - "inquirer-3.2.0" = { + "inquirer-3.2.1" = { name = "inquirer"; packageName = "inquirer"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz"; - sha1 = "45b44c2160c729d7578c54060b3eed94487bb42b"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz"; + sha1 = "06ceb0f540f45ca548c17d6840959878265fa175"; }; }; "is-resolvable-1.0.0" = { @@ -9458,13 +10160,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.9.0" = { + "js-yaml-3.9.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; - sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; + sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0"; }; }; "levn-0.3.0" = { @@ -9548,15 +10250,6 @@ let sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "js-tokens-3.0.2" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; - }; - }; "esrecurse-4.2.0" = { name = "esrecurse"; packageName = "esrecurse"; @@ -9593,13 +10286,13 @@ let sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; }; }; - "circular-json-0.3.1" = { + "circular-json-0.3.3" = { name = "circular-json"; packageName = "circular-json"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz"; - sha1 = "be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; + sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; }; }; "del-2.2.2" = { @@ -9656,15 +10349,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -9683,33 +10367,6 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; - "ansi-escapes-2.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; - sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; - }; - }; - "chalk-2.0.1" = { - name = "chalk"; - packageName = "chalk"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; - sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; "cli-width-2.1.0" = { name = "cli-width"; packageName = "cli-width"; @@ -9764,103 +10421,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "string-width-2.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz"; - sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "ansi-styles-3.1.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; - sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; - }; - }; - "supports-color-4.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; - sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037"; - }; - }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; - }; - }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "iconv-lite-0.4.18" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.18"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; - sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; - }; - }; - "jschardet-1.4.2" = { + "jschardet-1.5.1" = { name = "jschardet"; packageName = "jschardet"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"; - sha1 = "2aa107f142af4121d145659d44f50830961e699a"; + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz"; + sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9"; }; }; "tmp-0.0.31" = { @@ -9881,24 +10448,6 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; "tryit-1.0.3" = { name = "tryit"; packageName = "tryit"; @@ -10016,13 +10565,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "eslint-4.2.0" = { + "eslint-4.4.1" = { name = "eslint"; packageName = "eslint"; - version = "4.2.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz"; - sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz"; + sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3"; }; }; "supports-color-3.2.3" = { @@ -10043,6 +10592,15 @@ let sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; "ora-1.3.0" = { name = "ora"; packageName = "ora"; @@ -10385,13 +10943,13 @@ let sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }; }; - "anymatch-1.3.0" = { + "anymatch-1.3.2" = { name = "anymatch"; packageName = "anymatch"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"; - sha1 = "a3e52fa39168c825ff57b0248126ce5a8ff95507"; + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; }; }; "async-each-1.0.1" = { @@ -10457,6 +11015,15 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -10511,15 +11078,6 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "normalize-path-2.1.1" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; - }; - }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -10646,15 +11204,6 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "remove-trailing-separator-1.0.2" = { - name = "remove-trailing-separator"; - packageName = "remove-trailing-separator"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; - sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; - }; - }; "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; @@ -10718,13 +11267,22 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "binary-extensions-1.8.0" = { + "remove-trailing-separator-1.0.2" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; + sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; + }; + }; + "binary-extensions-1.9.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"; - sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz"; + sha1 = "66506c16ce6f4d6928a5b3cd6a33ca41e941e37b"; }; }; "set-immediate-shim-1.0.1" = { @@ -10916,13 +11474,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.73.0" = { + "simple-git-1.75.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.73.0"; + version = "1.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz"; - sha1 = "87683a729b1bee016a3182f95a2ab72317bb0230"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.75.0.tgz"; + sha1 = "eaddc90118b40a1dca3837d51c50ac064ee1d288"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10962,13 +11520,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.6" = { + "coffee-script-1.12.7" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; }; "jade-1.11.0" = { @@ -12240,13 +12798,13 @@ let sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116"; }; }; - "chai-4.1.0" = { + "chai-4.1.1" = { name = "chai"; packageName = "chai"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.1.0.tgz"; - sha1 = "331a0391b55c3af8740ae9c3b7458bc1c3805e6d"; + url = "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz"; + sha1 = "66e21279e6f3c6415ff8231878227900e2171b39"; }; }; "chai-as-promised-7.1.1" = { @@ -12258,13 +12816,13 @@ let sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0"; }; }; - "fast-json-patch-2.0.3" = { + "fast-json-patch-2.0.4" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.3.tgz"; - sha1 = "d17ab0b94d742ec200bef297a378b57368a47f09"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.4.tgz"; + sha1 = "6aa2b2918ff6f5a16daddf2745547a9ccf36a9fb"; }; }; "iterare-0.0.8" = { @@ -12501,6 +13059,96 @@ let sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; }; }; + "graphlib-2.1.1" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; + sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; + }; + }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; + "path-loader-1.0.2" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.2.tgz"; + sha1 = "cd5c73e7e39a91011be148d6bfdd8a85bb931ef9"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "superagent-3.5.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; + sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "form-data-2.2.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz"; + sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b"; + }; + }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + }; + }; "body-parser-1.17.2" = { name = "body-parser"; packageName = "body-parser"; @@ -12573,13 +13221,13 @@ let sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687"; }; }; - "please-upgrade-node-1.0.1" = { + "please-upgrade-node-3.0.1" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "1.0.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-1.0.1.tgz"; - sha1 = "f92dd3443d9797f5742510ea2fd205f811b3b1f7"; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; + sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; }; }; "pluralize-3.1.0" = { @@ -12636,6 +13284,15 @@ let sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; }; }; + "debug-2.6.7" = { + name = "debug"; + packageName = "debug"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; + sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + }; + }; "iconv-lite-0.4.15" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -12762,6 +13419,15 @@ let sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; }; }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; "node-status-codes-1.0.0" = { name = "node-status-codes"; packageName = "node-status-codes"; @@ -12789,6 +13455,15 @@ let sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; }; }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "camelcase-3.0.0" = { name = "camelcase"; packageName = "camelcase"; @@ -12906,22 +13581,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.6.2" = { + "connect-3.6.3" = { name = "connect"; packageName = "connect"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz"; - sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7"; - }; - }; - "core-js-2.4.1" = { - name = "core-js"; - packageName = "core-js"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"; - sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz"; + sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301"; }; }; "di-0.0.1" = { @@ -13248,15 +13914,6 @@ let sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; "engine.io-client-1.8.3" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -13896,6 +14553,627 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "command-join-2.0.0" = { + name = "command-join"; + packageName = "command-join"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; + sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; + }; + }; + "conventional-changelog-cli-1.3.2" = { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz"; + sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125"; + }; + }; + "conventional-recommended-bump-1.0.1" = { + name = "conventional-recommended-bump"; + packageName = "conventional-recommended-bump"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz"; + sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c"; + }; + }; + "dedent-0.7.0" = { + name = "dedent"; + packageName = "dedent"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + }; + }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; + "get-port-3.1.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-3.1.0.tgz"; + sha1 = "ef01b18a84ca6486970ff99e54446141a73ffd3e"; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "is-ci-1.0.10" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; + sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "read-cmd-shim-1.0.1" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "strong-log-transformer-1.0.6" = { + name = "strong-log-transformer"; + packageName = "strong-log-transformer"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; + sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + }; + }; + "temp-write-3.3.0" = { + name = "temp-write"; + packageName = "temp-write"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; + sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + }; + }; + "write-file-atomic-2.1.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha1 = "1769f4b551eedce419f0505deae2e26763542d37"; + }; + }; + "write-json-file-2.2.0" = { + name = "write-json-file"; + packageName = "write-json-file"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz"; + sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876"; + }; + }; + "write-pkg-3.1.0" = { + name = "write-pkg"; + packageName = "write-pkg"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; + sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "add-stream-1.0.0" = { + name = "add-stream"; + packageName = "add-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; + sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + }; + }; + "conventional-changelog-1.1.4" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz"; + sha1 = "108bc750c2a317e200e2f9b413caaa1f8c7efa3b"; + }; + }; + "tempfile-1.1.1" = { + name = "tempfile"; + packageName = "tempfile"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; + sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + }; + }; + "conventional-changelog-angular-1.4.0" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz"; + sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b"; + }; + }; + "conventional-changelog-atom-0.1.1" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz"; + sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f"; + }; + }; + "conventional-changelog-codemirror-0.1.0" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz"; + sha1 = "7577a591dbf9b538e7a150a7ee62f65a2872b334"; + }; + }; + "conventional-changelog-core-1.9.0" = { + name = "conventional-changelog-core"; + packageName = "conventional-changelog-core"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz"; + sha1 = "de5dfbc091847656508d4a389e35c9a1bc49e7f4"; + }; + }; + "conventional-changelog-ember-0.2.6" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz"; + sha1 = "8b7355419f5127493c4c562473ab2fc792f1c2b6"; + }; + }; + "conventional-changelog-eslint-0.1.0" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz"; + sha1 = "a52411e999e0501ce500b856b0a643d0330907e2"; + }; + }; + "conventional-changelog-express-0.1.0" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz"; + sha1 = "55c6c841c811962036c037bdbd964a54ae310fce"; + }; + }; + "conventional-changelog-jquery-0.1.0" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; + sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; + }; + }; + "conventional-changelog-jscs-0.1.0" = { + name = "conventional-changelog-jscs"; + packageName = "conventional-changelog-jscs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; + sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; + }; + }; + "conventional-changelog-jshint-0.1.0" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz"; + sha1 = "00cab8e9a3317487abd94c4d84671342918d2a07"; + }; + }; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + }; + }; + "github-url-from-git-1.5.0" = { + name = "github-url-from-git"; + packageName = "github-url-from-git"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz"; + sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + }; + }; + "conventional-changelog-writer-1.4.1" = { + name = "conventional-changelog-writer"; + packageName = "conventional-changelog-writer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz"; + sha1 = "3f4cb4d003ebb56989d30d345893b52a43639c8e"; + }; + }; + "conventional-commits-parser-1.3.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz"; + sha1 = "e327b53194e1a7ad5dc63479ee9099a52b024865"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "get-pkg-repo-1.4.0" = { + name = "get-pkg-repo"; + packageName = "get-pkg-repo"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz"; + sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; + }; + }; + "git-raw-commits-1.2.0" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz"; + sha1 = "0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"; + }; + }; + "git-remote-origin-url-2.0.0" = { + name = "git-remote-origin-url"; + packageName = "git-remote-origin-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"; + sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; + }; + }; + "git-semver-tags-1.2.1" = { + name = "git-semver-tags"; + packageName = "git-semver-tags"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz"; + sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490"; + }; + }; + "conventional-commits-filter-1.0.0" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz"; + sha1 = "6fc2a659372bc3f2339cf9ffff7e1b0344b93039"; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + }; + }; + "is-subset-0.1.1" = { + name = "is-subset"; + packageName = "is-subset"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; + }; + }; + "modify-values-1.0.0" = { + name = "modify-values"; + packageName = "modify-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; + sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + }; + }; + "is-text-path-1.0.1" = { + name = "is-text-path"; + packageName = "is-text-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + }; + }; + "trim-off-newlines-1.0.1" = { + name = "trim-off-newlines"; + packageName = "trim-off-newlines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; + sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + }; + }; + "text-extensions-1.5.0" = { + name = "text-extensions"; + packageName = "text-extensions"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz"; + sha1 = "d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"; + }; + }; + "parse-github-repo-url-1.4.0" = { + name = "parse-github-repo-url"; + packageName = "parse-github-repo-url"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz"; + sha1 = "286c53e2c9962e0641649ee3ac9508fca4dd959c"; + }; + }; + "dargs-4.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; + sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; + }; + }; + "lodash.template-4.4.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; + sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + }; + }; + "lodash.templatesettings-4.1.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; + sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + }; + }; + "gitconfiglocal-1.0.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"; + sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; + }; + }; + "conventional-commits-parser-2.0.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz"; + sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "universalify-0.1.1" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; + sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + }; + }; + "ci-info-1.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; + sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + }; + "minimist-0.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + }; + }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; "vinyl-1.2.0" = { name = "vinyl"; packageName = "vinyl"; @@ -13950,15 +15228,6 @@ let sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; }; }; - "lodash.isequal-4.5.0" = { - name = "lodash.isequal"; - packageName = "lodash.isequal"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; - }; - }; "merge-stream-1.0.1" = { name = "merge-stream"; packageName = "merge-stream"; @@ -14067,15 +15336,6 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "convert-source-map-1.5.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; - }; - }; "express-2.5.11" = { name = "express"; packageName = "express"; @@ -14211,15 +15471,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "debug-2.6.0" = { - name = "debug"; - packageName = "debug"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - }; "diff-3.2.0" = { name = "diff"; packageName = "diff"; @@ -14715,6 +15966,24 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; + "express-4.15.3" = { + name = "express"; + packageName = "express"; + version = "4.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; + sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + }; + }; + "express-session-1.15.2" = { + name = "express-session"; + packageName = "express-session"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; + }; + }; "follow-redirects-1.2.4" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -14868,13 +16137,13 @@ let sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; }; }; - "node-red-node-email-0.1.23" = { + "node-red-node-email-0.1.24" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.23"; + version = "0.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.23.tgz"; - sha1 = "ff910b8abb34ac926c1228e082d7667f92bb3737"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; + sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; }; }; "node-red-node-twitter-0.1.11" = { @@ -15075,6 +16344,51 @@ let sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; + "send-0.15.3" = { + name = "send"; + packageName = "send"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; + sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + }; + }; + "serve-static-1.12.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; + sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + }; + }; + "crc-3.4.4" = { + name = "crc"; + packageName = "crc"; + version = "3.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + }; + }; + "debug-2.6.3" = { + name = "debug"; + packageName = "debug"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + }; + }; + "uid-safe-2.1.5" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; + sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -15165,13 +16479,13 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "websocket-stream-5.0.0" = { + "websocket-stream-5.0.1" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.0.tgz"; - sha1 = "1d1318f0576ce20a12555372108ae9418a403634"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz"; + sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700"; }; }; "leven-1.0.2" = { @@ -15228,13 +16542,13 @@ let sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; }; }; - "ws-3.0.0" = { + "ws-3.1.0" = { name = "ws"; packageName = "ws"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz"; - sha1 = "98ddb00056c8390cb751e7788788497f99103b6c"; + url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz"; + sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c"; }; }; "append-field-0.1.0" = { @@ -15462,15 +16776,6 @@ let sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; "uue-3.1.0" = { name = "uue"; packageName = "uue"; @@ -15822,6 +17127,15 @@ let sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }; }; + "debug-3.0.0" = { + name = "debug"; + packageName = "debug"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.0.0.tgz"; + sha1 = "1d2feae53349047b08b264ec41906ba17a8516e4"; + }; + }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -16164,15 +17478,6 @@ let sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; "fstream-npm-1.2.1" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -16191,13 +17496,13 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; - "libnpx-9.2.0" = { + "libnpx-9.2.3" = { name = "libnpx"; packageName = "libnpx"; - version = "9.2.0"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz"; - sha1 = "ce721ffc7bdfa275c18677b82728e6ee96a50642"; + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz"; + sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304"; }; }; "lodash._baseuniq-4.6.0" = { @@ -16317,15 +17622,6 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; - }; - }; "read-package-tree-5.1.6" = { name = "read-package-tree"; packageName = "read-package-tree"; @@ -16380,15 +17676,6 @@ let sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; }; }; - "write-file-atomic-2.1.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; - sha1 = "1769f4b551eedce419f0505deae2e26763542d37"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -16425,96 +17712,6 @@ let sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "os-locale-2.0.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; - sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -16659,13 +17856,13 @@ let sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-2.0.0" = { + "https-proxy-agent-2.1.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"; - sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz"; + sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443"; }; }; "node-fetch-npm-2.0.1" = { @@ -16695,13 +17892,13 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-4.1.0" = { + "agent-base-4.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz"; - sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz"; + sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4"; }; }; "es6-promisify-5.0.0" = { @@ -16776,22 +17973,22 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.2.0" = { + "boxen-1.2.1" = { name = "boxen"; packageName = "boxen"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz"; - sha1 = "03478d84be7fe02189b80904d81d6a80384368f1"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz"; + sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d"; }; }; - "configstore-3.1.0" = { + "configstore-3.1.1" = { name = "configstore"; packageName = "configstore"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz"; - sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; }; }; "import-lazy-2.1.0" = { @@ -16839,42 +18036,6 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; "unique-string-1.0.0" = { name = "unique-string"; packageName = "unique-string"; @@ -16902,6 +18063,15 @@ let sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -17154,13 +18324,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.36.2" = { + "snyk-1.38.1" = { name = "snyk"; packageName = "snyk"; - version = "1.36.2"; + version = "1.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.36.2.tgz"; - sha1 = "88be72a8da75a02e920f2be7f5830402b5e0eb41"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.38.1.tgz"; + sha1 = "8a7527cc89811daa400780ea9051f5a73e737f23"; }; }; "spawn-please-0.3.0" = { @@ -17253,13 +18423,13 @@ let sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; }; }; - "es5-ext-0.10.24" = { + "es5-ext-0.10.26" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.24"; + version = "0.10.26"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz"; - sha1 = "a55877c9924bc0c8d9bd3c2cbe17495ac1709b14"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz"; + sha1 = "51b2128a531b70c4f6764093a73cbebb82186372"; }; }; "es6-iterator-2.0.1" = { @@ -17307,13 +18477,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-gradle-plugin-1.0.2" = { + "snyk-gradle-plugin-1.0.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.2.tgz"; - sha1 = "364550d5f388673400296d3ab31df358c678bb9e"; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.3.tgz"; + sha1 = "9583df8bda478d4a20070d577b1da2e1cb6499ef"; }; }; "snyk-module-1.8.1" = { @@ -17379,13 +18549,13 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "snyk-sbt-plugin-1.0.2" = { + "snyk-sbt-plugin-1.1.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.0.2.tgz"; - sha1 = "ce2aa9a3b08af6680d5ee8a007ecb6ae55fb72d1"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz"; + sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050"; }; }; "snyk-tree-1.0.0" = { @@ -17406,15 +18576,6 @@ let sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; }; }; - "tempfile-1.1.1" = { - name = "tempfile"; - packageName = "tempfile"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; - sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; - }; - }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -17641,13 +18802,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.28" = { + "domino-1.0.29" = { name = "domino"; packageName = "domino"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; - sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz"; + sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06"; }; }; "express-handlebars-3.0.0" = { @@ -17760,13 +18921,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "bunyan-1.8.10" = { + "bunyan-1.8.12" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.10"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; - sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; + sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -17823,13 +18984,13 @@ let sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "dtrace-provider-0.8.3" = { + "dtrace-provider-0.8.5" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz"; - sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz"; + sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92"; }; }; "mv-2.1.1" = { @@ -17941,13 +19102,13 @@ let sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "msgpack5-3.4.1" = { + "msgpack5-3.5.0" = { name = "msgpack5"; packageName = "msgpack5"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; - sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz"; + sha1 = "193b3e864959a826d33074460c2651d1ed04b07a"; }; }; "dom-storage-2.0.2" = { @@ -18346,15 +19507,6 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "private-0.1.7" = { - name = "private"; - packageName = "private"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; - sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; - }; - }; "recast-0.11.23" = { name = "recast"; packageName = "recast"; @@ -19067,15 +20219,6 @@ let sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; }; }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; - }; - }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -19148,13 +20291,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.2.0" = { + "csv-parse-1.2.1" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; - sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.1.tgz"; + sha1 = "9199c23f2490d98c4d9ab2a0167b06927498c9df"; }; }; "stream-transform-0.1.2" = { @@ -19391,13 +20534,13 @@ let sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; }; }; - "tapable-0.2.6" = { + "tapable-0.2.8" = { name = "tapable"; packageName = "tapable"; - version = "0.2.6"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; - sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz"; + sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; }; }; "memory-fs-0.3.0" = { @@ -19409,15 +20552,6 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "async-2.4.1" = { - name = "async"; - packageName = "async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; - sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; - }; - }; "blueimp-md5-2.7.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; @@ -19427,13 +20561,13 @@ let sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9"; }; }; - "color-1.0.3" = { + "color-2.0.0" = { name = "color"; packageName = "color"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz"; - sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d"; + url = "https://registry.npmjs.org/color/-/color-2.0.0.tgz"; + sha1 = "e0c9972d1e969857004b101eaa55ceab5961d67d"; }; }; "crossroads-0.12.2" = { @@ -19454,13 +20588,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-session-1.15.3" = { + "express-session-1.15.5" = { name = "express-session"; packageName = "express-session"; - version = "1.15.3"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.3.tgz"; - sha1 = "db545f0435a7b1b228ae02da8197f65141735c67"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz"; + sha1 = "f49a18227263b316f6f8544da5fee25a540259ec"; }; }; "forever-monitor-1.1.0" = { @@ -19490,15 +20624,6 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; - "ignore-3.2.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; - sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; - }; - }; "just-detect-adblock-1.0.0" = { name = "just-detect-adblock"; packageName = "just-detect-adblock"; @@ -19544,15 +20669,6 @@ let sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646"; }; }; - "npm-registry-client-8.3.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; - sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; - }; - }; "octicons-3.5.0" = { name = "octicons"; packageName = "octicons"; @@ -19571,13 +20687,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.2.1" = { + "raven-2.1.1" = { name = "raven"; packageName = "raven"; - version = "1.2.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; - sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; + url = "https://registry.npmjs.org/raven/-/raven-2.1.1.tgz"; + sha1 = "b3a974c6c29315c677c079e168435ead196525cd"; }; }; "signals-1.0.0" = { @@ -19598,13 +20714,13 @@ let sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; - "superagent-3.5.2" = { - name = "superagent"; - packageName = "superagent"; - version = "3.5.2"; + "socket.io-2.0.3" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; - sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz"; + sha1 = "4359f06a24933ae6bd087798af78c680eae345e3"; }; }; "winston-2.3.1" = { @@ -19661,24 +20777,6 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "whatwg-fetch-2.0.3" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; - }; - }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; "broadway-0.2.10" = { name = "broadway"; packageName = "broadway"; @@ -19859,15 +20957,6 @@ let sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -19877,6 +20966,15 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + }; + }; "eve-0.5.4" = { name = "eve"; packageName = "eve"; @@ -19886,22 +20984,85 @@ let sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "cookiejar-2.1.1" = { - name = "cookiejar"; - packageName = "cookiejar"; + "engine.io-3.1.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz"; + sha1 = "5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e"; + }; + }; + "socket.io-adapter-1.1.1" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + }; + "socket.io-client-2.0.3" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz"; + sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b"; + }; + }; + "socket.io-parser-3.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; + sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + }; + }; + "engine.io-parser-2.1.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz"; + sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"; }; }; - "form-data-2.2.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.2.0"; + "uws-0.14.5" = { + name = "uws"; + packageName = "uws"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz"; - sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b"; + url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; + sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + }; + }; + "has-binary2-1.0.2" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + }; + }; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; + }; + }; + "engine.io-client-3.1.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz"; + sha1 = "415a9852badb14fa008fa3ef1e31608db6761325"; }; }; "adm-zip-0.4.7" = { @@ -19967,13 +21128,13 @@ let sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; }; }; - "enhanced-resolve-3.3.0" = { + "enhanced-resolve-3.4.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz"; - sha1 = "950964ecc7f0332a42321b673b38dc8ff15535b3"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; + sha1 = "0421e339fd71419b3da13d129b3979040230476e"; }; }; "escope-3.6.0" = { @@ -19985,22 +21146,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "json-loader-0.5.4" = { + "json-loader-0.5.7" = { name = "json-loader"; packageName = "json-loader"; - version = "0.5.4"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; - sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; - }; - }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; + sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d"; }; }; "loader-runner-2.3.0" = { @@ -20048,13 +21200,13 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; - "watchpack-1.3.1" = { + "watchpack-1.4.0" = { name = "watchpack"; packageName = "watchpack"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz"; - sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; + sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; }; }; "webpack-sources-1.0.1" = { @@ -20129,22 +21281,49 @@ let sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"; }; }; - "timers-browserify-2.0.2" = { + "timers-browserify-2.0.3" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz"; - sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz"; + sha1 = "41fd0bdc926a5feedc33a17a8e1f7d491925f7fc"; }; }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; + "global-4.3.2" = { + name = "global"; + packageName = "global"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + }; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + }; + "process-0.5.2" = { + name = "process"; + packageName = "process"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + }; + "dom-walk-0.1.1" = { + name = "dom-walk"; + packageName = "dom-walk"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; "source-list-map-2.0.0" = { @@ -20156,15 +21335,6 @@ let sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085"; }; }; - "babel-runtime-6.23.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; - sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; - }; - }; "death-1.1.0" = { name = "death"; packageName = "death"; @@ -20183,24 +21353,6 @@ let sha1 = "39c72ed89d1b49ba708e18776500488902a52027"; }; }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; - }; - }; - "is-ci-1.0.10" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; - }; - }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -20210,13 +21362,13 @@ let sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; - "node-emoji-1.7.0" = { + "node-emoji-1.8.1" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.7.0.tgz"; - sha1 = "a400490aac409b616d13941532200f128af037f9"; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz"; + sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826"; }; }; "object-path-0.11.4" = { @@ -20255,15 +21407,6 @@ let sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "is-deflate-1.0.0" = { name = "is-deflate"; packageName = "is-deflate"; @@ -20291,24 +21434,6 @@ let sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; - }; - }; - "ci-info-1.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; - sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; - }; - }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -20435,31 +21560,22 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.0" = { + "yeoman-environment-2.0.2" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz"; - sha1 = "dafa2fc512c168cb8313453e5318e64731265915"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz"; + sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331"; }; }; - "yosay-2.0.0" = { + "yosay-2.0.1" = { name = "yosay"; packageName = "yosay"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz"; - sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe"; - }; - }; - "execa-0.6.3" = { - name = "execa"; - packageName = "execa"; - version = "0.6.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; - sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz"; + sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f"; }; }; "filter-obj-1.1.0" = { @@ -20525,15 +21641,6 @@ let sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; - "indent-string-3.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz"; - sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d"; - }; - }; "execa-0.4.0" = { name = "execa"; packageName = "execa"; @@ -20723,15 +21830,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -20846,7 +21944,7 @@ in sources."source-map-0.5.6" ]; }) - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."global-paths-0.1.2" sources."source-map-0.1.9" sources."xml2tss-0.0.5" @@ -20890,7 +21988,7 @@ in }) sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.14" + sources."which-1.3.0" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" sources."amdefine-1.0.1" @@ -21094,7 +22192,7 @@ in }) sources."moment-2.18.1" sources."ms-rest-2.2.1" - (sources."ms-rest-azure-2.2.1" // { + (sources."ms-rest-azure-2.2.3" // { dependencies = [ sources."async-0.2.7" ]; @@ -21194,12 +22292,12 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-7.0.37" + sources."@types/node-7.0.39" sources."@types/request-0.0.45" sources."@types/uuid-2.0.30" sources."is-buffer-1.1.5" sources."is-stream-1.1.0" - sources."@types/form-data-0.0.33" + sources."@types/form-data-2.2.0" sources."debug-0.7.4" sources."q-0.9.7" sources."pkginfo-0.4.0" @@ -21254,7 +22352,7 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."qs-6.2.3" sources."stringstream-0.0.5" @@ -21279,7 +22377,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21289,9 +22387,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -21307,7 +22409,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" @@ -21374,7 +22476,7 @@ in }) sources."lodash-4.2.1" sources."promised-temp-0.1.0" - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."temp-0.8.3" // { dependencies = [ sources."rimraf-2.2.8" @@ -21503,7 +22605,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.6" + sources."buffer-5.0.7" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -21539,7 +22641,7 @@ in sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" sources."readable-stream-2.3.3" - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -21585,7 +22687,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" @@ -21596,7 +22698,7 @@ in sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" @@ -21753,7 +22855,7 @@ in sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -21933,7 +23035,7 @@ in sources."lru-2.0.1" sources."buffer-equal-0.0.1" sources."k-rpc-socket-1.7.1" - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" @@ -21996,7 +23098,7 @@ in sources."sntp-0.1.4" sources."codepage-1.4.0" sources."utfx-1.0.1" - sources."voc-0.5.0" + sources."voc-1.0.0" (sources."concat-stream-1.6.0" // { dependencies = [ sources."readable-stream-2.3.3" @@ -22004,7 +23106,7 @@ in sources."string_decoder-1.0.3" ]; }) - sources."exit-on-epipe-1.0.0" + sources."exit-on-epipe-1.0.1" sources."commander-2.11.0" sources."typedarray-0.0.6" sources."sax-1.2.4" @@ -22021,10 +23123,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; - sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53"; }; buildInputs = globalBuildInputs; meta = { @@ -22054,6 +23156,7 @@ in sources."glob-7.1.1" sources."nopt-4.0.1" sources."plist-2.0.1" + sources."semver-5.3.0" sources."shelljs-0.3.0" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" @@ -22094,7 +23197,7 @@ in sources."glob-5.0.15" sources."minimatch-3.0.4" sources."plist-1.2.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."shelljs-0.5.3" sources."underscore-1.8.3" sources."unorm-1.4.1" @@ -22199,7 +23302,7 @@ in sources."interpret-1.0.3" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."path-parse-1.0.5" (sources."browserify-13.3.0" // { dependencies = [ @@ -22304,7 +23407,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" @@ -22315,7 +23418,7 @@ in sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" @@ -22355,11 +23458,7 @@ in sources."indexof-0.0.1" sources."chalk-1.1.3" sources."compression-1.7.0" - (sources."express-4.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."express-4.15.4" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -22368,43 +23467,35 @@ in sources."ansi-regex-2.1.1" sources."accepts-1.3.3" sources."bytes-2.5.0" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."debug-2.6.8" sources."on-headers-1.0.1" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-2.0.0" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."finalhandler-1.0.4" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" - sources."qs-6.4.0" + sources."proxy-addr-1.1.5" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) - sources."serve-static-1.12.3" + sources."send-0.15.4" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" @@ -22412,9 +23503,9 @@ in sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" sources."mime-1.3.4" sources."media-typer-0.3.0" sources."npm-package-arg-5.1.2" @@ -22463,6 +23554,7 @@ in (sources."node-gyp-3.6.2" // { dependencies = [ sources."glob-7.1.2" + sources."semver-5.3.0" ]; }) sources."normalize-git-url-3.0.2" @@ -22557,7 +23649,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22567,9 +23659,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -22637,7 +23733,7 @@ in ]; }) sources."registry-url-3.1.0" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."is-redirect-1.0.0" sources."is-stream-1.1.0" @@ -22646,11 +23742,7 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" (sources."rc-1.2.1" // { dependencies = [ @@ -22786,9 +23878,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.5.3" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -22796,7 +23888,7 @@ in sources."ipaddr.js-1.0.5" sources."destroy-1.0.3" sources."mime-1.2.11" - sources."bindings-1.2.1" + sources."bindings-1.3.0" sources."nan-2.6.2" sources."jsonparse-0.0.6" sources."es5class-2.3.1" @@ -22938,11 +24030,9 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - (sources."duplexify-3.5.0" // { + (sources."duplexify-3.5.1" // { dependencies = [ - sources."end-of-stream-1.0.0" sources."readable-stream-2.3.3" - sources."once-1.3.3" sources."isarray-1.0.0" sources."string_decoder-1.0.3" ]; @@ -23013,7 +24103,7 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.85.0" + sources."aws-sdk-2.95.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.81.0" @@ -23048,7 +24138,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -23072,7 +24162,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23082,9 +24172,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -23100,7 +24195,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23113,49 +24208,51 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-1.1.0.tgz"; - sha1 = "5a43ae17f6bf672cd8e40891357f84b086c52509"; + url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz"; + sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f"; }; dependencies = [ - sources."chalk-1.1.3" - sources."clipboardy-0.1.2" + sources."auto-bind-1.1.0" + sources."clipboardy-1.1.4" sources."conf-1.1.2" - (sources."got-6.7.1" // { + sources."got-7.1.0" + sources."has-ansi-3.0.0" + sources."import-jsx-1.3.0" + (sources."ink-0.3.1" // { dependencies = [ - sources."get-stream-3.0.0" + sources."chalk-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" ]; }) - sources."has-ansi-2.0.0" + sources."ink-text-input-1.1.0" sources."lodash.debounce-4.0.8" - sources."log-update-1.0.2" sources."mem-1.1.0" - sources."meow-3.7.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."skin-tone-1.0.0" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."execa-0.5.1" - sources."cross-spawn-4.0.2" - sources."get-stream-2.3.1" + sources."execa-0.6.3" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" sources."p-finally-1.0.0" sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" sources."lru-cache-4.1.1" - sources."which-1.2.14" + sources."shebang-command-1.2.0" + sources."which-1.3.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" sources."isexe-2.0.0" - sources."object-assign-4.1.1" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" sources."path-key-2.0.1" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."env-paths-1.0.0" sources."make-dir-1.0.0" sources."pkg-up-2.0.0" @@ -23166,28 +24263,137 @@ in sources."p-locate-2.0.0" sources."path-exists-3.0.0" sources."p-limit-1.1.0" - sources."create-error-class-3.0.2" + sources."decompress-response-3.3.0" sources."duplexer3-0.1.4" - sources."is-redirect-1.0.0" + sources."is-plain-obj-1.1.0" sources."is-retry-allowed-1.1.0" + sources."isurl-1.0.0" sources."lowercase-keys-1.0.0" + sources."p-cancelable-0.3.0" + sources."p-timeout-1.2.0" sources."safe-buffer-5.1.1" sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" - sources."capture-stack-trace-1.0.0" + sources."url-to-options-1.0.1" + sources."mimic-response-1.0.0" + sources."has-to-string-tag-x-1.4.0" + sources."is-object-1.0.1" + sources."has-symbol-support-x-1.4.0" sources."prepend-http-1.0.4" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + sources."ansi-regex-3.0.0" + sources."babel-core-6.25.0" + sources."babel-plugin-transform-es2015-destructuring-6.23.0" + sources."babel-plugin-transform-object-rest-spread-6.23.0" + sources."babel-plugin-transform-react-jsx-6.24.1" + sources."caller-path-2.0.0" + sources."require-from-string-1.2.1" + sources."resolve-from-3.0.0" + sources."babel-code-frame-6.22.0" + sources."babel-generator-6.25.0" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + sources."babel-template-6.25.0" + sources."babel-runtime-6.25.0" + sources."babel-register-6.24.1" + sources."babel-traverse-6.25.0" + sources."babel-types-6.25.0" + sources."babylon-6.17.4" + sources."convert-source-map-1.5.0" + sources."debug-2.6.8" + sources."json5-0.5.1" + sources."lodash-4.17.4" + sources."minimatch-3.0.4" + sources."path-is-absolute-1.0.1" + sources."private-0.1.7" + sources."slash-1.0.0" + sources."source-map-0.5.6" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."has-ansi-2.0.0" + sources."ansi-regex-2.1.1" + ]; + }) + sources."esutils-2.0.2" + sources."js-tokens-3.0.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + sources."detect-indent-4.0.0" + sources."jsesc-1.3.0" + sources."trim-right-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."core-js-2.5.0" + sources."regenerator-runtime-0.10.5" + sources."home-or-tmp-2.0.0" + sources."mkdirp-0.5.1" + sources."source-map-support-0.4.15" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."minimist-0.0.8" + sources."globals-9.18.0" + sources."invariant-2.2.2" + sources."loose-envify-1.3.1" + sources."to-fast-properties-1.0.3" + sources."ms-2.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-helper-builder-react-jsx-6.24.1" + sources."babel-plugin-syntax-jsx-6.18.0" + sources."caller-callsite-2.0.0" + sources."callsites-2.0.0" + sources."arrify-1.0.1" + sources."indent-string-3.2.0" + sources."lodash.flattendeep-4.4.0" + sources."lodash.isequal-4.5.0" + sources."log-update-2.1.0" + sources."prop-types-15.5.10" + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" sources."mimic-fn-1.1.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + (sources."fbjs-0.8.14" // { + dependencies = [ + sources."core-js-1.2.7" + ]; + }) + sources."isomorphic-fetch-2.2.1" + sources."object-assign-4.1.1" + sources."promise-7.3.1" + sources."setimmediate-1.0.5" + sources."ua-parser-js-0.7.14" + sources."node-fetch-1.7.2" + sources."whatwg-fetch-2.0.3" + sources."encoding-0.1.12" + sources."iconv-lite-0.4.18" + sources."asap-2.0.6" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."minimist-1.2.0" sources."normalize-package-data-2.4.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -23195,20 +24401,26 @@ in sources."path-exists-2.1.0" ]; }) - sources."redent-1.0.0" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + ]; + }) sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."read-pkg-1.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" sources."graceful-fs-4.1.11" @@ -23217,11 +24429,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."indent-string-2.1.0" sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."unicode-emoji-modifier-base-1.0.0" ]; @@ -23236,39 +24444,41 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.2.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz"; - sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz"; + sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3"; }; dependencies = [ sources."ajv-5.2.2" sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" sources."concat-stream-1.6.0" + sources."cross-spawn-5.1.0" sources."debug-2.6.8" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" - sources."espree-3.4.3" + sources."espree-3.5.0" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" + sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" - (sources."inquirer-3.2.0" // { + (sources."inquirer-3.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" sources."strip-ansi-4.0.0" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" sources."ansi-regex-3.0.0" ]; }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.9.0" + sources."js-yaml-3.9.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -23280,6 +24490,7 @@ in sources."pluralize-4.0.0" sources."progress-2.0.0" sources."require-uncached-1.0.3" + sources."semver-5.4.1" sources."strip-json-comments-2.0.1" (sources."table-4.0.1" // { dependencies = [ @@ -23306,6 +24517,13 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" @@ -23316,7 +24534,7 @@ in ]; }) sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" + sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" sources."write-0.2.1" @@ -23345,7 +24563,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -23353,14 +24571,14 @@ in }) sources."through-2.3.8" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -23396,10 +24614,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.0.0.tgz"; - sha1 = "88bbceec5d5eead280b63b6351881bc05bfe3987"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz"; + sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -23407,9 +24625,9 @@ in sources."supports-color-2.0.0" ]; }) - sources."eslint-4.2.0" + sources."eslint-4.4.1" sources."optionator-0.8.2" - sources."resolve-1.3.3" + sources."resolve-1.4.0" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" @@ -23423,29 +24641,31 @@ in sources."ajv-5.2.2" sources."babel-code-frame-6.22.0" sources."concat-stream-1.6.0" + sources."cross-spawn-5.1.0" sources."debug-2.6.8" sources."doctrine-2.0.0" sources."eslint-scope-3.7.1" - sources."espree-3.4.3" + sources."espree-3.5.0" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" + sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" - (sources."inquirer-3.2.0" // { + (sources."inquirer-3.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" sources."strip-ansi-4.0.0" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" sources."ansi-regex-3.0.0" ]; }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.9.0" + sources."js-yaml-3.9.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -23456,6 +24676,7 @@ in sources."pluralize-4.0.0" sources."progress-2.0.0" sources."require-uncached-1.0.3" + sources."semver-5.4.1" sources."strip-json-comments-2.0.1" (sources."table-4.0.1" // { dependencies = [ @@ -23476,6 +24697,13 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" @@ -23486,7 +24714,7 @@ in ]; }) sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" + sources."circular-json-0.3.3" sources."del-2.2.2" sources."graceful-fs-4.1.11" sources."write-0.2.1" @@ -23515,7 +24743,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -23523,14 +24751,14 @@ in }) sources."through-2.3.8" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -23567,10 +24795,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.1.tgz"; - sha1 = "f5680fbee2cb2a56e99042b14d935e3eb861b300"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; + sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; }; buildInputs = globalBuildInputs; meta = { @@ -23628,7 +24856,7 @@ in sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -23700,7 +24928,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."qs-6.3.2" sources."stringstream-0.0.5" @@ -23721,7 +24949,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23731,9 +24959,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -23749,7 +24981,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."throttleit-1.0.0" sources."isexe-2.0.0" @@ -23865,7 +25097,7 @@ in sources."chokidar-1.7.0" sources."minimatch-3.0.4" sources."ps-tree-0.0.3" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."inherits-2.0.3" @@ -23873,8 +25105,8 @@ in sources."is-glob-2.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -23883,7 +25115,6 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -23908,7 +25139,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -23916,7 +25146,8 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.0.2" + sources."binary-extensions-1.9.0" sources."graceful-fs-4.1.11" sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" @@ -23941,7 +25172,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -23983,7 +25214,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -24003,7 +25234,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24013,9 +25244,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -24031,7 +25266,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -24082,7 +25317,7 @@ in sources."async-2.5.0" sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" - sources."simple-git-1.73.0" + sources."simple-git-1.75.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" sources."microee-0.0.2" @@ -24156,7 +25391,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -24336,7 +25571,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.3.3" + sources."resolve-1.4.0" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -24394,7 +25629,7 @@ in sources."is-windows-0.2.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.14" + sources."which-1.3.0" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" (sources."is-plain-object-2.0.4" // { @@ -24607,7 +25842,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.9.0" // { + (sources."js-yaml-3.9.1" // { dependencies = [ sources."esprima-4.0.0" ]; @@ -24621,7 +25856,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.2.3" - sources."which-1.2.14" + sources."which-1.3.0" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -24686,18 +25921,18 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.1.tgz"; - sha1 = "37abd20a6fe7569c55bc823848e6e40e9148c1a6"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.1.0.tgz"; + sha1 = "439c52c899e6f722276739dbb52b3211fc868caf"; }; dependencies = [ sources."@reactivex/rxjs-5.4.2" - sources."chai-4.1.0" + sources."chai-4.1.1" sources."chai-as-promised-7.1.1" - sources."chalk-2.0.1" + sources."chalk-2.1.0" sources."commander-2.11.0" - sources."fast-json-patch-2.0.3" + sources."fast-json-patch-2.0.4" sources."glob-7.1.2" sources."iterare-0.0.8" sources."lodash-4.17.4" @@ -24721,11 +25956,11 @@ in sources."get-func-name-2.0.0" sources."pathval-1.1.0" sources."type-detect-4.0.3" - sources."ansi-styles-3.1.0" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.2.0" + sources."supports-color-4.2.1" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."deep-equal-1.0.1" sources."fs.realpath-1.0.0" @@ -24754,10 +25989,10 @@ in jayschema = nodeEnv.buildNodePackage { name = "jayschema"; packageName = "jayschema"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; - sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; + sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b"; }; dependencies = [ sources."when-3.4.6" @@ -24867,6 +26102,30 @@ in }; production = true; }; + jsonlint = nodeEnv.buildNodePackage { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + }; + dependencies = [ + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Validate JSON"; + homepage = http://zaach.github.com/jsonlint/; + }; + production = true; + }; jsontool = nodeEnv.buildNodePackage { name = "jsontool"; packageName = "jsontool"; @@ -24882,13 +26141,67 @@ in }; production = true; }; + json-refs = nodeEnv.buildNodePackage { + name = "json-refs"; + packageName = "json-refs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.0.tgz"; + sha1 = "1b52b826691862b4873224bc1d07a2060645663c"; + }; + dependencies = [ + sources."commander-2.11.0" + sources."graphlib-2.1.1" + sources."js-yaml-3.9.1" + sources."lodash-4.17.4" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.2" + sources."slash-1.0.0" + sources."uri-js-3.0.2" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" + sources."superagent-3.5.2" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."debug-2.6.8" + sources."extend-3.0.1" + sources."form-data-2.2.0" + sources."formidable-1.1.1" + sources."methods-1.1.2" + sources."mime-1.3.6" + sources."qs-6.5.0" + sources."readable-stream-2.3.3" + sources."ms-2.0.0" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + sources."mime-types-2.1.16" + sources."delayed-stream-1.0.0" + sources."mime-db-1.29.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."punycode-2.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; + homepage = https://github.com/whitlockjc/json-refs; + license = "MIT"; + }; + production = true; + }; json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.11.2.tgz"; - sha1 = "f31b366bd3c540ecebf0cf3e0f4d04c427b21781"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz"; + sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308"; }; dependencies = [ sources."body-parser-1.17.2" @@ -24902,7 +26215,12 @@ in sources."connect-pause-0.1.1" sources."cors-2.8.4" sources."errorhandler-1.5.0" - sources."express-4.15.3" + (sources."express-4.15.4" // { + dependencies = [ + sources."debug-2.6.8" + sources."qs-6.5.0" + ]; + }) (sources."express-urlrewrite-1.2.0" // { dependencies = [ sources."path-to-regexp-1.7.0" @@ -24923,7 +26241,7 @@ in ]; }) sources."object-assign-4.1.1" - sources."please-upgrade-node-1.0.1" + sources."please-upgrade-node-3.0.1" sources."pluralize-3.1.0" sources."request-2.81.0" sources."server-destroy-1.0.1" @@ -24937,8 +26255,8 @@ in sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + sources."depd-1.1.1" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" sources."qs-6.4.0" @@ -24951,8 +26269,8 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -24960,7 +26278,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."accepts-1.3.3" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" sources."vary-1.1.1" @@ -24972,19 +26290,27 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."etag-1.8.0" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" - sources."serve-static-1.12.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."serve-static-1.12.4" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."isarray-0.0.1" @@ -25024,7 +26350,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25034,9 +26360,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -25089,7 +26420,7 @@ in sources."got-5.7.1" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" sources."is-redirect-1.0.0" @@ -25112,7 +26443,6 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."pinkie-2.0.4" - sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" @@ -25171,10 +26501,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; - sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz"; + sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0"; }; dependencies = [ sources."argparse-1.0.9" @@ -25207,8 +26537,12 @@ in sources."lodash-4.17.4" ]; }) - sources."connect-3.6.2" - sources."core-js-2.4.1" + (sources."connect-3.6.3" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."core-js-2.5.0" sources."di-0.0.1" sources."dom-serialize-2.2.1" (sources."expand-braces-0.1.2" // { @@ -25252,8 +26586,8 @@ in sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + sources."depd-1.1.1" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" sources."qs-6.4.0" @@ -25266,9 +26600,9 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" - sources."anymatch-1.3.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" @@ -25276,8 +26610,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -25286,7 +26620,6 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -25311,7 +26644,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -25319,7 +26651,8 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.0.2" + sources."binary-extensions-1.9.0" sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" @@ -25337,7 +26670,7 @@ in ]; }) sources."request-2.81.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -25395,7 +26728,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25405,9 +26738,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -25430,7 +26767,11 @@ in sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."encodeurl-1.0.1" @@ -25603,7 +26944,7 @@ in sources."qs-4.0.0" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.0" + sources."depd-1.1.1" ]; }) (sources."serve-favicon-2.3.2" // { @@ -25620,7 +26961,7 @@ in dependencies = [ sources."escape-html-1.0.3" sources."send-0.13.2" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."statuses-1.2.1" ]; }) @@ -25637,10 +26978,10 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.10" - sources."mime-types-2.1.15" + sources."compressible-2.0.11" + sources."mime-types-2.1.16" sources."negotiator-0.5.3" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.1" sources."csrf-3.0.6" sources."rndm-1.2.0" @@ -25681,6 +27022,360 @@ in }; production = true; }; + lerna = nodeEnv.buildNodePackage { + name = "lerna"; + packageName = "lerna"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lerna/-/lerna-2.0.0.tgz"; + sha1 = "49a72fe70e06aebfd7ea23efb2ab41abe60ebeea"; + }; + dependencies = [ + sources."async-1.5.2" + sources."chalk-1.1.3" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."command-join-2.0.0" + sources."conventional-changelog-cli-1.3.2" + (sources."conventional-recommended-bump-1.0.1" // { + dependencies = [ + sources."conventional-commits-parser-2.0.0" + ]; + }) + sources."dedent-0.7.0" + sources."execa-0.6.3" + sources."find-up-2.1.0" + sources."fs-extra-3.0.1" + sources."get-port-3.1.0" + sources."glob-7.1.2" + sources."globby-6.1.0" + sources."graceful-fs-4.1.11" + (sources."inquirer-3.2.1" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) + sources."is-ci-1.0.10" + (sources."load-json-file-2.0.0" // { + dependencies = [ + sources."strip-bom-3.0.0" + ]; + }) + sources."lodash-4.17.4" + sources."minimatch-3.0.4" + sources."npmlog-4.1.2" + sources."p-finally-1.0.0" + sources."path-exists-3.0.0" + sources."read-cmd-shim-1.0.1" + (sources."read-pkg-2.0.0" // { + dependencies = [ + sources."path-type-2.0.0" + ]; + }) + sources."rimraf-2.6.1" + sources."safe-buffer-5.1.1" + sources."semver-5.4.1" + sources."signal-exit-3.0.2" + (sources."strong-log-transformer-1.0.6" // { + dependencies = [ + sources."minimist-0.1.0" + ]; + }) + (sources."temp-write-3.3.0" // { + dependencies = [ + sources."uuid-3.1.0" + ]; + }) + sources."write-file-atomic-2.1.0" + sources."write-json-file-2.2.0" + (sources."write-pkg-3.1.0" // { + dependencies = [ + sources."sort-keys-2.0.0" + ]; + }) + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."mkdirp-0.5.1" + sources."minimist-0.0.8" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."add-stream-1.0.0" + sources."conventional-changelog-1.1.4" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."read-pkg-up-1.0.1" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + ]; + }) + sources."tempfile-1.1.1" + sources."conventional-changelog-angular-1.4.0" + sources."conventional-changelog-atom-0.1.1" + sources."conventional-changelog-codemirror-0.1.0" + (sources."conventional-changelog-core-1.9.0" // { + dependencies = [ + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."load-json-file-1.1.0" + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) + sources."conventional-changelog-ember-0.2.6" + sources."conventional-changelog-eslint-0.1.0" + sources."conventional-changelog-express-0.1.0" + sources."conventional-changelog-jquery-0.1.0" + sources."conventional-changelog-jscs-0.1.0" + sources."conventional-changelog-jshint-0.1.0" + sources."compare-func-1.3.2" + sources."github-url-from-git-1.5.0" + sources."q-1.5.0" + sources."read-pkg-up-2.0.0" + sources."array-ify-1.0.0" + sources."dot-prop-3.0.0" + sources."is-obj-1.0.1" + sources."conventional-changelog-writer-1.4.1" + sources."conventional-commits-parser-1.3.0" + sources."dateformat-1.0.12" + sources."get-pkg-repo-1.4.0" + sources."git-raw-commits-1.2.0" + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-1.2.1" + sources."normalize-package-data-2.4.0" + sources."through2-2.0.3" + sources."conventional-commits-filter-1.0.0" + sources."handlebars-4.0.10" + sources."json-stringify-safe-5.0.1" + sources."split-1.0.1" + sources."is-subset-0.1.1" + sources."modify-values-1.0.0" + sources."optimist-0.6.1" + sources."source-map-0.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.6" + sources."yargs-3.10.0" + ]; + }) + sources."wordwrap-0.0.3" + sources."amdefine-1.0.1" + sources."uglify-to-browserify-1.0.2" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."through-2.3.8" + sources."JSONStream-1.3.1" + sources."is-text-path-1.0.1" + sources."split2-2.1.1" + sources."trim-off-newlines-1.0.1" + sources."jsonparse-1.3.1" + sources."text-extensions-1.5.0" + sources."get-stdin-4.0.1" + sources."parse-github-repo-url-1.4.0" + sources."hosted-git-info-2.5.0" + sources."dargs-4.1.0" + sources."lodash.template-4.4.0" + sources."number-is-nan-1.0.1" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.templatesettings-4.1.0" + sources."gitconfiglocal-1.0.0" + sources."pify-2.3.0" + sources."ini-1.3.4" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pinkie-promise-2.0.1" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."pinkie-2.0.4" + sources."is-utf8-0.2.1" + sources."readable-stream-2.3.3" + sources."xtend-4.0.1" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."object-assign-4.1.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."currently-unhandled-0.4.1" + sources."array-find-index-1.0.2" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."os-tmpdir-1.0.2" + sources."uuid-2.0.3" + sources."concat-stream-1.6.0" + sources."typedarray-0.0.6" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."path-key-2.0.1" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."p-limit-1.1.0" + sources."jsonfile-3.0.1" + sources."universalify-0.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.1.0" + sources."external-editor-2.0.4" + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.5.1" + sources."tmp-0.0.31" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."ci-info-1.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.1.2" + sources."has-unicode-2.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."byline-5.0.0" + sources."duplexer-0.1.1" + sources."moment-2.18.1" + sources."make-dir-1.0.0" + sources."temp-dir-1.0.0" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + sources."detect-indent-5.0.0" + sources."sort-keys-1.1.2" + sources."is-plain-obj-1.1.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-2.1.0" // { + dependencies = [ + sources."execa-0.7.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-2.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-7.0.0" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."invert-kv-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Tool for managing JavaScript projects with multiple packages"; + homepage = https://lernajs.io/; + license = "MIT"; + }; + production = true; + }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -25705,7 +27400,7 @@ in sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" (sources."glob-stream-5.3.5" // { dependencies = [ sources."through2-0.6.5" @@ -25726,9 +27421,9 @@ in sources."strip-bom-stream-1.0.0" sources."through2-filter-2.0.0" sources."vali-date-1.0.0" - sources."end-of-stream-1.0.0" + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."extend-3.0.1" sources."glob-5.0.15" @@ -25860,15 +27555,15 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.4.2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz"; - sha1 = "d0ef4d332126dbf18d0d640c9b382dd48be97594"; + url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz"; + sha1 = "1328567d2717f997030f8006234bce9b8cd72465"; }; dependencies = [ sources."browser-stdout-1.3.0" sources."commander-2.9.0" - sources."debug-2.6.0" + sources."debug-2.6.8" sources."diff-3.2.0" sources."escape-string-regexp-1.0.5" sources."glob-7.1.1" @@ -25878,7 +27573,7 @@ in sources."mkdirp-0.5.1" sources."supports-color-3.1.2" sources."graceful-readlink-1.0.1" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -26003,7 +27698,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26023,7 +27718,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26033,9 +27728,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26051,7 +27750,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -26130,7 +27829,7 @@ in sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.14" + sources."which-1.3.0" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -26180,7 +27879,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26200,7 +27899,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26210,9 +27909,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26228,7 +27931,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."isexe-2.0.0" @@ -26253,11 +27956,7 @@ in sources."async-0.9.2" sources."biased-opener-0.2.8" sources."debug-2.6.8" - (sources."express-4.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."express-4.15.4" sources."glob-5.0.15" sources."path-is-absolute-1.0.1" sources."rc-1.2.1" @@ -26266,7 +27965,7 @@ in sources."strong-data-uri-1.0.4" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" - sources."which-1.2.14" + sources."which-1.3.0" sources."ws-1.1.4" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -26352,44 +28051,36 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) + sources."finalhandler-1.0.4" sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" - sources."qs-6.4.0" + sources."proxy-addr-1.1.5" + sources."qs-6.5.0" sources."range-parser-1.2.0" - (sources."send-0.15.3" // { - dependencies = [ - sources."debug-2.6.7" - ]; - }) - sources."serve-static-1.12.3" + sources."send-0.15.4" + sources."serve-static-1.12.4" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" sources."mime-1.3.4" sources."inherits-2.0.3" sources."media-typer-0.3.0" @@ -26409,13 +28100,17 @@ in (sources."node-pre-gyp-0.6.36" // { dependencies = [ sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."glob-7.1.2" ]; }) sources."nopt-4.0.1" sources."npmlog-4.1.2" - sources."request-2.81.0" + (sources."request-2.81.0" // { + dependencies = [ + sources."qs-6.4.0" + ]; + }) sources."tar-2.2.1" (sources."tar-pack-3.4.0" // { dependencies = [ @@ -26481,7 +28176,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26491,9 +28186,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26552,7 +28251,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -26600,7 +28299,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26620,7 +28319,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26630,9 +28329,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26648,7 +28351,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -26699,7 +28402,7 @@ in }) sources."undefsafe-0.0.3" sources."update-notifier-0.5.0" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."inherits-2.0.3" @@ -26708,8 +28411,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -26718,7 +28421,6 @@ in sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -26743,7 +28445,6 @@ in sources."isarray-1.0.0" sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -26751,7 +28452,8 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.0.2" + sources."binary-extensions-1.9.0" sources."graceful-fs-4.1.11" sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" @@ -26772,7 +28474,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."minimist-0.0.8" @@ -26812,7 +28514,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -26832,7 +28534,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26842,9 +28544,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -26860,7 +28566,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -26920,7 +28626,7 @@ in ]; }) sources."registry-url-3.1.0" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."is-redirect-1.0.0" sources."is-stream-1.1.0" @@ -26929,11 +28635,7 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -26950,10 +28652,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.17.4"; + version = "0.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.17.4.tgz"; - sha1 = "087a2819f6b59700166be29b04946ad40ac513d2"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz"; + sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; }; dependencies = [ sources."basic-auth-1.1.0" @@ -26966,6 +28668,12 @@ in sources."cors-2.8.3" sources."cron-1.2.1" sources."express-4.15.3" + (sources."express-session-1.15.2" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) sources."follow-redirects-1.2.4" sources."fs-extra-1.0.0" sources."fs.notify-0.0.4" @@ -27001,7 +28709,7 @@ in }) sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.8" - sources."node-red-node-email-0.1.23" + sources."node-red-node-email-0.1.24" (sources."node-red-node-twitter-0.1.11" // { dependencies = [ sources."request-2.81.0" @@ -27016,8 +28724,8 @@ in sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + sources."depd-1.1.1" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" sources."qs-6.4.0" @@ -27027,8 +28735,8 @@ in sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -27073,13 +28781,17 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" sources."send-0.15.3" sources."serve-static-1.12.3" @@ -27087,9 +28799,12 @@ in sources."negotiator-0.6.1" sources."unpipe-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" + sources."crc-3.4.4" + sources."uid-safe-2.1.5" + sources."random-bytes-1.0.0" sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" @@ -27111,13 +28826,9 @@ in sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" - (sources."websocket-stream-5.0.0" // { + (sources."websocket-stream-5.0.1" // { dependencies = [ - (sources."ws-3.0.0" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."ws-3.1.0" ]; }) sources."xtend-4.0.1" @@ -27147,12 +28858,7 @@ in sources."is-glob-3.1.0" sources."path-dirname-1.0.2" sources."is-extglob-2.1.1" - (sources."duplexify-3.5.0" // { - dependencies = [ - sources."end-of-stream-1.0.0" - sources."once-1.3.3" - ]; - }) + sources."duplexify-3.5.1" sources."stream-shift-1.0.0" sources."extend-shallow-2.0.1" sources."is-absolute-0.2.6" @@ -27256,7 +28962,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27266,9 +28972,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -27444,7 +29154,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.8" // { + (sources."debug-3.0.0" // { dependencies = [ sources."ms-2.0.0" ]; @@ -27454,7 +29164,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -27561,7 +29271,7 @@ in sources."ini-1.3.4" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" - sources."libnpx-9.2.0" + sources."libnpx-9.2.3" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" @@ -27666,12 +29376,12 @@ in }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - sources."os-locale-2.0.0" + sources."os-locale-2.1.0" sources."read-pkg-up-2.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."set-blocking-2.0.0" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; @@ -27688,19 +29398,18 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."execa-0.5.1" + sources."execa-0.7.0" sources."lcid-1.0.0" sources."mem-1.1.0" - sources."cross-spawn-4.0.2" - sources."get-stream-2.3.1" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" sources."p-finally-1.0.0" sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" - sources."object-assign-4.1.1" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."path-key-2.0.1" sources."invert-kv-1.0.0" sources."mimic-fn-1.1.0" @@ -27722,12 +29431,7 @@ in sources."pseudomap-1.0.2" sources."yallist-2.1.2" sources."concat-stream-1.6.0" - (sources."duplexify-3.5.0" // { - dependencies = [ - sources."end-of-stream-1.0.0" - sources."once-1.3.3" - ]; - }) + sources."duplexify-3.5.1" sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" @@ -27755,6 +29459,7 @@ in ]; }) sources."delegates-1.0.0" + sources."object-assign-4.1.1" (sources."wide-align-1.1.2" // { dependencies = [ sources."string-width-1.0.2" @@ -27773,12 +29478,12 @@ in sources."agentkeepalive-3.3.0" sources."http-cache-semantics-3.7.3" sources."http-proxy-agent-2.0.0" - sources."https-proxy-agent-2.0.0" + sources."https-proxy-agent-2.1.0" sources."node-fetch-npm-2.0.1" sources."socks-proxy-agent-3.0.0" sources."humanize-ms-1.2.1" sources."ms-2.0.0" - sources."agent-base-4.1.0" + sources."agent-base-4.1.1" sources."debug-2.6.8" sources."es6-promisify-5.0.0" sources."es6-promise-4.1.1" @@ -27812,7 +29517,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -27831,7 +29536,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27841,9 +29546,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -27859,14 +29568,14 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - (sources."boxen-1.2.0" // { + (sources."boxen-1.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" ]; }) (sources."chalk-1.1.3" // { @@ -27877,7 +29586,7 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."configstore-3.1.0" + sources."configstore-3.1.1" sources."import-lazy-2.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" @@ -27885,13 +29594,7 @@ in sources."xdg-basedir-3.0.0" sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."execa-0.7.0" - sources."cross-spawn-5.1.0" - sources."get-stream-3.0.0" - ]; - }) + sources."term-size-1.2.0" (sources."widest-line-1.0.0" // { dependencies = [ sources."string-width-1.0.2" @@ -27899,30 +29602,24 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."ansi-styles-3.1.0" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.2.0" + sources."supports-color-4.2.1" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."make-dir-1.0.0" sources."unique-string-1.0.0" sources."is-obj-1.0.1" sources."crypto-random-string-1.0.0" sources."package-json-4.0.1" - (sources."got-6.7.1" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) + sources."got-6.7.1" sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" @@ -27995,7 +29692,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.6" + sources."coffee-script-1.12.7" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.81.0" @@ -28020,7 +29717,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -28041,7 +29738,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28051,9 +29748,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -28069,7 +29771,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."glob-7.1.2" sources."fs.realpath-1.0.0" @@ -28088,7 +29790,6 @@ in sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.3.3" - sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" @@ -28160,16 +29861,20 @@ in sources."json-parse-helpfulerror-1.0.3" sources."lodash-4.17.4" sources."node-alias-1.0.4" - sources."npm-3.10.10" + (sources."npm-3.10.10" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" ]; }) sources."require-dir-0.3.2" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.36.2" // { + (sources."snyk-1.38.1" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -28183,22 +29888,22 @@ in sources."spawn-please-0.3.0" (sources."update-notifier-2.2.0" // { dependencies = [ - (sources."boxen-1.2.0" // { + (sources."boxen-1.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" ]; }) - sources."configstore-3.1.0" + sources."configstore-3.1.1" sources."latest-version-3.1.0" sources."xdg-basedir-3.0.0" sources."camelcase-4.1.0" - sources."string-width-2.1.0" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."string-width-2.1.1" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."write-file-atomic-2.1.0" sources."package-json-4.0.1" sources."got-6.7.1" @@ -28355,7 +30060,7 @@ in sources."es6-symbol-3.1.1" sources."ms-2.0.0" sources."d-1.0.0" - sources."es5-ext-0.10.24" + sources."es5-ext-0.10.26" sources."es6-iterator-2.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -28395,7 +30100,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."qs-6.2.3" @@ -28415,7 +30120,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28425,9 +30130,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -28443,7 +30152,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" @@ -28467,7 +30176,7 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-gradle-plugin-1.0.2" + sources."snyk-gradle-plugin-1.0.3" sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.0.0" sources."snyk-policy-1.7.1" @@ -28483,7 +30192,7 @@ in sources."minimist-1.2.0" ]; }) - sources."snyk-sbt-plugin-1.0.2" + sources."snyk-sbt-plugin-1.1.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.2.0" (sources."tempfile-1.1.1" // { @@ -28553,7 +30262,7 @@ in sources."for-in-0.1.8" ]; }) - sources."js-yaml-3.9.0" + sources."js-yaml-3.9.1" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -28634,20 +30343,16 @@ in sources."yallist-2.1.2" sources."promise-7.3.1" sources."string-length-1.0.1" - sources."duplexify-3.5.0" + sources."duplexify-3.5.1" sources."infinity-agent-2.0.3" sources."nested-error-stacks-1.0.2" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."stream-shift-1.0.0" sources."querystring-0.2.0" sources."import-lazy-2.1.0" (sources."ansi-align-2.0.0" // { dependencies = [ - sources."string-width-2.1.0" + sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -28656,7 +30361,7 @@ in sources."cli-boxes-1.0.0" sources."term-size-1.2.0" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."execa-0.7.0" sources."cross-spawn-5.1.0" @@ -28704,14 +30409,16 @@ in }) sources."connect-busboy-0.0.2" sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."core-js-2.4.1" + sources."core-js-2.5.0" sources."diff-1.4.0" - sources."domino-1.0.28" + sources."domino-1.0.29" sources."entities-1.1.1" - (sources."express-4.15.3" // { + (sources."express-4.15.4" // { dependencies = [ sources."content-type-1.0.2" - sources."finalhandler-1.0.3" + sources."debug-2.6.8" + sources."finalhandler-1.0.4" + sources."qs-6.5.0" ]; }) sources."express-handlebars-3.0.0" @@ -28721,14 +30428,14 @@ in sources."ms-0.7.1" ]; }) - sources."js-yaml-3.9.0" + sources."js-yaml-3.9.1" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" sources."request-2.81.0" - sources."semver-5.3.0" + sources."semver-5.4.1" (sources."serve-favicon-2.4.3" // { dependencies = [ sources."safe-buffer-5.0.1" @@ -28754,8 +30461,8 @@ in sources."is-arguments-1.0.2" sources."bytes-2.4.0" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + sources."depd-1.1.1" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" sources."qs-6.4.0" @@ -28768,10 +30475,10 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."accepts-1.3.3" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" sources."vary-1.1.1" @@ -28794,13 +30501,17 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" - sources."serve-static-1.12.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."serve-static-1.12.4" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" @@ -28886,7 +30597,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28896,9 +30607,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -28916,7 +30631,7 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."bluebird-3.5.0" - sources."bunyan-1.8.10" + sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" sources."hot-shots-4.5.0" @@ -28928,7 +30643,7 @@ in ]; }) sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.3" + sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -28966,7 +30681,7 @@ in }) sources."lodash-3.10.1" sources."merge-1.2.0" - (sources."msgpack5-3.4.1" // { + (sources."msgpack5-3.5.0" // { dependencies = [ sources."readable-stream-2.3.3" sources."isarray-1.0.0" @@ -29155,7 +30870,7 @@ in sources."array-find-index-1.0.2" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" sources."spdx-correct-1.0.2" @@ -29285,7 +31000,7 @@ in sources."lru-2.0.1" sources."buffer-equal-0.0.1" sources."k-rpc-socket-1.7.1" - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" @@ -29358,8 +31073,8 @@ in sources."pend-1.2.0" sources."ee-first-1.1.1" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."basic-auth-1.0.4" (sources."connect-2.30.2" // { dependencies = [ @@ -29422,7 +31137,7 @@ in sources."pause-0.1.0" (sources."response-time-2.3.2" // { dependencies = [ - sources."depd-1.1.0" + sources."depd-1.1.1" ]; }) (sources."serve-favicon-2.3.2" // { @@ -29439,7 +31154,7 @@ in dependencies = [ sources."escape-html-1.0.3" sources."send-0.13.2" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."range-parser-1.0.3" sources."statuses-1.2.1" ]; @@ -29454,7 +31169,7 @@ in }) sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."negotiator-0.5.3" sources."ms-0.7.1" sources."csrf-3.0.6" @@ -29641,7 +31356,7 @@ in sources."bencode-1.0.0" ]; }) - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" @@ -29671,7 +31386,7 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."addr-to-ip-port-1.4.2" - sources."which-1.2.14" + sources."which-1.3.0" sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; @@ -29737,7 +31452,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -29753,9 +31468,9 @@ in sources."har-validator-2.0.6" sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29765,9 +31480,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -29816,10 +31535,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.5.2.tgz"; - sha1 = "7ea0751da27b93bfb6cecfcec509994f52d83bb3"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.5.3.tgz"; + sha1 = "59dadc683345ec6b88f88b94ed4ae7e1da394bfe"; }; buildInputs = globalBuildInputs; meta = { @@ -29930,7 +31649,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.8" + sources."debug-3.0.0" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -29972,7 +31691,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."safe-buffer-5.1.1" @@ -29992,7 +31711,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30002,9 +31721,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -30020,7 +31743,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -30032,10 +31755,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; + sha1 = "e059c09d8571f0540823733433505d3a2f00b18e"; }; buildInputs = globalBuildInputs; meta = { @@ -30073,14 +31796,14 @@ in ]; }) sources."commander-2.11.0" - sources."js-yaml-3.9.0" + sources."js-yaml-3.9.1" sources."cookies-0.7.0" sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.10" + sources."bunyan-1.8.12" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -30089,7 +31812,7 @@ in sources."JSONStream-1.3.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - sources."http-errors-1.6.1" + sources."http-errors-1.6.2" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" @@ -30105,13 +31828,13 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."debug-2.6.1" - sources."depd-1.1.0" + sources."depd-1.1.1" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - (sources."finalhandler-1.0.3" // { + (sources."finalhandler-1.0.4" // { dependencies = [ - sources."debug-2.6.7" + sources."debug-2.6.8" sources."ms-2.0.0" ]; }) @@ -30122,7 +31845,7 @@ in sources."parseurl-1.3.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."qs-6.4.0" sources."range-parser-1.2.0" (sources."router-1.3.1" // { @@ -30138,21 +31861,21 @@ in sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."negotiator-0.6.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."ms-0.7.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.10" + sources."compressible-2.0.11" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" sources."argparse-1.0.9" @@ -30190,7 +31913,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30200,9 +31923,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -30221,7 +31949,7 @@ in sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.3" + sources."dtrace-provider-0.8.5" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -30270,7 +31998,6 @@ in sources."domelementtype-1.1.3" ]; }) - sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" @@ -30409,7 +32136,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.2.0" + sources."csv-parse-1.2.1" sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -30444,11 +32171,10 @@ in }) ]; }) - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" - sources."verror-1.3.6" + sources."extsprintf-1.3.0" ]; }) sources."json-schema-0.2.3" @@ -30481,7 +32207,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.8" + sources."debug-3.0.0" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -30560,7 +32286,7 @@ in sources."glob-7.1.2" sources."minimatch-3.0.4" sources."resolve-from-2.0.0" - sources."tapable-0.2.6" + sources."tapable-0.2.8" sources."memory-fs-0.3.0" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" @@ -30594,10 +32320,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz"; - sha1 = "c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; + sha1 = "f8395f85d459276067c988aa41837a8f82870844"; }; buildInputs = globalBuildInputs; meta = { @@ -30610,15 +32336,14 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.24"; + version = "3.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz"; - sha1 = "ee93400ad9857fb7a1671778db83f6a23f033121"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz"; + sha1 = "a97db8c8ba6b9dba4e2f88d86aa9548fa6320034"; }; dependencies = [ - sources."commander-2.9.0" + sources."commander-2.11.0" sources."source-map-0.5.6" - sources."graceful-readlink-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -30631,26 +32356,35 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.23"; + version = "1.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.23.tgz"; - sha1 = "8067752f07877ef4311833146d58f7badf2f9f4a"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.27.tgz"; + sha1 = "47d7f0cedbecd9c9a1f7377cbaea944053727153"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."bluebird-3.5.0" sources."blueimp-md5-2.7.0" sources."body-parser-1.17.2" - sources."color-1.0.3" + sources."color-2.0.0" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.3.0" - sources."express-4.15.3" - sources."express-session-1.15.3" + (sources."express-4.15.4" // { + dependencies = [ + sources."debug-2.6.8" + sources."qs-6.5.0" + ]; + }) + (sources."express-session-1.15.5" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.7" + sources."ignore-3.3.3" sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ @@ -30699,7 +32433,7 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-8.3.0" // { + (sources."npm-registry-client-8.4.0" // { dependencies = [ sources."request-2.81.0" sources."combined-stream-1.0.5" @@ -30722,11 +32456,11 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.2.1" // { + (sources."raven-2.1.1" // { dependencies = [ sources."json-stringify-safe-5.0.1" - sources."uuid-3.0.0" sources."stack-trace-0.0.9" + sources."uuid-3.0.0" ]; }) (sources."rc-1.2.1" // { @@ -30736,16 +32470,10 @@ in }) sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."serve-static-1.12.3" + sources."serve-static-1.12.4" sources."signals-1.0.0" sources."snapsvg-0.5.1" - (sources."socket.io-1.7.4" // { - dependencies = [ - sources."debug-2.3.3" - sources."object-assign-4.1.0" - sources."ms-0.7.2" - ]; - }) + sources."socket.io-2.0.3" (sources."superagent-3.5.2" // { dependencies = [ sources."component-emitter-1.2.1" @@ -30773,7 +32501,7 @@ in }) (sources."yargs-8.0.2" // { dependencies = [ - sources."string-width-2.1.0" + sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -30782,8 +32510,8 @@ in sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" - sources."depd-1.1.0" - sources."http-errors-1.6.1" + sources."depd-1.1.1" + sources."http-errors-1.6.2" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" sources."qs-6.4.0" @@ -30796,11 +32524,11 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.15" - sources."mime-db-1.27.0" + sources."mime-types-2.1.16" + sources."mime-db-1.29.0" sources."color-convert-1.9.0" sources."color-string-1.5.2" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."simple-swizzle-0.2.2" sources."is-arrayish-0.3.1" sources."cookie-0.3.1" @@ -30820,25 +32548,33 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.8.0" - sources."finalhandler-1.0.3" + (sources."finalhandler-1.0.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.4" + sources."proxy-addr-1.1.5" sources."range-parser-1.2.0" - sources."send-0.15.3" + (sources."send-0.15.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."crc-3.4.4" sources."on-headers-1.0.1" - sources."uid-safe-2.1.4" + sources."uid-safe-2.1.5" sources."random-bytes-1.0.0" (sources."broadway-0.2.10" // { dependencies = [ @@ -31065,11 +32801,9 @@ in sources."string_decoder-1.0.3" ]; }) - (sources."duplexify-3.5.0" // { + (sources."duplexify-3.5.1" // { dependencies = [ - sources."end-of-stream-1.0.0" sources."readable-stream-2.3.3" - sources."once-1.3.3" sources."isarray-1.0.0" sources."string_decoder-1.0.3" ]; @@ -31154,7 +32888,7 @@ in sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31164,9 +32898,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31192,10 +32930,10 @@ in }) sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - (sources."boxen-1.2.0" // { + (sources."boxen-1.2.1" // { dependencies = [ - sources."chalk-2.0.1" - sources."string-width-2.1.0" + sources."chalk-2.1.0" + sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -31207,7 +32945,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."configstore-3.1.0" // { + (sources."configstore-3.1.1" // { dependencies = [ sources."write-file-atomic-2.1.0" ]; @@ -31219,7 +32957,7 @@ in sources."xdg-basedir-3.0.0" (sources."ansi-align-2.0.0" // { dependencies = [ - sources."string-width-2.1.0" + sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -31229,9 +32967,9 @@ in sources."cli-boxes-1.0.0" sources."term-size-1.2.0" sources."widest-line-1.0.0" - sources."ansi-styles-3.1.0" + sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" - sources."supports-color-4.2.0" + sources."supports-color-4.2.1" sources."has-flag-2.0.0" sources."execa-0.7.0" (sources."cross-spawn-5.1.0" // { @@ -31250,7 +32988,7 @@ in sources."shebang-regex-1.0.0" sources."path-key-2.0.1" sources."has-ansi-2.0.0" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."make-dir-1.0.0" sources."unique-string-1.0.0" sources."is-obj-1.0.1" @@ -31282,76 +33020,60 @@ in sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."eve-0.5.4" - (sources."engine.io-1.8.4" // { + sources."engine.io-3.1.0" + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.0.3" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - sources."has-binary-0.1.7" - (sources."socket.io-adapter-0.5.0" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" + sources."component-emitter-1.2.1" ]; }) - (sources."socket.io-client-1.7.4" // { + (sources."socket.io-parser-3.1.2" // { dependencies = [ sources."component-emitter-1.2.1" - sources."debug-2.3.3" - sources."ms-0.7.2" + sources."isarray-2.0.1" ]; }) - (sources."socket.io-parser-2.3.1" // { + sources."base64id-1.0.0" + sources."engine.io-parser-2.1.1" + (sources."ws-2.3.1" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."safe-buffer-5.0.1" ]; }) - sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.4" + sources."uws-0.14.5" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" - sources."wtf-8-1.0.0" - sources."options-0.0.6" - sources."ultron-1.0.2" + (sources."has-binary2-1.0.2" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."ultron-1.1.0" sources."backo2-1.0.2" sources."component-bind-1.0.0" - (sources."engine.io-client-1.8.4" // { + (sources."engine.io-client-3.1.1" // { dependencies = [ sources."component-emitter-1.2.1" - sources."debug-2.3.3" - sources."ws-1.1.2" - sources."ms-0.7.2" ]; }) + sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."object-component-0.0.3" + sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."to-array-0.1.4" sources."component-inherit-0.0.3" - sources."has-cors-1.1.0" sources."parsejson-0.0.3" - sources."parseqs-0.0.5" sources."xmlhttprequest-ssl-1.5.3" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."json3-3.3.2" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - (sources."os-locale-2.0.0" // { - dependencies = [ - sources."execa-0.5.1" - sources."cross-spawn-4.0.2" - sources."get-stream-2.3.1" - sources."lru-cache-4.1.1" - ]; - }) + sources."os-locale-2.1.0" sources."read-pkg-up-2.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -31361,8 +33083,6 @@ in sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."mem-1.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" sources."invert-kv-1.0.0" sources."mimic-fn-1.1.0" sources."find-up-2.1.0" @@ -31468,7 +33188,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -31484,9 +33204,9 @@ in sources."har-validator-2.0.6" sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31496,9 +33216,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31549,10 +33273,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.2.0"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.2.0.tgz"; - sha1 = "8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.5.2.tgz"; + sha1 = "a9601066e23af3c80f3bf9758fd794ca9778f251"; }; dependencies = [ sources."acorn-5.1.1" @@ -31564,10 +33288,10 @@ in sources."ajv-5.2.2" sources."ajv-keywords-2.1.0" sources."async-2.5.0" - sources."enhanced-resolve-3.3.0" + sources."enhanced-resolve-3.4.1" sources."escope-3.6.0" sources."interpret-1.0.3" - sources."json-loader-0.5.4" + sources."json-loader-0.5.7" sources."json5-0.5.1" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" @@ -31579,15 +33303,23 @@ in ]; }) sources."source-map-0.5.6" - sources."supports-color-3.2.3" - sources."tapable-0.2.6" + sources."supports-color-4.2.1" + sources."tapable-0.2.8" sources."uglifyjs-webpack-plugin-0.4.6" - sources."watchpack-1.3.1" + sources."watchpack-1.4.0" sources."webpack-sources-1.0.1" - (sources."yargs-6.6.0" // { + (sources."yargs-8.0.2" // { dependencies = [ - sources."camelcase-3.0.0" - sources."cliui-3.2.0" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."string-width-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" ]; }) sources."co-4.6.0" @@ -31603,7 +33335,7 @@ in sources."esrecurse-4.2.0" sources."estraverse-4.2.0" sources."d-1.0.0" - sources."es5-ext-0.10.24" + sources."es5-ext-0.10.26" sources."es6-iterator-2.0.1" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" @@ -31637,7 +33369,7 @@ in sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" - sources."timers-browserify-2.0.2" + sources."timers-browserify-2.0.3" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { dependencies = [ @@ -31660,7 +33392,7 @@ in sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.12" + sources."pbkdf2-3.0.13" sources."public-encrypt-4.0.0" sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" @@ -31670,7 +33402,7 @@ in sources."cipher-base-1.0.4" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.7" + sources."bn.js-4.11.8" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" @@ -31686,10 +33418,17 @@ in sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."xtend-4.0.1" + (sources."global-4.3.2" // { + dependencies = [ + sources."process-0.5.2" + ]; + }) sources."setimmediate-1.0.5" + sources."min-document-2.19.0" + sources."dom-walk-0.1.1" sources."querystring-0.2.0" sources."indexof-0.0.1" - sources."has-flag-1.0.0" + sources."has-flag-2.0.0" (sources."uglify-js-2.8.29" // { dependencies = [ sources."yargs-3.10.0" @@ -31710,7 +33449,7 @@ in sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" sources."chokidar-1.7.0" - sources."anymatch-1.3.0" + sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" @@ -31718,8 +33457,8 @@ in sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.1.2" - sources."arrify-1.0.1" sources."micromatch-2.3.11" + sources."normalize-path-2.1.1" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" @@ -31727,7 +33466,6 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" - sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -31749,7 +33487,6 @@ in ]; }) sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -31757,7 +33494,8 @@ in sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" + sources."remove-trailing-separator-1.0.2" + sources."binary-extensions-1.9.0" sources."minimatch-3.0.4" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.8" @@ -31774,7 +33512,7 @@ in }) sources."request-2.81.0" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."tar-2.2.1" sources."tar-pack-3.4.0" sources."abbrev-1.1.0" @@ -31816,7 +33554,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -31832,7 +33570,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -31842,9 +33580,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -31860,7 +33602,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -31874,34 +33616,51 @@ in sources."ms-2.0.0" sources."source-list-map-2.0.0" sources."get-caller-file-1.0.2" - sources."os-locale-1.4.0" - sources."read-pkg-up-1.0.1" + sources."os-locale-2.1.0" + sources."read-pkg-up-2.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."which-module-1.0.0" + sources."which-module-2.0.0" sources."y18n-3.2.1" - (sources."yargs-parser-4.2.1" // { + (sources."yargs-parser-7.0.0" // { dependencies = [ - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" ]; }) sources."wrap-ansi-2.1.0" + sources."execa-0.7.0" sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."path-key-2.0.1" sources."invert-kv-1.0.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" + sources."mimic-fn-1.1.0" + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."path-exists-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" - sources."path-type-1.1.0" + sources."path-type-2.0.0" sources."parse-json-2.2.0" sources."pify-2.3.0" - sources."strip-bom-2.0.0" + sources."strip-bom-3.0.0" sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" - sources."is-utf8-0.2.1" sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -31943,7 +33702,7 @@ in sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1"; }; dependencies = [ - sources."babel-runtime-6.23.0" + sources."babel-runtime-6.25.0" sources."bytes-2.5.0" sources."camelcase-4.1.0" sources."chalk-1.1.3" @@ -31955,12 +33714,12 @@ in sources."glob-7.1.2" sources."gunzip-maybe-1.4.1" sources."ini-1.3.4" - (sources."inquirer-3.2.0" // { + (sources."inquirer-3.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" sources."strip-ansi-4.0.0" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" sources."ansi-regex-3.0.0" ]; }) @@ -31971,21 +33730,21 @@ in sources."loud-rejection-1.6.0" sources."micromatch-2.3.11" sources."mkdirp-0.5.1" - sources."node-emoji-1.7.0" + sources."node-emoji-1.8.1" sources."object-path-0.11.4" sources."proper-lockfile-2.0.1" sources."read-1.0.7" sources."request-2.81.0" sources."request-capture-har-1.2.2" sources."rimraf-2.6.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."strip-bom-3.0.0" sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" sources."uuid-3.1.0" sources."v8-compile-cache-1.1.0" sources."validate-npm-package-license-3.0.1" - sources."core-js-2.4.1" + sources."core-js-2.5.0" sources."regenerator-runtime-0.10.5" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -32012,12 +33771,8 @@ in sources."pumpify-1.3.5" sources."through2-2.0.3" sources."pako-0.2.9" - sources."duplexify-3.5.0" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."duplexify-3.5.1" + sources."end-of-stream-1.4.0" sources."readable-stream-2.3.3" sources."stream-shift-1.0.0" sources."core-util-is-1.0.2" @@ -32026,11 +33781,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - (sources."pump-1.0.2" // { - dependencies = [ - sources."end-of-stream-1.4.0" - ]; - }) + sources."pump-1.0.2" sources."xtend-4.0.1" sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" @@ -32042,7 +33793,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -32050,14 +33801,14 @@ in }) sources."through-2.3.8" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -32112,7 +33863,6 @@ in sources."is-primitive-2.0.0" sources."minimist-0.0.8" sources."lodash.toarray-4.4.0" - sources."string.prototype.codepointat-0.2.0" sources."retry-0.10.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -32127,7 +33877,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -32146,7 +33896,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -32156,9 +33906,13 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -32174,7 +33928,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."chownr-1.0.1" sources."bl-1.2.1" @@ -32202,18 +33956,18 @@ in sources."async-2.5.0" sources."chalk-1.1.3" sources."cli-list-0.2.0" - sources."configstore-3.1.0" + sources."configstore-3.1.1" sources."cross-spawn-5.1.0" sources."figures-2.0.0" sources."fullname-3.3.0" sources."got-6.7.1" sources."humanize-string-1.0.1" - (sources."inquirer-3.2.0" // { + (sources."inquirer-3.2.1" // { dependencies = [ - sources."chalk-2.0.1" + sources."chalk-2.1.0" sources."strip-ansi-4.0.0" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" sources."ansi-regex-3.0.0" ]; }) @@ -32298,10 +34052,10 @@ in ]; }) sources."yeoman-doctor-2.1.0" - sources."yeoman-environment-2.0.0" - (sources."yosay-2.0.0" // { + sources."yeoman-environment-2.0.2" + (sources."yosay-2.0.1" // { dependencies = [ - sources."ansi-styles-3.1.0" + sources."ansi-styles-3.2.0" ]; }) sources."ansi-styles-2.2.1" @@ -32310,7 +34064,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."dot-prop-4.1.1" + sources."dot-prop-4.2.0" sources."graceful-fs-4.1.11" sources."make-dir-1.0.0" sources."unique-string-1.0.0" @@ -32323,7 +34077,7 @@ in sources."slide-1.1.6" sources."lru-cache-4.1.1" sources."shebang-command-1.2.0" - sources."which-1.2.14" + sources."which-1.3.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" sources."shebang-regex-1.0.0" @@ -32352,7 +34106,7 @@ in sources."p-some-2.0.0" sources."aggregate-error-1.0.0" sources."clean-stack-1.3.0" - sources."indent-string-3.1.0" + sources."indent-string-3.2.0" sources."cross-spawn-async-2.2.5" sources."object-assign-4.1.1" sources."deep-extend-0.4.2" @@ -32379,7 +34133,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - (sources."string-width-2.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" @@ -32387,12 +34141,12 @@ in }) sources."through-2.3.8" sources."color-convert-1.9.0" - sources."color-name-1.1.2" + sources."color-name-1.1.3" sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.18" - sources."jschardet-1.4.2" + sources."jschardet-1.5.1" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -32423,7 +34177,7 @@ in sources."lodash._getnative-3.9.1" sources."osx-release-1.1.0" sources."win-release-1.1.1" - sources."semver-5.3.0" + sources."semver-5.4.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -32437,7 +34191,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.15" + sources."mime-types-2.1.16" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" @@ -32455,7 +34209,7 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -32465,9 +34219,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."extsprintf-1.0.2" + sources."extsprintf-1.3.0" sources."json-schema-0.2.3" - sources."verror-1.3.6" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" sources."asn1-0.2.3" (sources."dashdash-1.14.1" // { dependencies = [ @@ -32483,7 +34242,7 @@ in sources."tweetnacl-0.14.5" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.27.0" + sources."mime-db-1.29.0" sources."punycode-1.4.1" sources."camelcase-keys-2.1.0" sources."loud-rejection-1.6.0" @@ -32526,7 +34285,6 @@ in sources."node-status-codes-1.0.0" sources."read-all-stream-3.1.0" sources."readable-stream-2.3.3" - sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -32566,12 +34324,12 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - (sources."boxen-1.2.0" // { + (sources."boxen-1.2.1" // { dependencies = [ sources."camelcase-4.1.0" - sources."chalk-2.0.1" - sources."ansi-styles-3.1.0" - sources."supports-color-4.2.0" + sources."chalk-2.1.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" ]; }) sources."import-lazy-2.1.0" diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 58fbc8133624..412146244278 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.11"; - url = http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz; - sha256 = "1c1vn15lf2b5a8nfa2v2brxm7bwby540nf6q0vkndgkq5qcw96j8"; + version = "1.13"; + url = https://github.com/xavierleroy/cryptokit/archive/release113.tar.gz; + sha256 = "1f4jjnp2a911nqw0hbijyv9vygkk6kw5zx75qs49hfm3by6ij8rq"; inherit zarith; } else { version = "1.10"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 13b85c0c570c..e3b4b4333e1a 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "1.11.0"; + version = "1.11.1"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw"; + sha256 = "04az2bpbhgdhh7y6pagqx4wf3jbmqrm8w20dgimpbj5h3hnak744"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index d6acbaa71422..07422f8cc80d 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -289,7 +289,8 @@ rec { configurator = janePackage { name = "configurator"; - hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80"; + version = "0.9.1"; + hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; propagatedBuildInputs = [ ppx_base ]; meta.description = "Helper library for gathering system configuration"; }; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 29ee65356244..9c4c2e21eddd 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { but up to 100 times faster. It is based on the optimizing native code compiler, the native runtime and an earlier prototype by Alain Frisch. It is build upon Just-In-Time techniques and currently - supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on + supports Unix-like systems (i.e. Linux, BSD or macOS) running on x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index fc7640cc0c94..7e0cad538d58 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,12 +1,23 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" + then { + version = "4.1.3"; + sha256 = "1ifm3izml9hnr7cic1413spnd8x8ka795awsm2xpam3cs8z3j0ca"; + } else { + version = "4.1.2"; + sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; + }; +in + stdenv.mkDerivation { - name = "ocamlnet-4.1.2"; + name = "ocaml${ocaml.version}-ocamlnet-${param.version}"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz; - sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; + url = "http://download.camlcity.org/download/ocamlnet-${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index a1255b2dbc17..57a423a80373 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchzip +{ stdenv, buildOcaml, ocaml, fetchzip , cppo, ppx_tools, result, ounit }: @@ -25,5 +25,6 @@ buildOcaml rec { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; maintainers = [ maintainers.maurer ]; license = licenses.mit; + broken = versionAtLeast ocaml.version "4.05"; }; } diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix new file mode 100644 index 000000000000..92fb18378037 --- /dev/null +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-process-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dsheets"; + repo = "ocaml-process"; + rev = version; + sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Easy process control in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix new file mode 100644 index 000000000000..03ea4a29330c --- /dev/null +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "wasm is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-wasm-${version}"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "spec"; + rev = "v${version}"; + sha256 = "0l67w1dmhgzrhmw3pw2w35h54imax0zdpa9yyqppzzbagxgn87kn"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + makeFlags = [ "-C" "interpreter" ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 1f9e82f866ee..c855919f8027 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = http://pharo.org; license = stdenv.lib.licenses.mit; maintainers = [ ]; - # Pharo VM sources are packaged separately for darwin (OS X) + # Pharo VM sources are packaged separately for darwin (macOS) platforms = with stdenv.lib; intersectLists platforms.mesaPlatforms diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix new file mode 100644 index 000000000000..bf71cf8cfbdd --- /dev/null +++ b/pkgs/development/python-modules/audioread/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "audioread"; + name = "${pname}-${version}"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e"; + }; + + # No tests, need to disable or py3k breaks + doCheck = false; + + meta = { + description = "Cross-platform audio decoding"; + homepage = "https://github.com/sampsyo/audioread"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix new file mode 100644 index 000000000000..2c1850b86abc --- /dev/null +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, python +}: + +buildPythonPackage rec { + pname = "Bottleneck"; + name = "Bottleneck-${version}"; + version = "1.2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy ]; + checkPhase = '' + nosetests -v $out/${python.sitePackages} + ''; + postPatch = '' + substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" + ''; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 7bfad0d4f5e2..8af103cb999d 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; - license = licenses.zpt21; + license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 4267bbb7074f..9ff8df02ac92 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { meta = { homepage = http://www.buildout.org; description = "A software build and configuration system"; - license = stdenv.lib.licenses.zpt21; + license = stdenv.lib.licenses.zpl21; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix new file mode 100644 index 000000000000..db781af2a5de --- /dev/null +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + pname = "distorm3"; + version = "3.3.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/${pname}/${name}.zip"; + sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4"; + }; + + # no tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Powerful Disassembler Library For x86/AMD64"; + homepage = https://github.com/gdabah/distorm; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 20f9d8505abd..cbdbb57181a2 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.3"; + version = "1.11.4"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0swgmwnfi6sa5fg5yxcs4k554cj9zp92w5n454xfsibjjl5dxycy"; + sha256 = "1ckvq2sdlgpy2sqy6fwl84ms9dggvdbys9x76qapm2d9vmknxs5b"; }; patches = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index ce6887f3e062..3a2a0a64ce6f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,9 +1,11 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, +{ lib, buildPythonPackage, fetchPypi, pythonOlder, # Build inputs - dateutil, six, + dateutil, six, ipaddress ? null, # Test inputs email_validator, nose, mock, ukpostcodeparser }: +assert pythonOlder "3.3" -> ipaddress != null; + buildPythonPackage rec { pname = "Faker"; version = "0.7.18"; @@ -24,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dateutil six - ]; + ] ++ lib.optional (pythonOlder "3.3") ipaddress; meta = with lib; { description = "A Python library for generating fake user data"; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix new file mode 100644 index 000000000000..9ad28e52baac --- /dev/null +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: + +buildPythonPackage rec { + pname = "feedgen"; + version = "0.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787"; + }; + + propagatedBuildInputs = [ dateutil lxml ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; + downloadPage = https://github.com/lkiesow/python-feedgen/releases; + homepage = https://github.com/lkiesow/python-feedgen; + license = with licenses; [ bsd2 lgpl3 ]; + maintainers = with maintainers; [ casey ]; + }; +} diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 4c3cdd901276..9a4a19d59611 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,12 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, pythonPackages -, gst-plugins-base -, ncurses +{ fetchurl, stdenv, pkgconfig, python, pygobject3 +, gst-plugins-base, ncurses }: -let - inherit (pythonPackages) python pygobject3; -in stdenv.mkDerivation rec { - name = "gst-python-1.10.4"; +stdenv.mkDerivation rec { + pname = "gst-python"; + version = "1.10.4"; + name = "${pname}-${version}"; src = fetchurl { urls = [ @@ -26,11 +25,14 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preConfigure = '' - export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" + export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides" ''; propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; + # Needed for python.buildEnv + passthru.pythonPath = []; + meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch index 7326b3630f70..7326b3630f70 100644 --- a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch +++ b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 033f08f9587c..c2c2235836f7 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { postPatch = '' sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix new file mode 100644 index 000000000000..a89596828f6a --- /dev/null +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -0,0 +1,38 @@ +{ stdenv, + buildPythonPackage, + fetchPypi, + isPy3k, + pythonOlder, + lib, + requests, + future, + enum34 }: + +buildPythonPackage rec { + pname = "linode-api"; + version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions. + name = "${pname}-${version}"; + + disabled = (pythonOlder "2.7"); + + propagatedBuildInputs = [ requests future ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + + postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") '' + sed -i -e '/"enum34",/d' setup.py + ''); + + doCheck = false; # This library does not have any tests at this point. + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4"; + }; + + meta = { + homepage = "https://github.com/linode/python-linode-api"; + description = "The official python library for the Linode API v4 in python."; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ glenns ]; + }; +} diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 7cdfb9061fb2..a76937278c48 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix new file mode 100644 index 000000000000..5137485a58fd --- /dev/null +++ b/pkgs/development/python-modules/paramz/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }: + +buildPythonPackage rec { + pname = "paramz"; + version = "0.7.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn"; + }; + + propagatedBuildInputs = [ numpy scipy six decorator ]; + + meta = with stdenv.lib; { + description = "Parameterization framework for parameterized model creation and handling"; + homepage = https://github.com/sods/paramz; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix new file mode 100644 index 000000000000..b6e022640cbd --- /dev/null +++ b/pkgs/development/python-modules/pecan/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +# Python deps +, singledispatch +, logutils +, webtest +, Mako +, genshi +, Kajiki +, sqlalchemy +, gunicorn +, jinja2 +, virtualenv +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pecan"; + version = "1.2.1"; + + patches = [ + ./python36_test_fix.patch + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd"; + }; + + propagatedBuildInputs = [ singledispatch logutils ]; + buildInputs = [ + webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv + ]; + + meta = with stdenv.lib; { + description = "Pecan"; + homepage = "http://github.com/pecan/pecan"; + }; +} diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch new file mode 100644 index 000000000000..65e0733ab06e --- /dev/null +++ b/pkgs/development/python-modules/pecan/python36_test_fix.patch @@ -0,0 +1,13 @@ +diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py +index 0573d84..7c98e16 100644 +--- a/pecan/tests/test_conf.py ++++ b/pecan/tests/test_conf.py +@@ -157,7 +157,7 @@ class TestConf(PecanTestCase): + + try: + configuration.conf_from_file(f.name) +- except (ValueError, SystemError) as e: ++ except (ValueError, SystemError, ImportError) as e: + assert 'relative import' in str(e) + else: + raise AssertionError( diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index aba0631a5367..18cd9f021fe9 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.5.1"; + version = "8.7.1"; name = "${pname}-${version}"; meta = { @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; - sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67"; + sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr"; }; } diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index a5ae0aaa137d..cf1e17d3141b 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -19,7 +19,7 @@ in buildPythonPackage { export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages ${stdenv.lib.optionalString stdenv.isDarwin '' - export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \ + export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \ ''} substituteInPlace configure.py \ diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 59fe5f148399..fa2b810964f9 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - license = with licenses; [ psfl zpt20 ]; + license = with licenses; [ psfl zpl20 ]; platforms = platforms.all; priority = 10; }; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix new file mode 100644 index 000000000000..ae08db31b2a8 --- /dev/null +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, simplejson +, mock +, glibcLocales +, html5lib +, pythonOlder +, enum34 +, python +, docutils +, jinja2 +, pygments +, alabaster +, Babel +, snowballstemmer +, six +, sqlalchemy +, whoosh +, imagesize +, requests +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Sphinx"; + version = "1.5.2"; + src = fetchPypi { + inherit pname version; + sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; + }; + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; + # Disable two tests that require network access. + checkPhase = '' + cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' + ''; + propagatedBuildInputs = [ + docutils + jinja2 + pygments + alabaster + Babel + snowballstemmer + six + sqlalchemy + whoosh + imagesize + requests + ]; + + # https://github.com/NixOS/nixpkgs/issues/22501 + # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. + postPatch = '' + substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" + ''; + + meta = { + description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; + homepage = http://sphinx.pocoo.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nand0p ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix new file mode 100644 index 000000000000..31f69971e521 --- /dev/null +++ b/pkgs/development/python-modules/transaction/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, zope_interface +, mock +}: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "transaction"; + version = "2.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r"; + }; + + propagatedBuildInputs = [ zope_interface mock ]; + + meta = with stdenv.lib; { + description = "Transaction management"; + homepage = http://pypi.python.org/pypi/transaction; + license = licenses.zpl20; + }; +} diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix new file mode 100644 index 000000000000..4d09fda83da4 --- /dev/null +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchurl }: + +buildPythonPackage rec { + name = "umemcache-${version}"; + version = "1.6.3"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/u/umemcache/${name}.zip"; + sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; + }; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; + homepage = https://github.com/esnme/ultramemcache; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 8a438fadcd72..4ffd0e94c611 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 5e7c762d03af..fa6a7a613322 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix new file mode 100644 index 000000000000..a4855c23865c --- /dev/null +++ b/pkgs/development/python-modules/zodb/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, isPy3k +, zope_testrunner +, transaction +, six +, wheel +, zope_interface +, zodbpickle +, zconfig +, persistent +, zc_lockfile +, BTrees +, manuel +}: + +buildPythonPackage rec { + pname = "ZODB"; + version = "5.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc"; + }; + + propagatedBuildInputs = [ + manuel + transaction + zope_testrunner + six + wheel + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; + + meta = with stdenv.lib; { + description = "Zope Object Database: object database and persistence"; + homepage = http://pypi.python.org/pypi/ZODB; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index bfde1f0a2151..7af2d11e25c5 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index fc1a3c4c9028..7f2af64d9159 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -6,7 +6,6 @@ , zope_exceptions , zope_testing , six -, subunit }: @@ -21,12 +20,12 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit; + propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; meta = with stdenv.lib; { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 204c74436008..90e72b168025 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -242,7 +242,7 @@ in substituteInPlace lib/sup/crypto.rb \ --replace 'which gpg2' \ - '${which}/bin/which gpg2' + '${which}/bin/which gpg' ''; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 49fd080df454..45a4d8a8358b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.0.2"; + name = "gradle-4.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r"; + sha256 = "0hzdz5cy5dmyqz73qy80q74aiy87jl5vnxcy3imahgaszffglpfm"; }; }; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 8d121b28c956..4627a6bd312a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.16"; + version = "1.0.0"; src = fetchurl { urls = [ "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz" - "https://cocl.us/sbt01316tgz" + "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2"; + sha256 = "0njwch97g69vzxfqhlaibjwbif2vka68dssddk2jlpqlf94lzq4s"; }; patchPhase = '' diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 8f545df2d8b2..b0bc4f4a62ce 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.71"; + version = "2.73"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl"; + sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8"; }; buildCommand = '' diff --git a/pkgs/development/tools/cucumber/Gemfile b/pkgs/development/tools/cucumber/Gemfile new file mode 100644 index 000000000000..f738129eca4f --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cucumber' diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock new file mode 100644 index 000000000000..10c1235ae258 --- /dev/null +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + builder (3.2.3) + cucumber (2.4.0) + builder (>= 2.1.2) + cucumber-core (~> 1.5.0) + cucumber-wire (~> 0.0.1) + diff-lcs (>= 1.1.3) + gherkin (~> 4.0) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) + cucumber-core (1.5.0) + gherkin (~> 4.0) + cucumber-wire (0.0.1) + diff-lcs (1.3) + gherkin (4.1.3) + multi_json (1.12.1) + multi_test (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + cucumber + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix new file mode 100644 index 000000000000..d4ca66c70d7a --- /dev/null +++ b/pkgs/development/tools/cucumber/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "cucumber-${version}"; + + version = (import gemset).cucumber.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A tool for executable specifications"; + homepage = https://cucumber.io/; + license = with licenses; mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix new file mode 100644 index 000000000000..07a80592ddaf --- /dev/null +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -0,0 +1,66 @@ +{ + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + cucumber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih"; + type = "gem"; + }; + version = "2.4.0"; + }; + cucumber-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr"; + type = "gem"; + }; + version = "1.5.0"; + }; + cucumber-wire = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f"; + type = "gem"; + }; + version = "0.0.1"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + gherkin = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79"; + type = "gem"; + }; + version = "4.1.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multi_test = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd"; + type = "gem"; + }; + version = "0.1.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix new file mode 100644 index 000000000000..1cca6a096fe6 --- /dev/null +++ b/pkgs/development/tools/glslviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage, + libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi, + libX11, mesa_glu }: + +stdenv.mkDerivation rec { + name = "glslviewer-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "patriciogonzalezvivo"; + repo = "glslViewer"; + rev = version; + sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + }; + + # Makefile has /usr/local/bin hard-coded for 'make install' + preConfigure = '' + sed s,/usr/local,$out, -i Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 ]; + + meta = with stdenv.lib; { + description = "Live GLSL coding renderer"; + homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.hodapp ]; + }; +} diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 6a16a0372c1e..833b41ae985b 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "a helper script that creates application bundles form GTK+ executables for Mac OS X"; + description = "a helper script that creates application bundles form GTK+ executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling; diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 85d4bfc93b6a..7282fb4970ee 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null @@ -25,7 +25,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in haskell-lib.overrideCabal haskellPackages.lambdabot (self: { +in haskellLib.overrideCabal haskellPackages.lambdabot (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' substituteInPlace src/Main.hs \ diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index ac5495b98d90..0dcb74b803d2 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "The server part of irony."; homepage = "https://melpa.org/#/irony"; maintainers = [ stdenv.lib.maintainers.deepfire ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix deleted file mode 100644 index 34bffff23d4a..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.12.6"; - - # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is - # available upstream; see - # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>. - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # This test succeeds on my machine, but fails on Hydra (for reasons - # not yet understood). - patchPhase = '' - sed -i -e 's|t/aclocal7.sh||' Makefile.in - ''; - - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.12"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix deleted file mode 100644 index 54e697656d2c..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.13.4"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.13"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix deleted file mode 100644 index c797042885a0..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.14.1"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.14"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ae58c72b786d..04911e4cc56d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -5,7 +5,7 @@ }: let - version = "2.28"; + version = "2.29"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; # The prefix prepended to binary names to allow multiple binuntils on the @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2"; + sha256 = "1gqfyksdnj3iir5gzyvlp785mnk60g1pll6zbzbslfchhr4rb8i9"; }; patches = [ @@ -45,6 +45,15 @@ stdenv.mkDerivation rec { # there) and causes a cycle between the lib and bin outputs, so # get rid of it. ./no-plugins.patch + + # remove after 2.29.1/2.30 + (fetchurl { + url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=c6b78c965a96fb152fbd58926edccb5dee2707a5"; + sha256 = "0rkbq5pf7ffgcggfk4czkxin1091bqjj92an9wxnqkgqwq6cx5yr"; + name = "readelf-empty-sections.patch"; + }) + ./elf-check-orphan-input.patch + ./elf-check-orphan-placement.patch ]; # TODO: all outputs on all platform diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch new file mode 100644 index 000000000000..2ec90128347e --- /dev/null +++ b/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch @@ -0,0 +1,99 @@ +From a388b7afeffad6411686d39dc1c62294da48a814 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Wed, 2 Aug 2017 05:10:29 -0700 +Subject: [PATCH] Check ELF section header only for ELF output + +When placing an orphan input section, check ELF section header only for +ELF output. + + PR ld/21884 + * emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Check + ELF section header only for ELF output. + * testsuite/ld-elf/pr21884.d: New test. + * testsuite/ld-elf/pr21884.t: Likewise. + * testsuite/ld-elf/pr21884a.s: Likewise. + * testsuite/ld-elf/pr21884b.s: Likewise. + +(cherry picked from commit db99ecc08f5b66fbe9cb72e90352c7f77ec71a6e) +--- + ld/ChangeLog | 10 ++++++++++ + ld/emultempl/elf32.em | 3 ++- + ld/testsuite/ld-elf/pr21884.d | 11 +++++++++++ + ld/testsuite/ld-elf/pr21884.t | 7 +++++++ + ld/testsuite/ld-elf/pr21884a.s | 5 +++++ + ld/testsuite/ld-elf/pr21884b.s | 5 +++++ + 6 files changed, 40 insertions(+), 1 deletion(-) + create mode 100644 ld/testsuite/ld-elf/pr21884.d + create mode 100644 ld/testsuite/ld-elf/pr21884.t + create mode 100644 ld/testsuite/ld-elf/pr21884a.s + create mode 100644 ld/testsuite/ld-elf/pr21884b.s + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index d2551b6..75ded12 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -2136,7 +2136,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + } + + /* Look through the script to see where to place this section. */ +- if (constraint == 0) ++ if (constraint == 0 ++ && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour) + for (os = lang_output_section_find (secname); + os != NULL; + os = next_matching_output_section_statement (os, 0)) +diff --git a/ld/testsuite/ld-elf/pr21884.d b/ld/testsuite/ld-elf/pr21884.d +new file mode 100644 +index 0000000..52cd2c1 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr21884.d +@@ -0,0 +1,11 @@ ++#source: pr21884a.s ++#source: pr21884b.s ++#ld: -T pr21884.t ++#objdump: -b binary -s ++#notarget: aarch64*-*-* arm*-*-* nds32*-*-* ++# Skip targets which can't change output format to binary. ++ ++.*: file format binary ++ ++Contents of section .data: ++#pass +diff --git a/ld/testsuite/ld-elf/pr21884.t b/ld/testsuite/ld-elf/pr21884.t +new file mode 100644 +index 0000000..d483911 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr21884.t +@@ -0,0 +1,7 @@ ++OUTPUT_FORMAT("binary") ++ ++ENTRY(_main); ++SECTIONS { ++ . = 0; ++ .setup : { *(.setup) } ++} +diff --git a/ld/testsuite/ld-elf/pr21884a.s b/ld/testsuite/ld-elf/pr21884a.s +new file mode 100644 +index 0000000..a3361b2 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr21884a.s +@@ -0,0 +1,5 @@ ++ .text ++ .globl _main ++ .type _main,%function ++_main: ++ .dc.a bar +diff --git a/ld/testsuite/ld-elf/pr21884b.s b/ld/testsuite/ld-elf/pr21884b.s +new file mode 100644 +index 0000000..e533837 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr21884b.s +@@ -0,0 +1,5 @@ ++ .text ++ .globl bar ++ .type bar,%function ++bar: ++ .byte 0 +-- +2.9.3 + diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch new file mode 100644 index 000000000000..7e7566aec43d --- /dev/null +++ b/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch @@ -0,0 +1,161 @@ +From 36088682f447540fd8666a2c437fa232064044a7 Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Thu, 3 Aug 2017 14:01:34 +0930 +Subject: [PATCH] ELF checks for orphan placement + +The loop checking for previous orphan placement should run even when +the output is non-ELF. + + PR ld/21884 + * emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Revert + last change. Rename iself to elfinput. Expand comments. Condition + ELF checks on having both input and output ELF files. Extract.. + (elf_orphan_compatible): ..this new function. +--- + ld/ChangeLog | 8 ++++++ + ld/emultempl/elf32.em | 76 +++++++++++++++++++++++++++++++-------------------- + 2 files changed, 55 insertions(+), 29 deletions(-) + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 75ded12..9ac1840 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -2008,6 +2008,29 @@ output_rel_find (asection *sec, int isdyn) + return last; + } + ++/* Return whether IN is suitable to be part of OUT. */ ++ ++static bfd_boolean ++elf_orphan_compatible (asection *in, asection *out) ++{ ++ /* Non-zero sh_info implies a section with SHF_INFO_LINK with ++ unknown semantics for the generic linker, or a SHT_REL/SHT_RELA ++ section where sh_info specifies a symbol table. (We won't see ++ SHT_GROUP, SHT_SYMTAB or SHT_DYNSYM sections here.) We clearly ++ can't merge SHT_REL/SHT_RELA using differing symbol tables, and ++ shouldn't merge sections with differing unknown semantics. */ ++ if (elf_section_data (out)->this_hdr.sh_info ++ != elf_section_data (in)->this_hdr.sh_info) ++ return FALSE; ++ /* We can't merge two sections with differing SHF_EXCLUDE when doing ++ a relocatable link. */ ++ if (bfd_link_relocatable (&link_info) ++ && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0) ++ return FALSE; ++ return _bfd_elf_match_sections_by_type (link_info.output_bfd, out, ++ in->owner, in); ++} ++ + /* Place an orphan section. We use this to put random SHF_ALLOC + sections in the right segment. */ + +@@ -2064,8 +2087,9 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + lang_output_section_statement_type *os; + lang_output_section_statement_type *match_by_name = NULL; + int isdyn = 0; +- int iself = s->owner->xvec->flavour == bfd_target_elf_flavour; +- unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL; ++ int elfinput = s->owner->xvec->flavour == bfd_target_elf_flavour; ++ int elfoutput = link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour; ++ unsigned int sh_type = elfinput ? elf_section_type (s) : SHT_NULL; + flagword flags; + asection *nexts; + +@@ -2073,7 +2097,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + && link_info.combreloc + && (s->flags & SEC_ALLOC)) + { +- if (iself) ++ if (elfinput) + switch (sh_type) + { + case SHT_RELA: +@@ -2095,6 +2119,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + } + + if (!bfd_link_relocatable (&link_info) ++ && elfinput ++ && elfoutput + && (s->flags & SEC_ALLOC) != 0 + && (elf_section_flags (s) & SHF_GNU_MBIND) != 0) + { +@@ -2135,9 +2161,11 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + secname = ".mbind.text"; + } + +- /* Look through the script to see where to place this section. */ +- if (constraint == 0 +- && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour) ++ /* Look through the script to see where to place this section. The ++ script includes entries added by previous lang_insert_orphan ++ calls, so this loop puts multiple compatible orphans of the same ++ name into a single output section. */ ++ if (constraint == 0) + for (os = lang_output_section_find (secname); + os != NULL; + os = next_matching_output_section_statement (os, 0)) +@@ -2146,29 +2174,19 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + lang_insert_orphan to create a new output section. */ + constraint = SPECIAL; + +- /* SEC_EXCLUDE is cleared when doing a relocatable link. But +- we can't merge 2 input sections with the same name when only +- one of them has SHF_EXCLUDE. Don't merge 2 sections with +- different sh_info. */ ++ /* Check to see if we already have an output section statement ++ with this name, and its bfd section has compatible flags. ++ If the section already exists but does not have any flags ++ set, then it has been created by the linker, possibly as a ++ result of a --section-start command line switch. */ + if (os->bfd_section != NULL +- && (elf_section_data (os->bfd_section)->this_hdr.sh_info +- == elf_section_data (s)->this_hdr.sh_info) + && (os->bfd_section->flags == 0 +- || ((!bfd_link_relocatable (&link_info) +- || (iself && (((elf_section_flags (s) +- ^ elf_section_flags (os->bfd_section)) +- & SHF_EXCLUDE) == 0))) +- && ((s->flags ^ os->bfd_section->flags) ++ || (((s->flags ^ os->bfd_section->flags) + & (SEC_LOAD | SEC_ALLOC)) == 0 +- && _bfd_elf_match_sections_by_type (link_info.output_bfd, +- os->bfd_section, +- s->owner, s)))) ++ && (!elfinput ++ || !elfoutput ++ || elf_orphan_compatible (s, os->bfd_section))))) + { +- /* We already have an output section statement with this +- name, and its bfd section has compatible flags. +- If the section already exists but does not have any flags +- set, then it has been created by the linker, probably as a +- result of a --section-start command line switch. */ + lang_add_section (&os->children, s, NULL, os); + return os; + } +@@ -2244,8 +2262,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + else if ((flags & SEC_ALLOC) == 0) + ; + else if ((flags & SEC_LOAD) != 0 +- && ((iself && sh_type == SHT_NOTE) +- || (!iself && CONST_STRNEQ (secname, ".note")))) ++ && ((elfinput && sh_type == SHT_NOTE) ++ || (!elfinput && CONST_STRNEQ (secname, ".note")))) + place = &hold[orphan_interp]; + else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS | SEC_THREAD_LOCAL)) == 0) + place = &hold[orphan_bss]; +@@ -2255,8 +2273,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s, + place = &hold[orphan_tdata]; + else if ((flags & SEC_READONLY) == 0) + place = &hold[orphan_data]; +- else if (((iself && (sh_type == SHT_RELA || sh_type == SHT_REL)) +- || (!iself && CONST_STRNEQ (secname, ".rel"))) ++ else if (((elfinput && (sh_type == SHT_RELA || sh_type == SHT_REL)) ++ || (!elfinput && CONST_STRNEQ (secname, ".rel"))) + && (flags & SEC_LOAD) != 0) + place = &hold[orphan_rel]; + else if ((flags & SEC_CODE) == 0) +-- +2.9.3 + diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 765fdfb2ea45..65c7e633f8e2 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; @@ -32,18 +32,16 @@ let ccache = stdenv.mkDerivation rec { isGNU = unwrappedCC.isGNU or false; }; inherit (unwrappedCC) lib; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin wrap() { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then - cat > $out/bin/$cname << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@" - EOF - chmod +x $out/bin/$cname + makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ + --run ${stdenv.lib.escapeShellArg extraConfig} \ + --add-flags ${unwrappedCC}/bin/$cname fi } diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 38772a4dd89c..9a8c24fa1685 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { --replace '../compiler_test.pl' $out/bin/compiler_test.pl \ --replace '../$CONFIG_FILE' '$CONFIG_FILE' - wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl + wrapProgram $out/bin/launchn.pl \ + --prefix PERL5LIB : "$PERL5LIB" mkdir -p $out/share/csmith mv $out/bin/compiler_test.in $out/share/csmith/ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 02ff52155b1c..410fd36ef252 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -66,6 +66,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!pythonSupport) "--without-python" ++ stdenv.lib.optional multitarget "--enable-targets=all"; + preConfigure = + # Not sure why this is causing problems, now that the stdenv + # exports CPP=cpp the build fails with strange errors on darwin. + stdenv.lib.optionalString stdenv.cc.isClang '' + unset CPP + ''; + postInstall = '' # Remove Info files already provided by Binutils and other packages. rm -v $out/share/info/bfd.info diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index d5423fea2be8..128ce6008fa8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-07-24"; + version = "2017-07-27"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "a6d9201947aa1468d31ef5c2651251ceeefceb5c"; - sha256 = "0hk5pxzn94ip3nyccxl91zc5n6wd1h2zcbhdq9p38wa4lrnnm5zv"; + rev = "3fc320db320c9aa5180c54e77513f1bcb7407079"; + sha256 = "0kml2rvy5pz8pzl23vfib5vrwxccff9j1jmyq926qv7f5kbzy61b"; }; buildInputs = diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 3e48192d00e4..cb64bd602b79 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co"; + + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix new file mode 100644 index 000000000000..1ec0fef49d38 --- /dev/null +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, ocamlPackages }: + +stdenv.mkDerivation rec { + name = "obelisk-${version}"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "Lelio-Brun"; + repo = "Obelisk"; + rev = "v${version}"; + sha256 = "0kbadib53x7mzqri9asd8fmhl4xfgk4ajgzd7rlq3irf2j3bmcqp"; + }; + + buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; + + installFlags = [ "BINDIR=$(out)/bin" ]; + + meta = { + description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 40501a78b1eb..e1b52102907b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -14,6 +14,8 @@ buildGoPackage rec { sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = http://www.packer.io; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 000000000000..544facda0159 --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/hashicorp/packer"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/packer"; + rev = "07decf99adc272a386e3a013846248810d9aa690"; + sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz"; + }; + } +] diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 88fd2b559848..8c03c32655a9 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, - bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite, - darwin, writeScriptBin, cups +{ stdenv, fetchFromGitHub, fetchpatch +, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg +, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase +, darwin, writeScriptBin, cups }: let @@ -35,54 +36,54 @@ in stdenv.mkDerivation rec { name = "phantomjs-${version}"; version = "2.1.1"; - # needs git submodules, so can't use fetchFromGitHub - src = fetchgit { - rev = "refs/tags/${version}"; - url = "https://github.com/ariya/phantomjs.git"; - sha256 = "1gyc8qxn8v4vm4lgd9njrprz46fg1j5ziq0mm888q8ms0p7jy2pi"; + src = fetchFromGitHub { + owner = "ariya"; + repo = "phantomjs"; + rev = version; + sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq"; }; - buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - AGL ApplicationServices AppKit Cocoa OpenGL - darwin.libobjc fakeClang cups - ]); - - - patchPhase = '' + nativeBuildInputs = [ qmake ]; + buildInputs = [ + bison2 flex fontconfig freetype gperf icu openssl + libjpeg libpng perl python ruby sqlite qtwebkit qtbase + ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AGL ApplicationServices AppKit Cocoa OpenGL + darwin.libobjc fakeClang cups + ]); + + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-hardening.patch?id=42c9154d8c87c9fe434908259b0eddde4d892ca3"; + sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt-components.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-evaluateJavaScript.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-no-websecurity.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; + sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; + }) + ./system-qtbase.patch + ]; + + postPatch = '' patchShebangs . - sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure - touch src/qt/{qtbase,qtwebkit,3rdparty}/.git - '' + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri - substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \ - --replace "ENABLE_3D_RENDERING=1" "ENABLE_3D_RENDERING=0" - sed -i 88d src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.prf - echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/api.pri - echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/widgetsapi.pri - pushd src/qt - - substituteInPlace qtbase/configure \ - --replace /usr/bin/xcode-select true \ - --replace '/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null' 'echo /var/empty' \ - --replace '/usr/bin/xcrun -sdk $sdk -find' 'type -P' - substituteInPlace qtbase/mkspecs/features/mac/default_pre.prf \ - --replace '/usr/bin/xcode-select --print-path 2>/dev/null' "echo ${stdenv.libc}" \ - --replace '/usr/bin/xcrun -find xcrun 2>/dev/null' 'echo success' \ - --replace '/usr/bin/xcodebuild -version' 'echo Xcode 7.2; echo Build version 7C68' \ - --replace 'sdk rez' "" - for file in $(grep -rl /usr/bin/xcrun .); do - substituteInPlace "$file" --replace "/usr/bin/xcrun" ${fakeXcrun}/bin/xcrun - done - substituteInPlace qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable - - popd + substituteInPlace src/phantomjs.pro \ + --replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9" ''; __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - buildPhase = "./build.py --confirm -j$NIX_BUILD_CORES"; - enableParallelBuilding = true; installPhase = '' @@ -99,6 +100,10 @@ in stdenv.mkDerivation rec { $out/bin/phantomjs ''; + preFixup = '' + rm -r ../__nix_qt5__ + ''; + meta = with stdenv.lib; { description = "Headless WebKit with JavaScript API"; longDescription = '' diff --git a/pkgs/development/tools/phantomjs2/system-qtbase.patch b/pkgs/development/tools/phantomjs2/system-qtbase.patch new file mode 100644 index 000000000000..743372b0f0bc --- /dev/null +++ b/pkgs/development/tools/phantomjs2/system-qtbase.patch @@ -0,0 +1,13 @@ +--- a/build.py ++++ b/build.py +@@ -80,9 +80,9 @@ + def qmakePath(): + exe = "qmake" + if platform.system() == "Windows": + exe += ".exe" +- return os.path.abspath("src/qt/qtbase/bin/" + exe) ++ return os.path.abspath("@qtbase@" + exe) + + # returns paths for 3rd party libraries (Windows only) + def findThirdPartyDeps(): + include_dirs = [] diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 85d14835a251..39ee3179e9c4 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.11"; + version = "2.12"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv"; + sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 26e820517c04..bdf71f7d2188 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://code.google.com/p/chromedriver/; + homepage = https://sites.google.com/a/chromium.org/chromedriver; description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix deleted file mode 100644 index 86d4fed8eab0..000000000000 --- a/pkgs/development/web/nodejs/v7.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool, fetchpatch -, callPackage -, darwin ? null -, enableNpm ? true -}@args: - -let - nodejs = import ./nodejs.nix args; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; -in - stdenv.mkDerivation (nodejs // rec { - version = "7.10.1"; - name = "${baseName}-${version}"; - src = fetchurl { - url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa"; - }; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - }) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 593e9d1e5622..a891e637d269 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.2.1"; + version = "8.3.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02"; + sha256 = "0lbfp7j73ig0xa3gh8wnl4g3lji7lm34l0ybfys4swl187c3da63"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 17d80f2e298a..c5bac4db8e5b 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -7,7 +7,7 @@ }: let - version = "2.0.36"; + version = "2.0.46"; inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; qt4 = pyqt4.qt; in @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { urls = [ - "http://ankisrs.net/download/mirror/${name}.tgz" - "http://ankisrs.net/download/mirror/archive/${name}.tgz" + "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + # "http://ankisrs.net/download/mirror/${name}.tgz" + # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v"; + sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr"; }; pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] diff --git a/pkgs/games/anki/fix-paths.patch b/pkgs/games/anki/fix-paths.patch index cfd3424f7990..9b2fd53783e3 100644 --- a/pkgs/games/anki/fix-paths.patch +++ b/pkgs/games/anki/fix-paths.patch @@ -1,7 +1,6 @@ -diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py ---- anki-2.0.33.orig/anki/lang.py 2015-12-27 11:23:02.334908723 +0100 -+++ anki-2.0.33/anki/lang.py 2015-12-27 14:06:00.688003103 +0100 -@@ -71,13 +71,7 @@ def ngettext(single, plural, n): +--- anki-2.0.46/anki/lang.py.orig 2017-08-06 15:30:10.781419237 +0200 ++++ anki-2.0.46/anki/lang.py 2017-08-06 15:31:33.023043036 +0200 +@@ -71,15 +71,7 @@ return localTranslation().ungettext(single, plural, n) def langDir(): @@ -11,6 +10,8 @@ diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py - dir = os.path.join(os.path.dirname(sys.argv[0]), "locale") - if not os.path.isdir(dir): - dir = "/usr/share/anki/locale" +- if not os.path.isdir(dir): +- dir = "/usr/local/share/anki/bin/locale" - return dir + return "@anki@/share/locale" diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 34d767bf310e..ef30a3d350c9 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}: +{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + makeFlags = [ "STRIP=" ]; + preConfigure = '' cat > config.params << EOF bsd_games_cfg_man6dir=$out/share/man/man6 diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix deleted file mode 100644 index 2a2809cc805a..000000000000 --- a/pkgs/games/glestae/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl -, mesa, cmake, lua5, SDL, openal, libvorbis, libogg, zlib, physfs -, freetype, libpng, libjpeg, glew, wxGTK28, libxml2, libpthreadstubs -}: - -stdenv.mkDerivation rec { - name = "glestae-${version}"; - version = "0.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/glestae/${version}/glestae-src-${version}.tar.bz2"; - sha256 = "1k02vf88mms0zbprvy1b1qdwjzmdag5rd1p43f0gpk1sms6isn94"; - }; - - buildInputs = - [ mesa cmake lua5 SDL openal libvorbis libogg zlib physfs - freetype libpng libjpeg glew wxGTK28 libxml2 libpthreadstubs - ]; - - cmakeFlags = [ - "-DLUA_LIBRARIES=-llua" - "-DGAE_DATA_DIR=$out/share/glestae" - ]; - - meta = { - description = "A 3D RTS - fork of inactive Glest project"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - # Note that some data seems to be under separate redistributable licenses - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - downloadPage = "http://sourceforge.net/projects/glestae/files/0.3.2/"; - }; -} diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix new file mode 100644 index 000000000000..8ea8dfccb166 --- /dev/null +++ b/pkgs/games/moon-buggy/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation rec { + baseName = "moon-buggy"; + version = "1.0.51"; + name = "${baseName}-${version}"; + + buildInputs = [ + ncurses + ]; + + src = fetchurl { + url = "http://m.seehuhn.de/programs/${name}.tar.gz"; + sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m"; + }; + + meta = { + description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.rybern]; + platforms = stdenv.lib.platforms.linux; + homepage = http://www.seehuhn.de/pages/moon-buggy; + }; +} diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix new file mode 100644 index 000000000000..27dabe1deacd --- /dev/null +++ b/pkgs/games/rftg/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "rftg-${version}"; + version = "0.9.4"; + + src = fetchurl { + url = "http://keldon.net/rftg/rftg-${version}.tar.bz2"; + sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; + }; + + buildInputs = [ gtk2.dev pkgconfig ]; + + meta = { + homepage = http://keldon.net/rftg/; + description = "Implementation of the card game Race for the Galaxy, including an AI"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.falsifian ]; + }; + +} diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7c4b2fe823c1..9fcab8b1ec9a 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin nckx ]; platforms = platforms.linux; license = licenses.free; - broken = true; downloadPage = http://sourceforge.net/projects/soi/files/; }; } diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index deb283c57c40..4514735bb709 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free MUD client for Mac OS X, Linux and Windows"; + description = "A free MUD client for macOS, Linux and Windows"; homepage = http://tintin.sourceforge.net; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/games/ultrastardx/1.1.nix b/pkgs/games/ultrastardx/1.1.nix deleted file mode 100644 index 9810d5186b0e..000000000000 --- a/pkgs/games/ultrastardx/1.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng -, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }: - -stdenv.mkDerivation rec { - name = "ultrastardx-1.1"; - src = fetchurl { - url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz"; - sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd"; - }; - - buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg - sqlite lua ]; - - - # The fpc is not properly wrapped to add -rpath. I add this manually. - # I even do a trick on lib/lib64 for libgcc, that I expect it will work. - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib" - - sed -i 414,424d Makefile - ''; - - # dlopened libgcc requires the rpath not to be shrinked - dontPatchELF = true; - - meta = { - homepage = http://ultrastardx.sourceforge.net/; - description = "Free and open source karaoke game"; - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/default.nix index ca7d6b35a21b..ce68f190992b 100644 --- a/pkgs/games/ultrastardx/1.3-beta.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -12,18 +12,16 @@ let in stdenv.mkDerivation rec { name = "ultrastardx-${version}"; - version = "1.3.5-beta"; + version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm"; }; - buildInputs = [ - pkgconfig autoreconfHook - fpc libpng - ] ++ sharedLibs; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ fpc libpng ] ++ sharedLibs; postPatch = '' # autoconf substitutes strange things otherwise diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 9ba3a442eb73..af50759fd2fe 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { longDescription = '' Unvanquished is a free, open-source first-person shooter combining real-time strategy elements with a futuristic, sci-fi - setting. It is available for Windows, Linux, and Mac OS X. + setting. It is available for Windows, Linux, and macOS. Features: diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index ef0e4640c393..f83c5ac360a4 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Set in a futuristic cartoon-like world where rocketlauncher-wielding pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a completely free fast-paced first-person shooter (FPS) for Windows, Linux - and Mac OS X. + and macOS. ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index b6009ee72fd0..531560fd309e 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A free fast-paced first-person shooter"; longDescription = '' Xonotic is a free, fast-paced first-person shooter that works on - Windows, OS X and Linux. The project is geared towards providing + Windows, macOS and Linux. The project is geared towards providing addictive arena shooter gameplay which is all spawned and driven by the community itself. Xonotic is a direct successor of the Nexuiz project with years of development between them, and it diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index ea794c3f06b5..936378b05d66 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "102"; + version = "103"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj"; + sha256 = "0xj2k5g1zyl71hk3kwaixk1axbi6s9kqq31c702rl7qkljv6lfp6"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { make compiler=c++ -C higan ''; + # Now the cheats file will be distributed separately installPhase = '' install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps install -m 755 icarus/out/icarus $out/bin/ @@ -43,8 +44,6 @@ stdenv.mkDerivation rec { install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/data/cheats.bml $out/share/higan/ - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ higan/systems/* $out/share/higan/ ''; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { cat <<EOF > $out/bin/higan-init.sh #!${stdenv.shell} - cp --update $out/share/higan/cheats.bml \$HOME/.config/ cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ EOF @@ -68,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a Nintendo multi-system emulator. + Higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix deleted file mode 100644 index 6d0222207944..000000000000 --- a/pkgs/misc/freestyle/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer -, swig, python }: - -stdenv.mkDerivation { - name = "freestyle-2.2.0"; - - src = fetchurl { - url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2; - sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga"; - }; - - buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ]; - - inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri - - buildPhase = '' - export PYTHON_VERSION=2.5 - cd src/system && qmake -makefile PREFIX=\$out && cd .. - cd rendering && qmake -makefile PREFIX=\$out && cd .. - qmake -makefile PREFIX=\$out && make - cd swig && make -f Makefile - cd ../.. - - hide=$out/nix-support/hide - moddir=$out/share/freestyle - mkdir -p $out/bin $moddir $hide - cp -r style_modules $moddir - cp build/lib/*.so* $hide - cp build/Freestyle $hide - cp -r build/linux-g++/debug/lib/python $hide/pylib - cat > $out/bin/Freestyle << EOF - #!/bin/sh - echo use export PYTHONPATH to add your py files to the search path - echo the style modules can be loded from directory $moddir - echo starting Freestyle know - have fun - echo -e "\n\n\n\n" - export PYTHONPATH=$PYTHONPATH:$moddir/style_modules:$hide/pylib - LD_LIBRARY_PATH=$hide - $hide/Freestyle - EOF - chmod +x $out/bin/Freestyle - ''; - - patches = ./patch; - - installPhase = ":"; - - meta = { - description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; - homepage = http://freestyle.sourceforge.net; - license = stdenv.lib.licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch deleted file mode 100644 index dae1b66f9bbd..000000000000 --- a/pkgs/misc/freestyle/patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -U3 -r a/src/Config.pri b/src/Config.pri ---- a/src/Config.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/Config.pri 2008-06-08 03:50:16.000000000 +0200 -@@ -80,11 +80,11 @@ - win32:QMAKE_CXXFLAGS *= /GR /GX - win32:QMAKE_CFLAGS *= /GR /GX - irix-n32:QMAKE_CFLAGS *= -LANG:std --irix-n32:QMAKE_CXXFLAGS *= -LANG:std --linux-g++:QMAKE_CFLAGS *= -Wno-deprecated --linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32 -+QMAKE_CXXFLAGS *= -LANG:std -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC - mac:QMAKE_CFLAGS *= -Wno-deprecated - mac:QMAKE_CXXFLAGS *= -Wno-deprecated - -diff -U3 -r a/src/geometry/Grid.h b/src/geometry/Grid.h ---- a/src/geometry/Grid.h 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/geometry/Grid.h 2008-06-06 22:05:52.000000000 +0200 -@@ -321,7 +321,7 @@ - for (OccludersSet::iterator it = occluders.begin(); - it != occluders.end(); - it++) { -- if ((unsigned)(*it)->userdata2 != _timestamp) { -+ if ((unsigned long)(*it)->userdata2 != _timestamp) { - (*it)->userdata2 = (void*)_timestamp; - visitor.examineOccluder(*it); - } -diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri ---- a/src/libconfig.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/libconfig.pri 2008-06-07 22:23:44.000000000 +0200 -@@ -1,110 +1,32 @@ - # This file should be viewed as a -*- mode: Makefile -*- - --contains( CONFIG, 3ds1.20 ) { - message ("Using 3ds 1.2.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.2.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.2.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0 -- win32:debug: LIBS *= lib3ds-120sd.lib -- win32:release: LIBS *= lib3ds-120s.lib --} -- --contains( CONFIG, 3ds1.30 ) { -- message ("Using 3ds 1.3.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.3.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.3.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0 -- win32:debug: LIBS *= lib3ds-1_3d.lib -- win32:release: LIBS *= lib3ds-1_3.lib --} -+ INCLUDEPATH *= $(lib3ds)/include -+ LIBS *= -L$(lib3ds)/lib -l3ds - - contains( CONFIG, qglviewer ) { - message ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer -- win32: INCLUDEPATH *= $(HOME)\INCLUDE -- win32: QMAKE_LIBDIR *= $(HOME)\LIB -- win32: LIBS *= QGLViewer.lib -+ INCLUDEPATH *= $(mesa)/include -+ LIBS *= -L$(mesa)/lib -lQGLViewer -+ LIBS *= -lQGLViewer - } - --contains( CONFIG, python2.3) { -- message ("Using python 2.3 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.3 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX -- win32: INCLUDEPATH *= C:\python23\include -- win32: QMAKE_LIBDIR *= C:\python23\libs -- win32: LIBS *= python23.lib --} -- --contains( CONFIG, python2.4) { -- message ("Using python 2.4 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.4 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.4 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.4/config -lpython2.4 -- win32: INCLUDEPATH *= C:\python24\include -- win32: QMAKE_LIBDIR *= C:\python24\libs -- win32: LIBS *= python24.lib --} -- --contains( CONFIG, python2.5) { -- message ("Using python 2.5 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.5 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX -- mac: INCLUDEPATH *= /usr/include/python2.5 -- mac: LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.5 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- win32: INCLUDEPATH *= C:\python25\include -- win32: QMAKE_LIBDIR *= C:\python25\libs -- win32: LIBS *= python25.lib --} -+message ("Using python ${PYTHON_VERSION} module") -+INCLUDEPATH *= ${python}/include/python${PYTHON_VERSION} -+LIBS *= -lpthread -lm -lutil -+LIBS *= -L${python}/lib -lpython${PYTHON_VERSION} -L$(HOME)/LIB/LINUX - - - contains( CONFIG, glut) { - message ("Using glut module") -- linux-g++:LIBS *= -lglut -lXi -- cygwin-g++:LIBS *= -lglut -lXi -- mac: LIBS *= -framework Glut -- win32:INCLUDEPATH *= C:\include -- win32: QMAKE_LIBDIR *= C:\lib\glut -- win32: LIBS *= glut32.lib -+ INCLUDEPATH *= ${freeglut}/include -+ LIBS *= -lglut -lXi -L{freeglut}/lib - } - - contains( CONFIG, qglviewer2 ) { -- message ("Using QGLViewer module") -+ MESSAGE ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- mac: LIBS *= -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer2 -- win32: INCLUDEPATH *= C:\include\QGLViewer\2.2.5 -- win32{ -- release{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\release -- } -- debug{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\debug -- } -- } -- win32: LIBS *= QGLViewer2.lib -+ INCLUDEPATH *= $(libqglviewer)/include -+ LIBS *= -L$(libqglviewer)/lib -lQGLViewer - } -diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile ---- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/swig/Makefile 2008-06-08 01:17:31.000000000 +0200 -@@ -19,14 +19,15 @@ - LIBDIR = ../../build/${PLATEFORM}/${BUILD}/lib/python - IPATH = -I../geometry -I../image -I../scene_graph -I../stroke \ - -I../system -I../view_map -I../winged_edge \ -- -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN} -+ -I${python}/include/python${PYTHON_VERSION} - # options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic - #OPTI = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686 - DBUG = #-ggdb #-pg - WARN = -w #-W -Wall #-pedantic -ansi - --CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} --LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -+CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} -fPIC -+LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -L${python}/lib -+ - - SWIG_SRC = Freestyle.i - PY_SRC = ${SWIG_SRC:.i=.py} diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix deleted file mode 100644 index a3c293beab33..000000000000 --- a/pkgs/misc/misc.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ pkgs, stdenv } : - -let inherit (pkgs) stdenv runCommand perl lib; - -in - -{ - - # description see mergeAttrsByVersion in lib/misc.nix - versionedDerivation = name: version: attrsByVersion: base: - pkgs.stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion name version attrsByVersion base); - - /* - Usage example creating a derivation installing ruby, sup and a lib: - - packageOverrides = { - rubyCollection = collection { - name = "ruby"; - list = let l = rubyPackages; in - [ pkgs.ruby l.chronic l.sup ]; - }; - } - */ - collection = {list, name} : runCommand "collection-${name}" {} '' - mkdir -p $out/nix-support - printWords ${builtins.toString list} > $out/nix-support/propagated-user-env-packages - ''; - - /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name} - then you can - ln -s ~/.nix-profile/cdt-envs/name ./nix-deps - and add .nix-deps/{libs,includes} to IDE's such as Eclipse/ Netbeans etc. - To update replace library versions just replace the symlink - */ - cdtEnv = { name, buildInputs }: - stdenv.mkDerivation { - name = "cdt-env-${name}"; - inherit buildInputs; - phases = "installPhase"; - installPhase = '' - set -x - # requires bash4 - PATH=$PATH:${pkgs.pkgconfig}/bin - - perlScript=$(dirname $(dirname ${builtins.getEnv "NIXPKGS_ALL"}))/build-support/buildenv/builder.pl - # now collect includes and lib paths - - # probably the nix hooks work best, so reuse them by reading NIX_CFLAGS_COMPILE and NIX_LDFLAGS - - PKG_CONFIG_KNOWN_PACKAGES=$(pkg-config --list-all | sed 's/ .*//') - - declare -A INCLUDE_PATHS - declare -A LIB_PATHS - declare -A LIBS - declare -A CFLAGS_OTHER - - PKG_CONFIG_LIBS="$(pkg-config --libs $PKG_CONFIG_KNOWN_PACKAGES)" - PKG_CONFIG_CFLAGS="$(pkg-config --cflags $PKG_CONFIG_KNOWN_PACKAGES)" - - for i in $NIX_CFLAGS_COMPILE $PKG_CONFIG_CFLAGS; do - echo i is $i - case $i in - -I*) INCLUDE_PATHS["''${i/-I/}"]= ;; - *) CFLAGS_OTHER["''${i}"]= ;; - esac - echo list is now ''${!INCLUDE_PATHS[@]} - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - case $i in - -L*) - LIB_PATHS["''${i/-L/}"]= ;; - esac - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - echo chekcing $i - case $i in - -l*) LIBS["''${i}"]= ;; - esac; - done - - # build output env - - target="$out/cdt-envs/${name}" - - link(){ - echo "link !!!!" - echo $1 - echo $2 - ( - export out="$1" - export paths="$2" - - export ignoreCollisions=1 - export manifest= - export pathsToLink=/ - ${perl}/bin/perl $perlScript - ) - } - - mkdir -p $target/{include,lib} - link $target/lib "$(echo "''${!LIB_PATHS[@]}")" - link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")" - echo "''${!LIBS[@]}" > $target/libs - echo "''${!CFLAGS_OTHER[@]}" > $target/cflags-other - echo "''${PKG_CONFIG_PATH}" > $target/PKG_CONFIG_PATH - echo "''${PATH}" > $target/PATH - ''; - }; - - - # build a debug version of a package - debugVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-ggdb -O0"; - CXXFLAGS="-ggdb -O0"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -ggdb -O0" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); - - # build an optimized ersion of a package but with symbols and source - symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-g -O2"; - CXXFLAGS="-g -O2"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -g -O2" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); -} diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index fba78132bb51..6ce337855d99 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { - version = "5.0.7"; + version = "6.1.0"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670"; + sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ]; propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' - sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh ./autogen.sh ''; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index e62707afb7ca..a86cfd48d54a 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,31 +1,48 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.90.0.125"; - - meta = with stdenv.lib; { - description = "An adaptive GTK+ theme based on Material Design"; - homepage = https://github.com/tista500/Adapta; - license = with licenses; [ gpl2 cc-by-sa-30 ]; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; + version = "3.91.2.10"; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "0abww5rcbn478w2kdhjlf68bfj8yf8i02nlmrjpp7j1v14r32xr0"; + sha256 = "0bp5fnxgrrrs0ajqw2lbhbarbpvzvajnvcjip6fkl9aa76gz9czy"; }; preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook pkgconfig parallel sassc inkscape libxml2 glib.dev ]; - - buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + parallel + sassc + inkscape + libxml2 + glib.dev + gnome3.gnome_shell + ]; + + buildInputs = [ + gdk_pixbuf + librsvg + gtk-engine-murrine + ]; postPatch = "patchShebangs ."; - configureFlags = "--disable-unity"; + configureFlags = [ + "--disable-gtk_legacy" + "--disable-gtk_next" + "--disable-unity" + ]; + + meta = with stdenv.lib; { + description = "An adaptive Gtk+ theme based on Material Design"; + homepage = https://github.com/tista500/Adapta; + license = with licenses; [ gpl2 cc-by-sa-30 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; } diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix new file mode 100644 index 000000000000..a56f67b8df45 --- /dev/null +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + version = "2017-04-24"; + name = "numix-sx-gtk-theme-${version}"; + + src = fetchurl { + url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; + sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + install -dm 755 "$out/share/themes/" + cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/" + ''; + + meta = { + description = "Gray variation of Numix theme"; + homepage = https://www.gnome-look.org/p/1117412/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.sauyon ]; + }; +} diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index df318cd4f4f9..515471007527 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -109,7 +109,7 @@ let meta = { homepage = http://www.opensource.apple.com/source/cctools/; - description = "Mac OS X Compiler Tools (cross-platform port)"; + description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; }; }; diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 7759d119d50a..4b32697c6ae2 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Cross platform port of the OS X CoreFoundation"; + description = "Cross platform port of the macOS CoreFoundation"; homepage = http://sourceforge.net/projects/opencflite/; license = stdenv.lib.licenses.apsl20; }; diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 6944d2b8b437..5a89940c9dae 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Command line interface to Mac OS X keychains and Security framework"; + description = "Command line interface to macOS keychains and Security framework"; maintainers = with maintainers; [ copumpkin joelteon diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix index c5f7e3acce7e..f0af0f6ba553 100644 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -4,7 +4,7 @@ * This is needed to build GCC on Darwin. * * These are the collection of headers that would normally be available under - * /usr/include in OS X machines with command line tools installed. They need + * /usr/include in macOS machines with command line tools installed. They need * to be in one folder for gcc to use them correctly. */ diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 38f57e7663eb..24686e73e23a 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -25,11 +25,13 @@ stdenv.mkDerivation rec { mv $out/share/bcc/man $out/share/ for f in $out/share/bcc/tools\/*; do - ln -s $f $out/bin/$(basename $f) - wrapProgram $f \ - --prefix LD_LIBRARY_PATH : $out/lib \ - --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ - --prefix PYTHONPATH : :${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages + if [ -x $f ]; then + ln -s $f $out/bin/$(basename $f) + wrapProgram $f \ + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ + --prefix PYTHONPATH : ${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages + fi done ''; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index bab8c5502de1..8adad41fb3bf 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.27.1"; + name = "busybox-1.26.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468"; + sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 7532f8bfc27e..0f8826ecf8dc 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -25,9 +25,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram "$out/sbin/edac-ctl" \ - --set PATH : "" \ - --prefix PATH : "${dmidecode}/bin" \ - --prefix PATH : "${kmod}/bin" + --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix new file mode 100644 index 000000000000..b60ce6f1b4af --- /dev/null +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "openelec-dvb-firmware-${version}"; + version = "0.0.51"; + + src = fetchurl { + url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz"; + sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + DESTDIR="$out" ./install + find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + ''; + + meta = with stdenv.lib; { + description = "DVB firmware from OpenELEC"; + homepage = https://github.com/OpenELEC/dvb-firmware; + license = licenses.unfreeRedistributableFirmware; + platforms = platforms.linux; + priority = 7; + }; +} diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 6a987dc9f5b5..d69d54af96c3 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.01.17"; + version = "0.02.00"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w"; + sha256 = "07df2lb32lbr2ggi84h9pjy6ig18n2961ksji4x1hhb4cvc175dg"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 1b6be8e4aa1b..dd5770744bf7 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , libsysfs, gnutls, openssl -, libcap, sp, docbook_sgml_dtd_31 +, libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -18,13 +18,15 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile + sed -e s/sgmlspl/sgmlspl.pl/ \ + -e s/nsgmls/onsgmls/ \ + -i doc/Makefile ''; makeFlags = "USE_GNUTLS=no"; buildInputs = [ - libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle + libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle ]; buildFlags = "man all ninfod"; diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix deleted file mode 100644 index 9457769f5efb..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ /dev/null @@ -1,54 +0,0 @@ -{stdenv, fetchurl, perl, cross ? null}: - -assert cross == null -> stdenv.isLinux; - -let - version = "2.4.37.9"; - kernelHeadersBaseConfig = if cross == null then - stdenv.platform.kernelHeadersBaseConfig - else - cross.platform.kernelHeadersBaseConfig; -in - -stdenv.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.4/linux-${version}.tar.bz2"; - sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g"; - }; - - targetConfig = if cross != null then cross.config else null; - - platform = - if cross != null then cross.platform.kernelArch else - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.isArm then "arm" else - abort "don't know what the kernel include directory is called for this platform"; - - buildInputs = [perl]; - - patchPhase = '' - sed -i s,/bin/pwd,pwd, Makefile - ''; - - extraIncludeDirs = - if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) - else if stdenv.system == "powerpc-linux" then ["ppc"] else []; - - buildPhase = '' - cp arch/$platform/${kernelHeadersBaseConfig} .config - make mrproper symlinks include/linux/{version,compile}.h \ - ARCH=$platform - yes "" | make oldconfig ARCH=$platform - ''; - - installPhase = '' - mkdir -p $out/include - cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ - $out/include - ''; -} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9700373c852f..deb1d81775b3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -97,6 +97,7 @@ with stdenv.lib; MQ_IOSCHED_DEADLINE y ''} ${optionalString (versionAtLeast version "4.12") '' + BFQ_GROUP_IOSCHED y MQ_IOSCHED_KYBER y IOSCHED_BFQ m ''} @@ -167,6 +168,7 @@ with stdenv.lib; BONDING m NET_L3_MASTER_DEV? y NET_FOU_IP_TUNNELS? y + IP_NF_TARGET_REDIRECT m # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -449,8 +451,11 @@ with stdenv.lib; X86_CHECK_BIOS_CORRUPTION y X86_MCE y - # PCI-Expresscard hotplug support - ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"} + ${optionalString (versionAtLeast version "3.12") '' + HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI + HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support + ''} + # Linux containers. NAMESPACES? y # Required by 'unshare' used by 'nixos-install' diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch deleted file mode 100644 index 8f2418c9efce..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 732e993..77f3ddd 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = 1, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index dd7cbb5..42b2dd5 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 77f3ddd..7aafe63 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_free = cpu_cgroup_css_free, -@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = 1, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 42b2dd5..b4d32a6 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -224,6 +224,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ed60562..44eace9 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/crc-regression.patch b/pkgs/os-specific/linux/kernel/crc-regression.patch deleted file mode 100644 index 623713d16a65..000000000000 --- a/pkgs/os-specific/linux/kernel/crc-regression.patch +++ /dev/null @@ -1,24 +0,0 @@ -See https://github.com/NixOS/nixpkgs/issues/6231 - -v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c"). -That's probably because crypto/crc32c.c was renamed to -crypto/crc32c_generic.c in commit -06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through -the cracks when backporting commit -5d26a105b5a73e5635eae0629b42fa0a90e07b7b. - -So the affected kernels (all that backported the "crypto-" prefix -patches) need this additional patch: - -diff --git a/crypto/crc32c.c b/crypto/crc32c.c -index 06f7018c9d95..aae5829eb681 100644 ---- a/crypto/crc32c.c -+++ b/crypto/crc32c.c -@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void) - module_init(crc32c_mod_init); - module_exit(crc32c_mod_fini); - -+MODULE_ALIAS_CRYPTO("crc32c"); - MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>"); - MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); - MODULE_LICENSE("GPL"); diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index ba5e538c493a..5711779eb869 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -5,6 +5,8 @@ # Dangerous features that can be permanently (for the boot session) disabled at # boot via sysctl or kernel cmdline are left enabled here, for improved # flexibility. +# +# See also <nixos/modules/profiles/hardened.nix> { stdenv, version }: @@ -13,51 +15,86 @@ with stdenv.lib; assert (versionAtLeast version "4.9"); '' -GCC_PLUGINS y # Enable gcc plugin options +# Report BUG() conditions and kill the offending process. +BUG y -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin +${optionalString (stdenv.system == "x86_64-linux") '' + DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory + + # Reduce attack surface by disabling various emulations + IA32_EMULATION n + X86_X32 n + MODIFY_LDT_SYSCALL? n + + VMAP_STACK y # Catch kernel stack overflows + + # Randomize position of kernel and memory. + RANDOMIZE_BASE y + RANDOMIZE_MEMORY y + + # Disable legacy virtual syscalls by default (modern glibc use vDSO instead). + # + # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism, + # which is supposed to be safer than the native variant (wrt. ret2libc), so + # disabling it mainly helps reduce surface. + LEGACY_VSYSCALL_NONE y ''} -DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning +# Safer page access permissions (wrt. code injection). Default on >=4.11. +${optionalString (versionOlder version "4.11") '' + DEBUG_RODATA y + DEBUG_SET_MODULE_RONX y +''} -${optionalString (versionAtLeast version "4.10") '' - BUG_ON_DATA_CORRUPTION y # BUG if kernel struct validation detects corruption +# Mark LSM hooks read-only after init. Conflicts with SECURITY_SELINUX_DISABLE +# (disabling SELinux at runtime); hence, SELinux can only be disabled at boot +# via the selinux=0 boot parameter. +${optionalString (versionAtLeast version "4.12") '' + SECURITY_SELINUX_DISABLE n + SECURITY_WRITABLE_HOOKS n ''} -# Additional validation of commonly targetted structures +DEBUG_WX y # boot-time warning on RWX mappings + +# Stricter /dev/mem +STRICT_DEVMEM y +IO_STRICT_DEVMEM y + +# Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS y DEBUG_NOTIFIERS y DEBUG_LIST y DEBUG_SG y +SCHED_STACK_END_CHECK y +BUG_ON_DATA_CORRUPTION y -HARDENED_USERCOPY y # Bounds check usercopy +# Perform usercopy bounds checking. +HARDENED_USERCOPY y -# Wipe on free with page_poison=1 +# Randomize allocator freelists. +SLAB_FREELIST_RANDOM y + +# Wipe higher-level memory allocations on free() with page_poison=1 PAGE_POISONING y PAGE_POISONING_NO_SANITY y PAGE_POISONING_ZERO y -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y +# Reboot devices immediately if kernel experiences an Oops. +PANIC_ON_OOPS y +PANIC_TIMEOUT -1 -# Stricter /dev/mem -STRICT_DEVMEM y -IO_STRICT_DEVMEM y +GCC_PLUGINS y # Enable gcc plugin options + +${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin +''} # Disable various dangerous settings ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory PROC_KCORE n # Exposes kernel text image layout INET_DIAG n # Has been used for heap based attacks in the past -${optionalString (stdenv.system == "x86_64-linux") '' - DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory - - # Reduce attack surface by disabling various emulations - IA32_EMULATION n - X86_X32 n - - VMAP_STACK y # Catch kernel stack overflows -''} - +# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. +CC_STACKPROTECTOR_REGULAR n +CC_STACKPROTECTOR_STRONG y '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix deleted file mode 100644 index 9587ba356ff5..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.10.105"; - extraMeta.branch = "3.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 51841031eff3..a7b6442cb6e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.4"; + version = "4.12.7"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jasxw8ifkklyfmp0avh53zjymgqwybaz3cmh9l5ydss3xgxfw7l"; + sha256 = "14xyh5wyvp4pmvw4mz9lccw1ijshm7500ijmxzhc9ipjnmp5rhky"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix deleted file mode 100644 index d421633553a2..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.4.79"; - extraMeta.branch = "4.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1a5wprjimsnx49sdg05ndmnx84m24fl48s64jvdpz58i3sss7g8d"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4ad4a5dfef77..40c99cbfd88e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.40"; + version = "4.9.43"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rdcvqkgb8hfzkkzbkhznnab22z43prm56jbrxnqr9acprnfmq2"; + sha256 = "1h0fv24pmrwmnpa6zzknqk7swq15z7dhkvy1hvzkjz4bfqgb28mx"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index a46e48a3e112..adbc5602163b 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -1,15 +1,15 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - version = "4.12.4"; + version = "4.12.5"; revision = "a"; - sha256 = "1c6fin95ppl7lj09vr3vxfwxgf3db15wyncvq07b675fpkdx0nnx"; + sha256 = "03cyh9fsbd95gdd477k1jmk3f9aj5dnw5wr8041y51v8f63vzbpk"; in import ./generic.nix (args // { version = "${version}-${revision}"; extraMeta.branch = "4.12"; - modDirVersion = "${version}"; + modDirVersion = "${version}-hardened"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5106aacbe612..281cc7186b67 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13-rc3"; - modDirVersion = "4.13.0-rc3"; + version = "4.13-rc4"; + modDirVersion = "4.13.0-rc4"; extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl"; + sha256 = "00yiihmgifvl4bas861p87166nb1mf59b6nm5jsfk2zr27pszlyx"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch deleted file mode 100644 index 9f5790862b65..000000000000 --- a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch +++ /dev/null @@ -1,45 +0,0 @@ - -From Yang Shi <> -Subject [PATCH] crypto: rsa - fix a potential race condition in build -Date Fri, 2 Dec 2016 15:41:04 -0800 - - -When building kernel with RSA enabled with multithreaded, the below -compile failure might be caught: - -| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory -| #include "rsapubkey-asn1.h" -| ^ -| compilation terminated. -| CC crypto/rsa-pkcs1pad.o -| CC crypto/algboss.o -| CC crypto/testmgr.o -| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1 -| make[3]: *** Waiting for unfinished jobs.... -| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2 -| make[1]: *** [Makefile:150: sub-make] Error 2 -| make: *** [Makefile:24: __sub-make] Error 2 - -The header file is not generated before rsa_helper is compiled, so -adding dependency to avoid such issue. - -Signed-off-by: Yang Shi <yang.shi@windriver.com> - ---- - crypto/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/crypto/Makefile b/crypto/Makefile -index 99cc64a..8db39f9 100644 ---- a/crypto/Makefile -+++ b/crypto/Makefile -@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o - - $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h - $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h -+$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h - clean-files += rsapubkey-asn1.c rsapubkey-asn1.h - clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h - --- -2.0.2 diff --git a/pkgs/os-specific/linux/kernel/no-xsave.patch b/pkgs/os-specific/linux/kernel/no-xsave.patch deleted file mode 100644 index dde96d7dccd4..000000000000 --- a/pkgs/os-specific/linux/kernel/no-xsave.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/arch/x86/xen/enlighten.c -+++ b/arch/x86/xen/enlighten.c -@@ -168,21 +168,23 @@ static void __init xen_banner(void) - xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); - } - -+static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0; -+static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0; -+ - static void xen_cpuid(unsigned int *ax, unsigned int *bx, - unsigned int *cx, unsigned int *dx) - { -+ unsigned maskecx = ~0; - unsigned maskedx = ~0; - - /* - * Mask out inconvenient features, to try and disable as many - * unsupported kernel subsystems as possible. - */ -- if (*ax == 1) -- maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ -- (1 << X86_FEATURE_ACPI) | /* disable ACPI */ -- (1 << X86_FEATURE_MCE) | /* disable MCE */ -- (1 << X86_FEATURE_MCA) | /* disable MCA */ -- (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ if (*ax == 1) { -+ maskecx = cpuid_leaf1_ecx_mask; -+ maskedx = cpuid_leaf1_edx_mask; -+ } - - asm(XEN_EMULATE_PREFIX "cpuid" - : "=a" (*ax), -@@ -190,9 +192,43 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, - "=c" (*cx), - "=d" (*dx) - : "0" (*ax), "2" (*cx)); -+ -+ *cx &= maskecx; - *dx &= maskedx; - } - -+static __init void xen_init_cpuid_mask(void) -+{ -+ unsigned int ax, bx, cx, dx; -+ -+ cpuid_leaf1_edx_mask = -+ ~((1 << X86_FEATURE_MCE) | /* disable MCE */ -+ (1 << X86_FEATURE_MCA) | /* disable MCA */ -+ (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ -+ if (!xen_initial_domain()) -+ cpuid_leaf1_edx_mask &= -+ ~((1 << X86_FEATURE_APIC) | /* disable local APIC */ -+ (1 << X86_FEATURE_ACPI)); /* disable ACPI */ -+ -+ ax = 1; -+ xen_cpuid(&ax, &bx, &cx, &dx); -+ -+ /* cpuid claims we support xsave; try enabling it to see what happens */ -+ if (cx & (1 << (X86_FEATURE_XSAVE % 32))) { -+ unsigned long cr4; -+ -+ set_in_cr4(X86_CR4_OSXSAVE); -+ -+ cr4 = read_cr4(); -+ -+ if ((cr4 & X86_CR4_OSXSAVE) == 0) -+ cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_XSAVE % 32)); -+ -+ clear_in_cr4(X86_CR4_OSXSAVE); -+ } -+} -+ - static void xen_set_debugreg(int reg, unsigned long val) - { - HYPERVISOR_set_debugreg(reg, val); -@@ -903,6 +939,8 @@ asmlinkage void __init xen_start_kernel(void) - - xen_init_irq_ops(); - -+ xen_init_cpuid_mask(); -+ - #ifdef CONFIG_X86_LOCAL_APIC - /* - * set up the basic apic ops. diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 1747d34fe112..e5f430b4d824 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -21,12 +21,6 @@ in rec { - multithreaded_rsapubkey = - { - name = "multithreaded-rsapubkey-asn1.patch"; - patch = ./multithreaded-rsapubkey-asn1.patch; - }; - bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -37,12 +31,6 @@ rec { patch = ./p9-fixes.patch; }; - no_xsave = - { name = "no-xsave"; - patch = ./no-xsave.patch; - features.noXsave = true; - }; - mips_fpureg_emu = { name = "mips-fpureg-emulation"; patch = ./mips-fpureg-emulation.patch; @@ -63,22 +51,6 @@ rec { patch = ./modinst-arg-list-too-long.patch; }; - ubuntu_fan_4_4 = - { name = "ubuntu-fan"; - patch = ./ubuntu-fan-4.4.patch; - }; - - ubuntu_unprivileged_overlayfs = - { name = "ubuntu-unprivileged-overlayfs"; - patch = ./ubuntu-unprivileged-overlayfs.patch; - }; - - tuxonice_3_10 = makeTuxonicePatch { - version = "2013-11-07"; - kernelVersion = "3.10.18"; - sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; - }; - grsecurity_testing = throw '' Upstream has ceased free support for grsecurity/PaX. @@ -87,11 +59,6 @@ rec { for more information. ''; - crc_regression = - { name = "crc-backport-regression"; - patch = ./crc-regression.patch; - }; - genksyms_fix_segfault = { name = "genksyms-fix-segfault"; patch = ./genksyms-fix-segfault.patch; @@ -107,47 +74,8 @@ rec { patch = ./chromiumos-patches/no-link-restrictions.patch; }; - chromiumos_mfd_fix_dependency = - { name = "mfd_fix_dependency"; - patch = ./chromiumos-patches/mfd-fix-dependency.patch; - }; - - hiddev_CVE_2016_5829 = - { name = "hiddev_CVE_2016_5829"; - patch = fetchpatch { - url = "https://sources.debian.net/data/main/l/linux/4.6.3-1/debian/patches/bugfix/all/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch"; - sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy"; - }; - }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - lguest_entry-linkage = - { name = "lguest-asmlinkage.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" - + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; - sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; - }; - }; - - packet_fix_race_condition_CVE_2016_8655 = - { name = "packet_fix_race_condition_CVE_2016_8655.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c"; - sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki"; - }; - }; - - panic_on_icmp6_frag_CVE_2016_9919 = rec - { name = "panic_on_icmp6_frag_CVE_2016_9919.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2"; - sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; - }; - }; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; patch = fetchpatch { @@ -156,4 +84,9 @@ rec { sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; }; }; + + tag_hardened = rec { + name = "tag-hardened"; + patch = ./tag-hardened.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff deleted file mode 100644 index 88d0381784fd..000000000000 --- a/pkgs/os-specific/linux/kernel/perf.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- perf/config/utilities.mak.orig 2014-01-25 14:55:32.573320370 +0000 -+++ perf/config/utilities.mak 2014-01-25 15:13:34.174337760 +0000 -@@ -186,9 +186,14 @@ - endif - TRY_CC_MSG=echo " CHK $(3)" 1>&2; - -+define newline -+ -+ -+endef -+ - try-cc = $(shell sh -c \ - 'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \ - $(TRY_CC_MSG) \ -- echo "$(1)" | \ -+ echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c | \ - $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \ - rm -f "$$TMP"') diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b6f1f7d9f8a5..f01f39289501 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"} [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/pkgs/os-specific/linux/kernel/tag-hardened.patch new file mode 100644 index 000000000000..ff8a3a127973 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/tag-hardened.patch @@ -0,0 +1,7 @@ +diff --git a/localversion-hardened b/localversion-hardened +new file mode 100644 +index 0000000000..e578045860 +--- /dev/null ++++ b/localversion-hardened +@@ -0,0 +1 @@ ++-hardened diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch deleted file mode 100644 index 39150ad790d3..000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch +++ /dev/null @@ -1,1240 +0,0 @@ -From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh <jay.vosburgh@canonical.com> -Date: Wed, 1 Apr 2015 16:11:09 -0700 -Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) - -Switch to a single tunnel for all mappings, this removes the limitations -on how many mappings each tunnel can handle, and therefore how many Fan -slices each local address may hold. - -NOTE: This introduces a new kernel netlink interface which needs updated -iproute2 support. - -BugLink: http://bugs.launchpad.net/bugs/1470091 -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -Signed-off-by: Andy Whitcroft <apw@canonical.com> -Signed-off-by: Tim Gardner <tim.gardner@canonical.com> - -Conflicts: - include/net/ip_tunnels.h ---- - include/net/ip_tunnels.h | 15 ++++ - include/uapi/linux/if_tunnel.h | 20 +++++ - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 186 +++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 222 insertions(+), 6 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 62a750a..47fec59 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -91,6 +91,19 @@ struct ip_tunnel_dst { - }; - - struct metadata_dst; -+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 -+ * underlay (10.88.0.0/16, for example). Multiple local addresses within -+ * the /16 may be used, but a particular overlay may not span -+ * multiple underlay subnets. -+ * -+ * We store one underlay, indexed by the overlay's high order octet. -+ */ -+#define FAN_OVERLAY_CNT 256 -+ -+struct ip_tunnel_fan { -+/* u32 __rcu *map;*/ -+ u32 map[FAN_OVERLAY_CNT]; -+}; - - struct ip_tunnel { - struct ip_tunnel __rcu *next; -@@ -123,6 +136,7 @@ struct ip_tunnel { - #endif - struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ - unsigned int prl_count; /* # of entries in PRL */ -+ struct ip_tunnel_fan fan; - int ip_tnl_net_id; - struct gro_cells gro_cells; - bool collect_md; -@@ -143,6 +157,7 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) -+#define TUNNEL_FAN __cpu_to_be16(0x4000) - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index af4de90..85a3e4b 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -57,6 +57,10 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, -+ -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_MAP = 33, -+ - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -@@ -132,4 +136,20 @@ enum { - }; - - #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+ -+enum { -+ IFLA_FAN_UNSPEC, -+ IFLA_FAN_MAPPING, -+ __IFLA_FAN_MAX, -+}; -+ -+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) -+ -+struct ip_tunnel_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ __u16 underlay_prefix; -+ __u16 overlay_prefix; -+}; -+ - #endif /* _UAPI_IF_TUNNEL_H_ */ -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index cbb51f3..7a6174b 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,6 +1110,11 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - -+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return -EINVAL; -+ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index a09fb0d..56e8984 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -107,6 +107,7 @@ - #include <linux/init.h> - #include <linux/netfilter_ipv4.h> - #include <linux/if_ether.h> -+#include <linux/inetdevice.h> - - #include <net/sock.h> - #include <net/ip.h> -@@ -208,6 +209,40 @@ drop: - return 0; - } - -+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ -+/* -+ * Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. For an overlay (inner) address Y.A.B.C, the transformation is -+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay -+ * network (the network portion of a /16), "A" and "B" are the low order -+ * two octets of the underlay network host (the host portion of a /16), -+ * and "Y" is a configured first octet of the overlay network. -+ * -+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -+ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -+ * overlay network 99.6.7.0/24. -+ */ -+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+{ -+ unsigned int overlay; -+ u32 daddr, underlay; -+ -+ daddr = ntohl(ip_hdr(skb)->daddr); -+ overlay = daddr >> 24; -+ underlay = tunnel->fan.map[overlay]; -+ if (!underlay) -+ return -EINVAL; -+ -+ *iph = tunnel->parms.iph; -+ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ return 0; -+} -+ - /* - * This function assumes it is being called from dev_queue_xmit() - * and that skb is filled properly by that function. -@@ -215,7 +250,8 @@ drop: - static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct ip_tunnel *tunnel = netdev_priv(dev); -- const struct iphdr *tiph = &tunnel->parms.iph; -+ const struct iphdr *tiph; -+ struct iphdr fiph; - - if (unlikely(skb->protocol != htons(ETH_P_IP))) - goto tx_error; -@@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -+ if (ipip_tunnel_is_fan(tunnel)) { -+ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) -+ goto tx_error; -+ tiph = &fiph; -+ } else { -+ tiph = &tunnel->parms.iph; -+ } -+ - skb_set_inner_ipproto(skb, IPPROTO_IPIP); - - ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); -@@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static void ipip_fan_free_map(struct ip_tunnel *t) -+{ -+ memset(&t->fan.map, 0, sizeof(t->fan.map)); -+} -+ -+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+{ -+ u32 overlay, overlay_mask, underlay, underlay_mask; -+ -+ if ((map->underlay_prefix && map->underlay_prefix != 16) || -+ (map->overlay_prefix && map->overlay_prefix != 8)) -+ return -EINVAL; -+ -+ overlay = ntohl(map->overlay); -+ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ -+ underlay = ntohl(map->underlay); -+ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+ -+ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ return -EINVAL; -+ -+ t->parms.i_flags |= TUNNEL_FAN; -+ -+ /* Special case: overlay 0 and underlay 0 clears all mappings */ -+ if (!overlay && !underlay) { -+ ipip_fan_free_map(t); -+ return 0; -+ } -+ -+ overlay >>= (32 - map->overlay_prefix); -+ t->fan.map[overlay] = underlay; -+ -+ return 0; -+} -+ -+ -+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, -+ struct ip_tunnel_parm *parms) -+{ -+ struct ip_tunnel_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ if (!data[IFLA_IPTUN_FAN_MAP]) -+ return 0; -+ -+ if (parms->iph.daddr) -+ return -EINVAL; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = ipip_fan_set_map(t, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ - static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - return ip_tunnel_newlink(dev, tb, &p); - } - -@@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - - if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || - (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) -@@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -+ /* IFLA_IPTUN_FAN_MAP */ -+ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + - 0; - } - -@@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -+ if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ struct nlattr *fan_nest; -+ int i; -+ -+ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ for (i = 0; i < 256; i++) { -+ if (tunnel->fan.map[i]) { -+ struct ip_tunnel_fan_map map; -+ -+ map.underlay = htonl(tunnel->fan.map[i]); -+ map.underlay_prefix = 16; -+ map.overlay = htonl(i << 24); -+ map.overlay_prefix = 8; -+ if (nla_put(skb, IFLA_FAN_MAPPING, -+ sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - return 0; - - nla_put_failure: -@@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, -+ -+ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -+ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = { - .size = sizeof(struct ip_tunnel_net), - }; - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *ipip_fan_header; -+static unsigned int ipip_fan_version = 3; -+ -+static struct ctl_table ipip_fan_sysctls[] = { -+ { -+ .procname = "version", -+ .data = &ipip_fan_version, -+ .maxlen = sizeof(ipip_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+ -+#endif /* CONFIG_SYSCTL */ -+ - static int __init ipip_init(void) - { - int err; -@@ -541,9 +701,22 @@ static int __init ipip_init(void) - if (err < 0) - goto rtnl_link_failed; - -+#ifdef CONFIG_SYSCTL -+ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", -+ ipip_fan_sysctls); -+ if (!ipip_fan_header) { -+ err = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - out: - return err; - -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&ipip_link_ops); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_failed: - xfrm4_tunnel_deregister(&ipip_handler, AF_INET); - xfrm_tunnel_failed: -@@ -553,6 +726,9 @@ xfrm_tunnel_failed: - - static void __exit ipip_fini(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(ipip_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&ipip_link_ops); - if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) - pr_info("%s: can't deregister tunnel\n", __func__); --- -2.7.4 - -From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh <jay.vosburgh@canonical.com> -Date: Wed, 11 Nov 2015 13:04:50 +0000 -Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation - -Generify the fan mapping support and utilise that to implement fan -mappings over vxlan transport. - -Expose the existance of this functionality (when the module is loaded) -via an additional sysctl marker. - -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -[apw@canonical.com: added feature marker for fan over vxlan.] -Signed-off-by: Andy Whitcroft <apw@canonical.com> ---- - drivers/net/vxlan.c | 245 +++++++++++++++++++++++++++++++++++++++++ - include/net/ip_tunnels.h | 19 +++- - include/net/vxlan.h | 2 + - include/uapi/linux/if_link.h | 1 + - include/uapi/linux/if_tunnel.h | 2 +- - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 242 +++++++++++++++++++++++++++++++--------- - 7 files changed, 453 insertions(+), 65 deletions(-) - -diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 405a7b6..a17cfd0 100644 ---- a/drivers/net/vxlan.c -+++ b/drivers/net/vxlan.c -@@ -23,6 +23,7 @@ - #include <linux/udp.h> - #include <linux/igmp.h> - #include <linux/etherdevice.h> -+#include <linux/inetdevice.h> - #include <linux/if_ether.h> - #include <linux/if_vlan.h> - #include <linux/hash.h> -@@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) - ip_tunnel_collect_metadata(); - } - -+static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr) -+{ -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; -+} -+ -+static void vxlan_fan_flush_map(struct vxlan_dev *vxlan) -+{ -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } -+} -+ -+static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay) -+{ -+ struct ip_fan_map *fan_map; -+ -+ fan_map = vxlan_fan_find_map(vxlan, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ -+ return 0; -+} -+ -+static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; -+ -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); -+ -+ netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n", -+ map->overlay, map->overlay_prefix, -+ map->underlay, map->underlay_prefix, -+ overlay_mask, underlay_mask); -+ -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; -+ -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ vxlan_fan_flush_map(vxlan); -+ return 0; -+ } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return vxlan_fan_del_map(vxlan, map->overlay); -+ -+ if (vxlan_fan_find_map(vxlan, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; -+ -+ list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps); -+ -+ return 0; -+} -+ -+static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan) -+{ -+ struct ifla_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = vxlan_fan_add_map(vxlan, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ -+static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb, -+ struct vxlan_rdst *fan_rdst) -+{ -+ struct ip_fan_map *f_map; -+ union vxlan_addr *va; -+ u32 daddr, underlay; -+ struct arphdr *arp; -+ void *arp_ptr; -+ struct ethhdr *eth; -+ struct iphdr *iph; -+ -+ eth = eth_hdr(skb); -+ switch (eth->h_proto) { -+ case htons(ETH_P_IP): -+ iph = ip_hdr(skb); -+ if (!iph) -+ return -EINVAL; -+ daddr = iph->daddr; -+ break; -+ case htons(ETH_P_ARP): -+ arp = arp_hdr(skb); -+ if (!arp) -+ return -EINVAL; -+ arp_ptr = arp + 1; -+ netdev_dbg(vxlan->dev, -+ "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n", -+ arp_ptr, arp_ptr + skb->dev->addr_len, -+ arp_ptr + skb->dev->addr_len + 4, -+ arp_ptr + (skb->dev->addr_len * 2) + 4); -+ arp_ptr += (skb->dev->addr_len * 2) + 4; -+ memcpy(&daddr, arp_ptr, 4); -+ break; -+ default: -+ netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto); -+ return -EINVAL; -+ } -+ -+ f_map = vxlan_fan_find_map(vxlan, daddr); -+ if (!f_map) -+ return -EINVAL; -+ -+ daddr = ntohl(daddr); -+ underlay = ntohl(f_map->underlay); -+ if (!underlay) -+ return -EINVAL; -+ -+ memset(fan_rdst, 0, sizeof(*fan_rdst)); -+ va = &fan_rdst->remote_ip; -+ va->sa.sa_family = AF_INET; -+ fan_rdst->remote_vni = vxlan->default_dst.remote_vni; -+ va->sin.sin_addr.s_addr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); -+ netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n", -+ daddr, underlay, va->sin.sin_addr.s_addr); -+ -+ return 0; -+} -+ - #if IS_ENABLED(CONFIG_IPV6) - static inline - bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b) -@@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, - goto rt_tx_error; - } - -+ if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) { -+ netdev_dbg(dev, "discard fan to localhost %pI4\n", -+ &dst->sin.sin_addr.s_addr); -+ ip_rt_put(rt); -+ goto tx_free; -+ } -+ - /* Bypass encapsulation if the destination is local */ - if (rt->rt_flags & RTCF_LOCAL && - !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) { -@@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) - return NETDEV_TX_OK; - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct vxlan_rdst fan_rdst; -+ -+ netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n", -+ eth->h_proto, eth->h_dest); -+ if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) { -+ dev->stats.tx_dropped++; -+ kfree_skb(skb); -+ return NETDEV_TX_OK; -+ } -+ vxlan_xmit_one(skb, dev, &fan_rdst, 0); -+ return NETDEV_TX_OK; -+ } -+ - f = vxlan_find_mac(vxlan, eth->h_dest); - did_rsc = false; - -@@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev) - - for (h = 0; h < FDB_HASH_SIZE; ++h) - INIT_HLIST_HEAD(&vxlan->fdb_head[h]); -+ -+ INIT_LIST_HEAD(&vxlan->fan.fan_maps); - } - - static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = { -@@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create); - static int vxlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { -+ struct vxlan_dev *vxlan = netdev_priv(dev); - struct vxlan_config conf; - int err; - -@@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, - conf.remote_ip.sa.sa_family = AF_INET6; - } - -+ if (data[IFLA_VXLAN_FAN_MAP]) { -+ err = vxlan_parse_fan_map(data, vxlan); -+ if (err) -+ return err; -+ } -+ - if (data[IFLA_VXLAN_LOCAL]) { - conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]); - conf.saddr.sa.sa_family = AF_INET; -@@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev) - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */ -+ nla_total_size(sizeof(struct ip_fan_map) * 256) + - 0; - } - -@@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) - } - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct nlattr *fan_nest; -+ struct ip_fan_map *fan_map; -+ -+ fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) || - nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) || - nla_put_u8(skb, IFLA_VXLAN_LEARNING, -@@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net) - return 0; - } - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *vxlan_fan_header; -+static unsigned int vxlan_fan_version = 4; -+ -+static struct ctl_table vxlan_fan_sysctls[] = { -+ { -+ .procname = "vxlan", -+ .data = &vxlan_fan_version, -+ .maxlen = sizeof(vxlan_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+#endif /* CONFIG_SYSCTL */ -+ - static void __net_exit vxlan_exit_net(struct net *net) - { - struct vxlan_net *vn = net_generic(net, vxlan_net_id); -@@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void) - if (rc) - goto out3; - -+#ifdef CONFIG_SYSCTL -+ vxlan_fan_header = register_net_sysctl(&init_net, "net/fan", -+ vxlan_fan_sysctls); -+ if (!vxlan_fan_header) { -+ rc = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - return 0; -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&vxlan_link_ops); -+#endif /* CONFIG_SYSCTL */ - out3: - unregister_netdevice_notifier(&vxlan_notifier_block); - out2: -@@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module); - - static void __exit vxlan_cleanup_module(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(vxlan_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&vxlan_link_ops); - unregister_netdevice_notifier(&vxlan_notifier_block); - destroy_workqueue(vxlan_wq); -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 47fec59..28a38e5 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -100,9 +100,18 @@ struct metadata_dst; - */ - #define FAN_OVERLAY_CNT 256 - -+struct ip_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ u16 underlay_prefix; -+ u16 overlay_prefix; -+ u32 overlay_mask; -+ struct list_head list; -+ struct rcu_head rcu; -+}; -+ - struct ip_tunnel_fan { --/* u32 __rcu *map;*/ -- u32 map[FAN_OVERLAY_CNT]; -+ struct list_head fan_maps; - }; - - struct ip_tunnel { -@@ -157,7 +166,11 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) --#define TUNNEL_FAN __cpu_to_be16(0x4000) -+ -+static inline int fan_has_map(const struct ip_tunnel_fan *fan) -+{ -+ return !list_empty(&fan->fan_maps); -+} - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/net/vxlan.h b/include/net/vxlan.h -index e289ada..542f421 100644 ---- a/include/net/vxlan.h -+++ b/include/net/vxlan.h -@@ -161,6 +161,8 @@ struct vxlan_dev { - struct vxlan_rdst default_dst; /* default destination */ - u32 flags; /* VXLAN_F_* in vxlan.h */ - -+ struct ip_tunnel_fan fan; -+ - struct timer_list age_timer; - spinlock_t hash_lock; - unsigned int addrcnt; -diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h -index 5ad5737..6cde3bf 100644 ---- a/include/uapi/linux/if_link.h -+++ b/include/uapi/linux/if_link.h -@@ -443,6 +443,7 @@ enum { - IFLA_VXLAN_GBP, - IFLA_VXLAN_REMCSUM_NOPARTIAL, - IFLA_VXLAN_COLLECT_METADATA, -+ IFLA_VXLAN_FAN_MAP = 33, - __IFLA_VXLAN_MAX - }; - #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 85a3e4b..d36b150 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -145,7 +145,7 @@ enum { - - #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) - --struct ip_tunnel_fan_map { -+struct ifla_fan_map { - __be32 underlay; - __be32 overlay; - __u16 underlay_prefix; -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index 7a6174b..c821bf1 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,11 +1110,6 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - --static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) --{ -- return tunnel->parms.i_flags & TUNNEL_FAN; --} -- - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; -+ return fan_has_map(&tunnel->fan) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 56e8984..3877b0e 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -108,6 +108,7 @@ - #include <linux/netfilter_ipv4.h> - #include <linux/if_ether.h> - #include <linux/inetdevice.h> -+#include <linux/rculist.h> - - #include <net/sock.h> - #include <net/ip.h> -@@ -209,37 +210,144 @@ drop: - return 0; - } - --static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr) - { -- return tunnel->parms.i_flags & TUNNEL_FAN; -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; - } - --/* -- * Determine fan tunnel endpoint to send packet to, based on the inner IP -- * address. For an overlay (inner) address Y.A.B.C, the transformation is -- * F.G.A.B, where "F" and "G" are the first two octets of the underlay -- * network (the network portion of a /16), "A" and "B" are the low order -- * two octets of the underlay network host (the host portion of a /16), -- * and "Y" is a configured first octet of the overlay network. -+/* Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. -+ * -+ * Given a /8 overlay and /16 underlay, for an overlay (inner) address -+ * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first -+ * two octets of the underlay network (the network portion of a /16), "A" -+ * and "B" are the low order two octets of the underlay network host (the -+ * host portion of a /16), and "Y" is a configured first octet of the -+ * overlay network. -+ * -+ * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would -+ * host overlay subnet 99.3.4.0/24. An overlay network datagram from -+ * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7, -+ * which hosts overlay network subnet 99.6.7.0/24. This transformation is -+ * described in detail further below. -+ * -+ * Using netmasks for the overlay and underlay other than /8 and /16, as -+ * shown above, can yield larger (or smaller) overlay subnets, with the -+ * trade-off of allowing fewer (or more) underlay hosts to participate. -+ * -+ * The size of each overlay network subnet is defined by the total of the -+ * network mask of the overlay plus the size of host portion of the -+ * underlay network. In the above example, /8 + /16 = /24. -+ * -+ * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In -+ * this case, the network portion of the underlay is 10.99.224.0/20, and -+ * the host portion is 0.0.14.5 (12 bits). To determine the overlay -+ * network subnet, the 12 bits of host portion are left shifted 12 bits -+ * (/20 - /8) and ORed with the overlay subnet prefix. This yields an -+ * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by -+ * 12 bits underlay. This yields 12 bits in the overlay network portion, -+ * allowing for 4094 addresses in each overlay network subnet. The -+ * trade-off is that fewer hosts may participate in the underlay network, -+ * as its host address size has shrunk from 16 bits (65534 addresses) in -+ * the first example to 12 bits (4094 addresses) here. -+ * -+ * For fewer hosts per overlay subnet (permitting a larger number of -+ * underlay hosts to participate), the underlay netmask may be made -+ * smaller. -+ * -+ * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion -+ * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift -+ * the 20 bits of host by 4 (so that it's highest order bit is adjacent to -+ * the lowest order bit of the /8 overlay). This yields an overlay subnet -+ * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of -+ * the underlay). This provides more addresses for the underlay network -+ * (approximately 2^20), but each host's segment of the overlay provides -+ * only 4 bits of addresses (14 usable). -+ * -+ * It is also possible to adjust the overlay subnet. -+ * -+ * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider -+ * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left -+ * shifted 15 bits (/20 - /5), yielding an overlay network of -+ * 240.129.0.0/17. An underlay host of 10.88.244.215 would yield an -+ * overlay network of 242.107.128.0/17. -+ * -+ * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for -+ * underlay host 10.224.220.10, the underlay host portion (.10) is left -+ * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18. -+ * This would permit 254 addresses on the underlay, with each overlay -+ * segment providing approximately 2^14 - 2 addresses (16382). -+ * -+ * For packets being encapsulated, the overlay network destination IP -+ * address is deconstructed into its overlay and underlay-derived -+ * portions. The underlay portion (determined by the overlay mask and -+ * overlay subnet mask) is right shifted according to the size of the -+ * underlay network mask. This value is then ORed with the network -+ * portion of the underlay network to produce the underlay network -+ * destination for the encapsulated datagram. -+ * -+ * For example, using the initial example of underlay 10.88.3.4/16 and -+ * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay -+ * subnet 99.3.4.0/24 with specfic host 99.3.4.5. A datagram from -+ * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion -+ * of the address extracted. This is a number of bits equal to underlay -+ * network host portion. In the destination address, the highest order of -+ * these bits is one bit lower than the lowest order bit from the overlay -+ * network mask. -+ * -+ * Using the sample value, 99.6.7.8, the overlay mask is /8, and the -+ * underlay mask is /16 (leaving 16 bits for the host portion). The bits -+ * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8 -+ * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of -+ * which is 1 bit lower than the lowest order overlay address bit). - * -- * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -- * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -- * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -- * overlay network 99.6.7.0/24. -+ * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7. -+ * This value is then ORed with the underlay network portion, -+ * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for -+ * the encapuslated datagram. -+ * -+ * Another transform using the final example: overlay 100.64.0.0/10 and -+ * underlay 10.224.220.0/24. Consider overlay address 100.66.128.1 -+ * sending a datagram to 100.66.200.5. In this case, 8 bits (the host -+ * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay -+ * prefix are masked off, yielding 0.2.192.0. This is right shifted 14 -+ * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay -+ * network portion and the underlay host portion) bits, yielding 0.0.0.11. -+ * This is ORed with the underlay network portion, 10.224.220.0/24, giving -+ * the underlay destination of 10.224.220.11 for overlay destination -+ * 100.66.200.5. - */ - static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) - { -- unsigned int overlay; -+ struct ip_fan_map *f_map; - u32 daddr, underlay; - -+ f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr); -+ if (!f_map) -+ return -ENOENT; -+ - daddr = ntohl(ip_hdr(skb)->daddr); -- overlay = daddr >> 24; -- underlay = tunnel->fan.map[overlay]; -+ underlay = ntohl(f_map->underlay); - if (!underlay) - return -EINVAL; - - *iph = tunnel->parms.iph; -- iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ iph->daddr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); - return 0; - } - -@@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -- if (ipip_tunnel_is_fan(tunnel)) { -+ if (fan_has_map(&tunnel->fan)) { - if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) - goto tx_error; - tiph = &fiph; -@@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = { - - static void ipip_tunnel_setup(struct net_device *dev) - { -+ struct ip_tunnel *t = netdev_priv(dev); -+ - dev->netdev_ops = &ipip_netdev_ops; - - dev->type = ARPHRD_TUNNEL; -@@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev) - dev->features |= IPIP_FEATURES; - dev->hw_features |= IPIP_FEATURES; - ip_tunnel_setup(dev, ipip_net_id); -+ INIT_LIST_HEAD(&t->fan.fan_maps); - } - - static int ipip_tunnel_init(struct net_device *dev) -@@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - --static void ipip_fan_free_map(struct ip_tunnel *t) -+static void ipip_fan_flush_map(struct ip_tunnel *t) - { -- memset(&t->fan.map, 0, sizeof(t->fan.map)); -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } - } - --static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay) - { -- u32 overlay, overlay_mask, underlay, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((map->underlay_prefix && map->underlay_prefix != 16) || -- (map->overlay_prefix && map->overlay_prefix != 8)) -- return -EINVAL; -+ fan_map = ipip_fan_find_map(t, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); - -- overlay = ntohl(map->overlay); -- overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ return 0; -+} - -- underlay = ntohl(map->underlay); -- underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -- return -EINVAL; -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); - -- if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) - return -EINVAL; - -- t->parms.i_flags |= TUNNEL_FAN; -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; - -- /* Special case: overlay 0 and underlay 0 clears all mappings */ -- if (!overlay && !underlay) { -- ipip_fan_free_map(t); -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ ipip_fan_flush_map(t); - return 0; - } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return ipip_fan_del_map(t, map->overlay); -+ -+ if (ipip_fan_find_map(t, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; - -- overlay >>= (32 - map->overlay_prefix); -- t->fan.map[overlay] = underlay; -+ list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps); - - return 0; - } -@@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) - static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - struct ip_tunnel_parm *parms) - { -- struct ip_tunnel_fan_map *map; -+ struct ifla_fan_map *map; - struct nlattr *attr; - int rem, rv; - -@@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - - nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { - map = nla_data(attr); -- rv = ipip_fan_set_map(t, map); -+ rv = ipip_fan_add_map(t, map); - if (rv) - return rv; - } -@@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev) - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + - /* IFLA_IPTUN_FAN_MAP */ -- nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + -+ nla_total_size(sizeof(struct ifla_fan_map)) * 256 + - 0; - } - -@@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -- if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ if (fan_has_map(&tunnel->fan)) { - struct nlattr *fan_nest; -- int i; -+ struct ip_fan_map *fan_map; - - fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); - if (!fan_nest) - goto nla_put_failure; -- for (i = 0; i < 256; i++) { -- if (tunnel->fan.map[i]) { -- struct ip_tunnel_fan_map map; -- -- map.underlay = htonl(tunnel->fan.map[i]); -- map.underlay_prefix = 16; -- map.overlay = htonl(i << 24); -- map.overlay_prefix = 8; -- if (nla_put(skb, IFLA_FAN_MAPPING, -- sizeof(map), &map)) -- goto nla_put_failure; -- } -+ list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; - } - nla_nest_end(skb, fan_nest); - } --- -2.7.4 - diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch deleted file mode 100644 index cfa8009e71ef..000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001 -From: Serge Hallyn <serge.hallyn@ubuntu.com> -Date: Fri, 7 Feb 2014 09:32:46 -0600 -Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts - -Unprivileged mounting, here, refers to root in a non-initial user -namespace performing the mount. In particular, it requires -CAP_SYS_ADMIN toward the task's mounts namespace, alleviating -the concerns of manipulating mount environment for setuid-root -binaries on the host. - -We refuse unprivileged mounting of most filesystem types because -we do not trust the in-kernel superblock parsers to correctly -handle malicious input. - -However, overlayfs does not parse any user-provided data other -than the pathnames passed in. Therefore unprivileged mounting -of overlayfs should be safe. - -Allowing unprivileged mounting of overlayfs filesystems would -allow Ubuntu Trusty users to create overlayfs-based container -snapshots, which would be a huge usability improvement. - -This patch enables unprivileged mounting of overlayfs. - -I tested a few simple combinations, and found that, when -doing (the equivalent of) - -mount -t overlayfs -oupperdir=u,lowerdir=l l t - -(u for upper, l for lower, t for target), - -1. overlayfs mount is always allowed, regardless of ownership -of u, l, or t. However - -2. Creation of new files is allowed so long as u is owned by - T. Otherwise, regardless of ownerships of l and t it is - denied. (This is expected; t was the mountpoint and - 'disapears', so its ownership is irrelevant) - -3. modification of a file 'hithere' which is in l but not yet - in u, and which is not owned by T, is not allowed, even if - writes to u are allowed. This may be a bug in overlayfs, - but it is safe behavior. It also will not cause a problem - for lxc since lxc will ensure that files are mapped into T's - namespace. - -Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> -Signed-off-by: Tim Gardner <tim.gardner@canonical.com> -Signed-off-by: Andy Whitcroft <apw@canonical.com> ---- - fs/overlayfs/super.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 9473e79..50890c2 100644 ---- a/fs/overlayfs/super.c -+++ b/fs/overlayfs/super.c -@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = { - .name = "overlayfs", - .mount = ovl_mount, - .kill_sb = kill_anon_super, -+ .fs_flags = FS_USERNS_MOUNT, - }; - MODULE_ALIAS_FS("overlayfs"); - --- -2.1.0.rc1 - diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 08c7ef47b825..200654909c28 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,24 +2,13 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "1.9.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5"; + sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp"; }; - patches = [ - ./fixes.patch - (fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72 - url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch; - sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; }) - ]; - postPatch = '' - substituteInPlace src/main.c \ - --replace '@GREP@' '${gnugrep}/bin/grep' \ - --replace '@LSMOD@' '${kmod}/bin/lsmod' - ''; installPhase = '' mkdir -p $out/bin $out/etc cp bin/mbpfan $out/bin diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch deleted file mode 100644 index 548cce05c358..000000000000 --- a/pkgs/os-specific/linux/mbpfan/fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index e8af708..6cfee17 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -71,7 +71,7 @@ void check_requirements() - * Check for coretemp and applesmc modules - * Credits: -http://stackoverflow.com/questions/12978794 - */ -- FILE *fd = popen("lsmod | grep coretemp", "r"); -+ FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r"); - char buf[16]; - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { -@@ -87,7 +87,7 @@ void check_requirements() - - pclose(fd); - -- fd = popen("lsmod | grep applesmc", "r"); -+ fd = popen("@LSMOD@ | @GREP@ applesmc", "r"); - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { - DIR* dir = opendir(APPLESMC_PATH); -@@ -145,4 +145,4 @@ int main(int argc, char *argv[]) - void (*fan_control)() = mbpfan; - go_daemon(fan_control); - exit(EXIT_SUCCESS); --} -\ No newline at end of file -+} diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b1b1a4649ba9..4d70533fac7f 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "plymouth-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; - sha256 = "0zympsgy5bbfl2ag5nc1jxlshpx8r1s1yyjisanpx76g88hfh31g"; + url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { --libdir=$out/lib --libexecdir=$out/lib --sysconfdir=/etc + --with-systemdunitdir=$out/etc/systemd/system --localstatedir=/var --with-logo=/etc/plymouth/logo.png --with-background-color=0x000000 diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 69abdbec5d23..8e52bdf936ef 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.11"; + version = "0.02.12"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "0iid3b3284sf89pfp68i1k5mwmr31bqjzasb8clm2sa45ivafx52"; + sha256 = "16ls3rs1wfckl0b2szqqgiv072afy4qjd3r4kz4vf2qj77kjm06w"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 34fc7b5c7592..4ea6b35e377e 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -11,14 +11,32 @@ stdenv.mkDerivation rec { sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; }; + patches = [ + (fetchpatch { # From PR # 42 + name = "rtl8812au-4.11.x-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch; + sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks"; + }) + (fetchpatch { # From PR #46 + name = "rtl8812au-4.11.9-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch; + sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz"; + }) + (fetchpatch { # From PR #43 + name = "rtl8812au-4.12-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch; + sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d"; + }) + ]; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - patchPhase = '' + prePatch = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" - substituteInPlace ./Makefile --replace /sbin/depmod # + substituteInPlace ./Makefile --replace /sbin/depmod \# substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 865be70f34d3..227b67e44863 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -15,13 +15,13 @@ in assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk"; + sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 71a7acab0e12..ca5cea0a0128 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" ]; + postPatch = '' + sed 's|curl/curlbuild\.h|curl/system.h|' -i \ + userspace/libsinsp/marathon_http.cpp \ + userspace/libsinsp/mesos_http.cpp + ''; + preConfigure = '' export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index f1347c197bf6..2ef5d53b0665 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - # it works fine with gnupg v2, but it looks for an executable named gpg - ln -s ${gnupg}/bin/gpg2 $out/bin/gpg + ln -s ${gnupg}/bin/gpg $out/bin/gpg wrapProgram $out/bin/tomb \ --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index ef6a538af79a..277c6d19f5b3 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,15 +6,15 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170726"; + version = "0.0.20170810"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nq1h9k1kf6p28ykids5mmdq50q6zpj0ylhsf94q1hjydcmlb4fv"; + sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"; }; meta = with stdenv.lib; { - homepage = https://www.wireguard.io/; + homepage = https://www.wireguard.com/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 1cac0911b246..1530d20667e3 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_P2P=y CONFIG_TDLS=y + CONFIG_BGSCAN_SIMPLE=y '' + optionalString (pcsclite != null) '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix deleted file mode 100644 index 7decd42b376b..000000000000 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, wvstreams, pkgconfig }: - -stdenv.mkDerivation rec { - name = "wvdial-1.61"; - - src = fetchurl { - url = "http://wvstreams.googlecode.com/files/${name}.tar.gz"; - sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; - }; - - buildInputs = [ wvstreams pkgconfig ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - export makeFlags="prefix=$out" - # not sure about this line - sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in - - sed -e '1i#include <unistd.h>' -i $(find . -name '*.cc') - ''; - - meta = { - description = "A dialer that automatically recognises the modem"; - homepage = http://alumnit.ca/wiki/index.php?page=WvDial; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a47b43a1f0f3..6d3ad657140a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall"; + sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; }; patches = [ diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 3c1cdda8361f..ea8d2651836a 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/confluence/logs/ . rm -r work; ln -sf /run/confluence/work/ . rm -r temp; ln -sf /run/confluence/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.confluence.user.ConfluenceAuthenticator\ + com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat <<EOF > confluence/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index bd044975f224..0013286c03c1 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl +, enableSSO ? false +, crowdProperties ? null +}: stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; @@ -17,6 +20,14 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/atlassian-jira/logs/ . rm -r work; ln -sf /run/atlassian-jira/work/ . rm -r temp; ln -sf /run/atlassian-jira/temp/ . + '' + lib.optionalString enableSSO '' + substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ + --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ + com.atlassian.jira.security.login.SSOSeraphAuthenticator + '' + lib.optionalString (crowdProperties != null) '' + cat <<EOF > atlassian-jira/WEB-INF/classes/crowd.properties + ${crowdProperties} + EOF ''; installPhase = '' diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 3a28368cc81c..3db3d9327031 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -24,11 +24,11 @@ buildGoPackage rec { buildInputs = [ avahi cups ]; meta = with stdenv.lib; { - description = "Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector"; + description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector"; homepage = https://github.com/google/cloud-print-connector; license = licenses.bsd3; maintainers = with maintainers; [ hodapp ]; - # TODO: Fix broken build on OS X. The GitHub presently lists the + # TODO: Fix broken build on macOS. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. platforms = platforms.linux; }; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d4210c31eb83..390bf43d4d62 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb"; + sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index f88b7e74ffd1..4480d9507663 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.22.0"; + version = "3.2.26.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; + sha256 = "04d06640g56f894ypxyp7q5ikbp29nw19w6z136b5kdjy97b6idr"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ced0fd0976f1..64d0a9b79524 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.3"; - sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv"; + version = "1.13.4"; + sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; }) diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 871b3524f424..67172edfd36e 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance HTTP 1.1 server in Erlang"; - homepage = http://http://yaws.hyber.org; + homepage = http://yaws.hyber.org; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu the-kenny ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix new file mode 100644 index 000000000000..4989a01c9e39 --- /dev/null +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl }: + +stdenv.mkDerivation rec { + name = "check_ssl_cert-${version}"; + version = "1.51.0"; + + src = fetchFromGitHub { + owner = "matteocorti"; + repo = "check_ssl_cert"; + rev = "v${version}"; + sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; + + postInstall = '' + wrapProgram $out/bin/check_ssl_cert \ + --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}" + ''; + + meta = with stdenv.lib; { + description = "A Nagios plugin to check the CA and validity of an X.509 certificate"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix new file mode 100644 index 000000000000..2f26bc26ba44 --- /dev/null +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "check-uptime-${version}"; + version = "20161112"; + + src = fetchFromGitHub { + owner = "madrisan"; + repo = "nagios-plugins-uptime"; + rev = "51822dacd1d404b3eabf3b4984c64b2475ed6f3b"; + sha256 = "18q9ibzqn97dsyr9xs3w9mqk80nmmfw3kcjidrdsj542amlsycyk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + postInstall = "ln -sr $out/libexec $out/bin"; + + meta = with stdenv.lib; { + description = "Uptime check plugin for Sensu/Nagios/others"; + homepage = https://github.com/madrisan/nagios-plugins-uptime; + license = licenses.gpl3; + maintainer = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index ccbcce260332..27e6dea01ecc 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.5.0"; + version = "0.8.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1"; + sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix new file mode 100644 index 000000000000..93aae1b867e9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"; + sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc"; + sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8"; + sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix new file mode 100644 index 000000000000..eac962f75606 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "openvpn_exporter-unstable-${version}"; + version = "2017-05-15"; + rev = "a2a179a222144fa9a10030367045f075375a2803"; + + goPackagePath = "github.com/kumina/openvpn_exporter"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "openvpn_exporter"; + inherit rev; + sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4"; + }; + + goDeps = ./openvpn-exporter-deps.nix; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Prometheus exporter for OpenVPN"; + license = licenses.asl20; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a52e1abad875..6915877ef4fb 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; - version = "0.1.0"; + version = "0.3.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -11,9 +11,11 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "snmp_exporter"; - sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp"; + sha256 = "1cklsi3cpalmnp0qjkgb7xbgbkr014hk2z54gfynzvzqjmsbxk6a"; }; + buildInputs = [ net_snmp ]; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b7eb0b5397db..63a781c59413 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,6 +18,7 @@ , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 +, lameSupport ? true, lame , pulseaudioSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu @@ -72,6 +73,7 @@ in stdenv.mkDerivation rec { ++ opt mmsSupport libmms ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 + ++ opt lameSupport lame ++ opt zipSupport zziplib ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio ++ opt (!stdenv.isDarwin && jackSupport) libjack2 @@ -105,6 +107,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag lameSupport "lame-encoder") (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse") (mkFlag (!stdenv.isDarwin && jackSupport) "jack") (mkFlag stdenv.isDarwin "osx") diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix deleted file mode 100644 index f5b939d85bd4..000000000000 --- a/pkgs/servers/restund/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }: -stdenv.mkDerivation rec { - version = "0.4.2"; - name = "restund-${version}"; - src=fetchurl { - url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; - sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; - }; - buildInputs = [ zlib openssl libre librem mysql.lib ]; - makeFlags = [ - "LIBRE_MK=${libre}/share/re/re.mk" - "LIBRE_INC=${libre}/include/re" - "LIBRE_SO=${libre}/lib" - "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' - "USE_MYSQL=1" - ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" - ; - NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql ''; - meta = { - homepage = http://www.creytiv.com/restund.html; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; - inherit version; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/restund-.*[.]tar[.]"; - broken = true; # probably due to glibc-2.20 - }; -} diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix deleted file mode 100644 index 3449645f1851..000000000000 --- a/pkgs/servers/rippled/ripple-rest.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, nodePackages }: - -with lib; - -let - np = nodePackages.override { generated = ./package.nix; self = np; }; -in nodePackages.buildNodePackage rec { - name = "ripple-rest-${version}"; - version = "1.7.0-rc1"; - - src = fetchFromGitHub { - repo = "ripple-rest"; - owner = "ripple"; - rev = version; - sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues np)); - - meta = { - description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network"; - homepage = https://github.com/ripple/ripple-rest; - maintainers = with maintainers; [ offline ]; - license = [ licenses.mit ]; - broken = true; - }; -} diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 3c096a0d52e8..20fb74924d3e 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4753"; + version = "2.0.0.4928"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c"; + sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1356915c1fac..3ede229931eb 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.21"; + version = "10.1.25"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; + sha256 = "1mm0n8sl6grajk5rbrx55333laz5dg2abyl8mlsn7h8vdymfq1bj"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 551f3a015a17..0feae7d72411 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,8 +1,9 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { name = "searx-${version}"; version = "0.12.0"; + namePrefix = ""; src = fetchFromGitHub { owner = "asciimoo"; @@ -25,10 +26,10 @@ pythonPackages.buildPythonApplication rec { pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matejc fpletz profpatsch ]; }; - } +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb08986e7024..7c052d8ef49f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1821,7 +1821,6 @@ let }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 09f75b436da5..8317bd7ce6fa 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -565,8 +565,9 @@ in }; xf86videointel = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + configureFlags = "--with-default-dri=3 --enable-tools"; }; xf86videoxgi = attrs: attrs // { diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index f84515dad611..4e15f472744d 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.9"; + version = "3.4.10"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7"; + sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c328329bb265..5832c8ef8911 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, groff, man-db, glibc, libiconv, pcre2, - gettext, ncurses, python + gettext, ncurses, python3 , writeText , useOperatingSystemEtc ? true - + }: with stdenv.lib; @@ -85,86 +85,118 @@ let $__extra_confdir end ''; -in - -stdenv.mkDerivation rec { - name = "fish-${version}"; - version = "2.6.0"; - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; - - src = fetchurl { - url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + fish = stdenv.mkDerivation rec { + name = "fish-${version}"; + version = "2.6.0"; + + etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + + src = fetchurl { + url = "http://fishshell.com/files/${version}/${name}.tar.gz"; + sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + }; + + buildInputs = [ ncurses libiconv pcre2 ]; + configureFlags = [ "--without-included-pcre2" ]; + + # Required binaries during execution + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ + coreutils gnugrep gnused bc + python3 groff gettext + ] ++ optional (!stdenv.isDarwin) man-db; + + postInstall = '' + sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ + -i "$out/share/fish/functions/grep.fish" + sed -e "s|bc|${bc}/bin/bc|" \ + -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ + -i "$out/share/fish/functions/seq.fish" \ + "$out/share/fish/functions/math.fish" + sed -i "s|which |${which}/bin/which |" \ + "$out/share/fish/functions/type.fish" + sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ + -i "$out/share/fish/functions/fish_prompt.fish" + sed -e "s|gettext |${gettext}/bin/gettext |" \ + -e "s|which |${which}/bin/which |" \ + -i "$out/share/fish/functions/_.fish" + sed -e "s|uname|${coreutils}/bin/uname|" \ + -i "$out/share/fish/functions/__fish_pwd.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -e "s|sed |${gnused}/bin/sed |" \ + -i "$out/share/fish/functions/alias.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -i "s|nroff |${groff}/bin/nroff |" \ + "$out/share/fish/functions/__fish_print_help.fish" + sed -i "s|/sbin /usr/sbin||" \ + "$out/share/fish/functions/__fish_complete_subcommand_root.fish" + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + -i "$out/share/fish/functions/fish_default_key_bindings.fish" + sed -e "s|python3|${getBin python3}/bin/python3|" \ + -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} + + '' + optionalString stdenv.isLinux '' + sed -e "s| ul| ${utillinux}/bin/ul|" \ + -i "$out/share/fish/functions/__fish_print_help.fish" + for cur in $out/share/fish/functions/*.fish; do + sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ + -i "$cur" + done + + '' + optionalString (!stdenv.isDarwin) '' + sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ + "$out/share/fish/functions/fish_prompt.fish" + sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ + "$out/share/fish/tools/create_manpage_completions.py" + sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ + "$out/share/fish/functions/man.fish" + '' + optionalString useOperatingSystemEtc '' + tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} + '' + '' + tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} + ''; + + meta = with stdenv.lib; { + description = "Smart and user-friendly command line shell"; + homepage = http://fishshell.com/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ ocharles ]; + }; + + passthru = { + shellPath = "/bin/fish"; + }; }; - buildInputs = [ ncurses libiconv pcre2 ]; - configureFlags = [ "--without-included-pcre2" ]; - - # Required binaries during execution - # Python: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ - coreutils gnugrep gnused bc - python groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; - - postInstall = '' - sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ - -i "$out/share/fish/functions/grep.fish" - sed -e "s|bc|${bc}/bin/bc|" \ - -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ - -i "$out/share/fish/functions/seq.fish" \ - "$out/share/fish/functions/math.fish" - sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" - sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ - -i "$out/share/fish/functions/fish_prompt.fish" - sed -e "s|gettext |${gettext}/bin/gettext |" \ - -e "s|which |${which}/bin/which |" \ - -i "$out/share/fish/functions/_.fish" - sed -e "s|uname|${coreutils}/bin/uname|" \ - -i "$out/share/fish/functions/__fish_pwd.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -e "s|sed |${gnused}/bin/sed |" \ - -i "$out/share/fish/functions/alias.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -i "s|nroff |${groff}/bin/nroff |" \ - "$out/share/fish/functions/__fish_print_help.fish" - sed -i "s|/sbin /usr/sbin||" \ - "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${ncurses.out}/bin/clear;|" \ - -i "$out/share/fish/functions/fish_default_key_bindings.fish" \ - - '' + optionalString stdenv.isLinux '' - sed -e "s| ul| ${utillinux}/bin/ul|" \ - -i "$out/share/fish/functions/__fish_print_help.fish" - for cur in $out/share/fish/functions/*.fish; do - sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ - -i "$cur" - done - - '' + optionalString (!stdenv.isDarwin) '' - sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ - "$out/share/fish/functions/fish_prompt.fish" - sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ - "$out/share/fish/tools/create_manpage_completions.py" - sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ - "$out/share/fish/functions/man.fish" - '' + optionalString useOperatingSystemEtc '' - tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} - '' + '' - tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} - ''; - - meta = with stdenv.lib; { - description = "Smart and user-friendly command line shell"; - homepage = http://fishshell.com/; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ ocharles ]; + tests = { + + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; + in '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} + ''; }; - passthru = { - shellPath = "/bin/fish"; - }; -} + # FIXME(Profpatsch) replace withTests stub + withTests = flip const; + +in withTests tests fish diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix index 5da96adaabdb..a5482ce93cc7 100644 --- a/pkgs/shells/grml-zsh-config/default.nix +++ b/pkgs/shells/grml-zsh-config/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchFromGitHub, lib , zsh, coreutils, inetutils, procps, txt2tags }: with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.12.4"; + version = "0.14.2"; - src = fetchurl { - url = "http://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_${version}.tar.gz"; - sha256 = "1cbedc41e32787c37c2ed546355a26376dacf2ae1fab9551c9ace3e46d236b72"; + src = fetchFromGitHub { + owner = "grml"; + repo = "grml-etc-core"; + rev = "v${version}"; + sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm"; }; buildInputs = [ zsh coreutils inetutils procps txt2tags ]; @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://grml.org/zsh/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; + maintainers = with maintainers; [ msteen rvolosatovs ]; }; } diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix new file mode 100644 index 000000000000..eebbc6d1b867 --- /dev/null +++ b/pkgs/shells/oil/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, coreutils }: +let + version = "0.0.0"; +in +stdenv.mkDerivation { + name = "oil-${version}"; + + src = fetchurl { + url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; + sha256 = "1mvyvvzw149piwa7xdl3byyn7h31p4cnrf3w9dxr5qfd9vc4gmsm"; + }; + + postPatch = '' + patchShebangs build + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + # Stripping breaks the bundles by removing the zip file from the end. + dontStrip = true; + + meta = { + homepage = https://www.oilshell.org/; + + description = "A new unix shell, still in its early stages"; + + license = with lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 8299bef691aa..50481dd941bb 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.3.1"; + version = "5.4.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1"; + sha256 = "17qg4iqhvkxsmk1p04brkjq20vb7zx6d8qx1r2q8v6cy4qvqjbjr"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x"; + sha256 = "1qhw00y0gnr66bil48hj4wjm0cbjxfdkz5hyb82garp8r8rbhiy4"; }; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index cac33a1bebb2..74dcf2f009b3 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -305,7 +305,7 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - cc = import ../../build-support/cc-wrapper { + cc = lib.callPackageWith {} ../../build-support/cc-wrapper { inherit (pkgs) stdenv; inherit shell; nativeTools = false; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index dc3369f6611c..b6bca3e1f562 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -336,8 +336,20 @@ fi # Set the relevant environment variables to point to the build inputs # found above. +# +# These `depOffset`s tell the env hook what sort of dependency +# (ignoring propagatedness) is being passed to the env hook. In a real +# language, we'd append a closure with this information to the +# relevant env hook array, but bash doesn't have closures, so it's +# easier to just pass this in. + _addToNativeEnv() { local pkg="$1" + if [[ -n "${crossConfig:-}" ]]; then + local -i depOffset=-1 + else + local -i depOffset=0 + fi # Run the package-specific hooks set by the setup-hook scripts. runHook envHook "$pkg" @@ -349,6 +361,7 @@ done _addToCrossEnv() { local pkg="$1" + local -i depOffset=0 # Run the package-specific hooks set by the setup-hook scripts. runHook crossEnvHook "$pkg" @@ -737,7 +750,7 @@ configurePhase() { buildPhase() { runHook preBuild - if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then + if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix new file mode 100644 index 000000000000..51e8ae53736c --- /dev/null +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -0,0 +1,89 @@ +{ lib, clangStdenv, clang-sierraHack-stdenv, stdenvNoCC }: + +let + makeBigExe = stdenv: prefix: rec { + + count = 500; + + sillyLibs = lib.genList (i: stdenv.mkDerivation rec { + name = "${prefix}-fluff-${toString i}"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > ${name}.c + unsigned int asdf_${toString i}(void) { + return ${toString i}; + } + EOF + ''; + buildPhase = '' + $CC -std=c99 -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib + ''; + installPhase = '' + mkdir -p "$out/lib" + mv lib${name}.dylib "$out/lib" + ''; + meta.platforms = lib.platforms.darwin; + }) count; + + finalExe = stdenv.mkDerivation rec { + name = "${prefix}-final-asdf"; + unpackPhase = '' + src=$PWD + cat << 'EOF' > main.cxx + + #include <cstdlib> + #include <iostream> + + ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)} + + unsigned int (*funs[])(void) = { + ${toString (lib.genList (i: "asdf_${toString i},") count)} + }; + + int main(int argc, char **argv) { + bool ret; + unsigned int i = 0; + for (auto f : funs) { + if (f() != i++) { + std::cerr << "Failed to get expected response from function #" << i << std::endl; + return EXIT_FAILURE; + } + } + return EXIT_SUCCESS; + } + EOF + ''; + buildPhase = '' + $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o ${prefix}-asdf + ''; + buildInputs = sillyLibs; + installPhase = '' + mkdir -p "$out/bin" + mv ${prefix}-asdf "$out/bin" + ''; + meta.platforms = lib.platforms.darwin; + }; + + }; + + good = makeBigExe clang-sierraHack-stdenv "good"; + + bad = makeBigExe clangStdenv "bad"; + +in stdenvNoCC.mkDerivation { + name = "macos-sierra-shared-test"; + buildInputs = [ good.finalExe bad.finalExe ]; + # TODO(@Ericson2314): Be impure or require exact MacOS version of builder? + buildCommand = '' + if bad-asdf + then echo "bad-asdf can succeed on non-sierra, OK" >&2 + else echo "bad-asdf should fail on sierra, OK" >&2 + fi + + # Must succeed on all supported MacOS versions + good-asdf + + touch $out + ''; + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index a35e473ec366..7c4bb988b629 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - ${"NIX_${stdenv.cc.infixSalt_}LDFLAGS"} = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index b14364c2b79e..ba029814f392 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6"; src = fetchurl { - url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + "${name}.tar.gz"; sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index fd9cf2bacbfa..c326533ece14 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; - pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ]; + propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; + pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; postInstall = "wrapPythonPrograms"; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 7917403a915e..e8d3a2e185ee 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -12,16 +12,15 @@ stdenv.mkDerivation { buildInputs = [ txt2man makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; + postPatch = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" - sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply - mv duply "$out/bin" + install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin" - "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz" + ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]} + "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix new file mode 100644 index 000000000000..e569d9b6d598 --- /dev/null +++ b/pkgs/tools/backup/flockit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "flockit-${version}"; + version = "2012-08-11"; + + src = fetchFromGitHub { + owner = "smerritt"; + repo = "flockit"; + rev = "5c2b2092f8edcc8e3e2eb6ef66c968675dbfa686"; + sha256 = "0vajck9q2677gpn9a4flkyz7mw69ql1647cjwqh834nrcr2b5164"; + }; + + installPhase = '' + mkdir -p $out/lib $out/bin + cp ./libflockit.so $out/lib + + (cat <<EOI + #!/bin/sh + env LD_PRELOAD="$out/lib/libflockit.so" FLOCKIT_FILE_PREFIX=\$1 \''${@:2} + EOI + ) > $out/bin/flockit + chmod +x $out/bin/flockit + ''; + + meta = with stdenv.lib; { + description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)"; + longDescription = '' + This library and tool exists solely because rsync doesn't have file locking. + + It's not used like a normal library; you don't link against it, and you + don't have to patch your source code to use it. It's inserted between your + program and its libraries by use of LD_PRELOAD. + + For example: + + $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST + + Besides the library a handy executable is provided which can simplify the above to: + + $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST + + Also see the following blog post: + https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ + ''; + homepage = https://github.com/smerritt/flockit; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 390727ec7399..bc5755628d28 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://restic.github.io; description = "A backup program that is fast, efficient and secure"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm ]; }; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 14076a757f49..4d6ddd546dbc 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,31 +1,37 @@ -{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { name = "unetbootin-${version}"; - version = "613"; + version = "655"; - src = fetchurl { - url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz"; - sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q"; + src = fetchFromGitHub { + owner = "unetbootin"; + repo = "unetbootin"; + rev = version; + sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; }; - sourceRoot = "."; + sourceRoot = "${name}-src/src/unetbootin"; - buildInputs = [ makeWrapper qt4 qmake4Hook ]; + buildInputs = [ qt4 ]; + nativeBuildInputs = [ makeWrapper qmake4Hook ]; + enableParallelBuilding = true; # Lots of nice hard-coded paths... - postUnpack = '' + postPatch = '' substituteInPlace unetbootin.cpp \ - --replace /sbin/fdisk ${utillinux}/sbin/fdisk \ - --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \ - --replace /sbin/blkid ${utillinux}/sbin/blkid \ - --replace /bin/df ${coreutils}/bin/df \ - --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \ - --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \ + --replace /bin/df ${coreutils}/bin/df \ + --replace /sbin/blkid ${utillinux}/sbin/blkid \ + --replace /sbin/fdisk ${utillinux}/sbin/fdisk \ + --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \ + --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \ + --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \ --replace /usr/share/syslinux ${syslinux}/share/syslinux + substituteInPlace main.cpp \ --replace /usr/share/unetbootin $out/share/unetbootin + substituteInPlace unetbootin.desktop \ --replace /usr/bin $out/bin ''; @@ -46,15 +52,15 @@ stdenv.mkDerivation rec { cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 ''; meta = with stdenv.lib; { - homepage = http://unetbootin.sourceforge.net/; + homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ebzzry ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ebzzry ]; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 15269bbd6c76..76704c254bdb 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, zlib, utillinux }: let name = "pigz"; - version = "2.3.3"; + version = "2.3.4"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "172hdf26k4zmm7z8md7nl0dph2a7mhf3x7slb9bhfyff6as6g2sf"; + sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg"; }; + enableParallelBuilding = true; + buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; doCheck = stdenv.isLinux; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index fb9301bf1ced..2be3bf167dad 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { owner = "facebook"; }; - # The Makefiles don't properly use file targets, but blindly rebuild - # all dependencies on every make invocation. So no nice phases. :-( - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - makeFlags = [ "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}" ]; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 7931df2cc57d..9e640b18a924 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.darlinghq.org/; - description = "Darling lets you open OS X dmgs on Linux"; + description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index db69fa64c84d..b5f178d59fc0 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -13,13 +13,13 @@ in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.0"; + version = "4.2.1"; prefix = "irods"; name = "${prefix}-${version}"; src = fetchurl { url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e"; + sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq"; }; # Patches: diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index fcb12239650f..3d278cbce6fb 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.66"; + version = "5.4.67"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "0aimci6n7dvfwa690rbcd6fdrsvcanxy53j752v3151x6gahw3gb"; + sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 1dceb210235c..6bdff06699b9 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,12 +1,16 @@ -{stdenv, fetchgit, autoconf, automake, boost, zlib, libpng, libjpeg, libtiff}: - -stdenv.mkDerivation { - name = "povray-3.7"; - - src = fetchgit { - url = "https://github.com/POV-Ray/povray.git"; - rev = "39ce8a24e50651904010dda15872d63be15d7c37"; - sha256 = "1nbs9vwf6fn3jkm0myfnbn7nrc17q8ppzmr4h7kj49nr0710ifw0"; +{ stdenv, fetchFromGitHub, autoconf, automake, boost +, zlib, libpng, libjpeg, libtiff +}: + +stdenv.mkDerivation rec { + name = "povray-${version}"; + version = "3.7.0.3"; + + src = fetchFromGitHub { + owner = "POV-Ray"; + repo = "povray"; + rev = "v${version}"; + sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; }; @@ -40,6 +44,6 @@ stdenv.mkDerivation { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index f38705cc9d13..13035698827f 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index a18fabcb4e5f..d11392599220 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "aescrypt-${version}"; src = fetchurl { - url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; }; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 099e9ee0849d..48bcf143bb6f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPackages -, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ] ++ optional aclSupport acl ++ optional attrSupport attr - ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ] # due to patch + ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ] # TODO(@Ericson2314): Investigate whether Darwin could benefit too ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 396d26a6cd14..86a8d3f234b3 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; + sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbc7a2e7e46c..810bf06527b0 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -27,10 +27,10 @@ in stdenv.mkDerivation rec { mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find po4a scripts -type f -exec sed -r \ - -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \ -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ - -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9c0d51c4a857..6472f1ea09c8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf + # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. pythonPath = with python3.pkgs; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix new file mode 100644 index 000000000000..9172c13636a6 --- /dev/null +++ b/pkgs/tools/misc/geekbench/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "geekbench-${version}"; + version = "4.1.1"; + + src = fetchurl { + url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r dist/Geekbench-${version}-Linux/. $out/bin + rm $out/bin/geekbench_x86_32 + + for f in geekbench4 geekbench_x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + done + ''; + + meta = with stdenv.lib; { + description = "Cross-platform benchmark"; + homepage = http://geekbench.com/; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index b1f3cff0839e..00cb6fd44f2e 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.3.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "02x8brzlyx7qpxb1pgs74iv1gdykvs7cihff0rzjmh7bp1y1xq1x"; + sha256 = "03jv8l5hj3hw91vk69pxhc2zvxyzc5sfvxf700rq83wsjh6gb5iz"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 1c4e2c992832..8ea86d1a7a57 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -22,13 +22,26 @@ let }; }); in { + aggregates = glPlugin rec { + name = "graylog-aggregates-${version}"; + pluginName = "graylog-plugin-aggregates"; + version = "1.1.1"; + src = fetchurl { + url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1wx5i8ls7dgffsy35i91gkrj6p9nh2jbar9pgas190lfb9yk45bx"; + }; + meta = { + homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; + description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; + }; + }; auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "1.0.6"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0wvdf2rnjrhdw1vp7bc7008s45rggzq57lh8k6s3q35rppligaqd"; + sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -64,13 +77,13 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/v${version}/${pluginName}-${version}.jar"; - sha256 = "1r12hpjp2ggmhsapgrk829va94aw44qi2kqqkgf1fj9ih4k0c837"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-jabber; + homepage = https://github.com/graylog-labs/graylog-plugin-jabber; description = "Jabber Alarmcallback Plugin for Graylog"; }; }; @@ -103,13 +116,13 @@ in { redis = glPlugin rec { name = "graylog-redis-${version}"; pluginName = "graylog-plugin-redis"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0hwz83m9gwx0fdapc63v3lr1q6acbphssqwp4qqzz78wg2w79xgi"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-redis; + homepage = https://github.com/graylog-labs/graylog-plugin-redis; description = "Redis plugin for Graylog"; }; }; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 726c7a115eef..a66b32c789c2 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gti-${version}"; - version = "2016-12-07"; + version = "1.6.1"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; - rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32"; - sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr"; + rev = "v${version}"; + sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51"; }; installPhase = '' diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 2ecaae6a33f4..ea2b863cd776 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn"; + sha256 = "1skkclvkqayqsbywja2fhv18l4rn9kg2da6bkip82zrwd713akl3"; }; - patchPhase = '' - substituteInPlace ./neofetch \ - --replace "/usr/share" "$out/share" - ''; + # This patch is only needed so that Neofetch 3.2.0 can look for + # configuration file, w3m directory (for fetching images) and ASCII + # directory properly. It won't be needed in subsequent releases. + patches = [ + (fetchpatch { + name = "nixos.patch"; + url = "https://github.com/konimex/neofetch/releases/download/3.2.0/nixos.patch"; + sha256 = "0c6vsa74bxq6qlgbv3rrkhzkpvnq4304s6y2r1bl0sachyakaljy"; + }) + ]; + dontBuild = true; makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=" + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc" ]; meta = with stdenv.lib; { @@ -28,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/dylanaraps/neofetch; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ alibabzo ]; + maintainers = with maintainers; [ alibabzo konimex ]; }; } diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 075949f47e1a..5fda26bacad1 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { - owner = "thoughtbot"; + owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd"; + sha256 = "1x7ql530rj4yj50dzp8526mz92g4hhqxnig1qgiq3h3k815p31qb"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 16f504369909..c68d41532c22 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { --prefix=$out \ --moz-plugin-path=$out/${mozillaPluginPath} \ --wine-path=${wine_custom} \ - --gpg-exec=${gnupg}/bin/gpg2 \ + --gpg-exec=${gnupg}/bin/gpg \ --bash-interp=${bash}/bin/bash \ --downloader=${curl.bin}/bin/curl $configureFlags diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch index 66dd0fdab4c0..fc6666f8f12b 100644 --- a/pkgs/tools/misc/pipelight/pipelight.patch +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -62,7 +62,7 @@ diff -urN pipelight.old/configure pipelight.new/configure - gpg_exec="/usr/bin/gpg" -fi +bash_interp=bash -+gpg_exec=gpg2 ++gpg_exec=gpg moz_plugin_path="" gcc_runtime_dlls="" so_mode="0644" diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index c138261f9a33..352fee14fa61 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -16,22 +16,15 @@ stdenv.mkDerivation { installPhase = '' install -Dm 0755 screenfetch-dev $out/bin/screenfetch - install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1 + install -Dm 0644 screenfetch.1 $out/share/man/man1/screenfetch.1 # Fix all of the depedencies of screenfetch patchShebangs $out/bin/screenfetch wrapProgram "$out/bin/screenfetch" \ - --set PATH : "" \ - --prefix PATH : "${coreutils}/bin" \ - --prefix PATH : "${gawk}/bin" \ - --prefix PATH : "${procps}/bin" \ - --prefix PATH : "${gnused}/bin" \ - --prefix PATH : "${findutils}/bin" \ - --prefix PATH : "${xdpyinfo}/bin" \ - --prefix PATH : "${xprop}/bin" \ - --prefix PATH : "${gnugrep}/bin" \ - --prefix PATH : "${ncurses}/bin" \ - --prefix PATH : "${bc}/bin" + --set PATH ${stdenv.lib.makeBinPath [ + coreutils gawk procps gnused findutils xdpyinfo + xprop gnugrep ncurses bc + ]} ''; meta = { diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 234ca22faa36..f6c4c3548e2a 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "slop-${version}"; - version = "7.3.48"; + version = "7.3.49"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "17a070y186wa375l4z8j7xql92hgpang69fkdyksycdznih7jwk6"; + sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 04aa838270cd..fbef31fb5467 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { '' buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( - --prefix PATH "$program_PATH" + --prefix PATH : "$program_PATH" --set CUPS_DATADIR "${cups-filters}/share/cups" ) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 1042c5794bdf..c302bd15c41e 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { new font where all glyphs are bytecode hinted using the information given by FreeType’s auto-hinting module. ''; - homepage = http://www.freetype.org/ttfautohint/; + homepage = https://www.freetype.org/ttfautohint; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ndowens ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 918ff2f31799..b7f08f908361 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { draw UML diagrams fast, produce sequence and activity diagrams from plain text, export diagrams to eps, pdf, jpg, svg, and clipboard, share diagrams using Eclipse, and create new, custom UML elements. - UMLet runs stand-alone or as Eclipse plug-in on Windows, OS X and + UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and Linux. ''; homepage = http://www.umlet.com; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 77c06ea1911d..f56f680c9ebb 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,15 +4,20 @@ let in pythonPackages.buildPythonApplication rec { name = "zabbix-cli-${version}"; - version = "1.6.1"; + version = "1.7.0"; - propagatedBuildInputs = with pythonPackages; [ argparse requests ]; + propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "'argparse'," "" + ''; src = fetchFromGitHub { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "17ip3s8ifgj264zwxrr857wk02xmzmlsjrr613mdhkgdwizqbcs3"; + sha256 = "0z33mv8xk0h72rn0iz1qrrkyz63w6cln8d5hqqddcvkxwnq0z6kx"; }; meta = with lib; { diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 8c23e11017cb..322a1a06289e 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.12"; + version = "2.13.1"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8"; + sha256 = "15bi5wx6fyf9k0y03dy5mk2rv06mrfgiyrlh44add9n07wi574p1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index bab8cbc8639f..22237794f079 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { - version = "5.0.7"; - seafileVersion = "5.0.7"; + version = "6.1.0"; + seafileVersion = "6.1.0"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1"; + sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; preConfigure = '' - sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh ./autogen.sh ''; diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix index 42ef7f4f4da7..c39c82df634c 100644 --- a/pkgs/tools/networking/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman_dmenu/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, connman, dmenu }: + stdenv.mkDerivation rec { name = "connman_dmenu-${version}"; version = "git-29-9-2015"; @@ -12,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ connman dmenu ]; - phases = "unpackPhase patchPhase installPhase fixupPhase"; + dontBuild = true; # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3 - patchPhase = '' + postPatch = '' sed -i '89,92d' connman_dmenu ''; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index b2f64aca2d39..4d292abc9acf 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.54.1"; + name = "curl-7.55.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x"; + sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { CXXCPP = "g++ -E"; postInstall = '' + pushd docs/libcurl + make install + popd + moveToOutput bin/curl-config "$dev" sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 333292d9fab8..6d3ca27df1d6 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -11,31 +11,31 @@ buildPerlPackage rec { outputs = [ "out" ]; - buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ]; patches = [ ./ddclient-line-buffer-stdout.patch ]; # Use iproute2 instead of ifconfig preConfigure = '' touch Makefile.PL - substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show' - substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' - substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' + substituteInPlace ddclient \ + --replace 'in the output of ifconfig' 'in the output of ip addr show' \ + --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ + --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' ''; installPhase = '' - mkdir -p $out/bin - cp ddclient $out/bin + install -Dm755 ddclient $out/bin/ddclient ''; + # there are no tests distributed with ddclient doCheck = false; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/ddclient/wiki/Home/; description = "Client for updating dynamic DNS service entries"; - license = licenses.gpl2Plus; - + homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index fd7289ec42ef..5edeee715c29 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"; }; + enableParallelBuilding = true; + configureFlags = optional stdenv.isLinux "--with-systemd"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix new file mode 100644 index 000000000000..79a24ea1f8dd --- /dev/null +++ b/pkgs/tools/networking/envoy/default.nix @@ -0,0 +1,303 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp +, libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp +, nghttp2, protobuf3_2, tclap, rapidjson, spdlog, boringssl, buildEnv +}: + +let + protobuf_bzl = + fetchFromGitHub { + owner = "htuch"; + repo = "protobuf"; + rev = "d490587268931da78c942a6372ef57bb53db80da"; + sha256 = "100494s66xclw88bdnpb6d386vgw0gwz90sni37q7fqmi9w99z6v"; + }; + + # Based on ci/prebuilt/BUILD + # + # The paths have been fixed up, and the static archives have been replaced + # with dynamic libraries where presently possible. + # + # At the moment, this doesn't _need_ to be a map that we dynamically create a + # BUILD file from (we could instead just include the contents directly); + # however, this sets us up to be ready if we (or upstream) decide to split + # things into multiple bazel repos, instead of one. + ccTargets = { + ares = { + pkg = c-ares; + srcs = ''["lib/libcares.so"]''; + hdrs = ''glob(["include/ares*.h"])''; + includes = ''["include"]''; + }; + + backward = { + pkg = backward-cpp; + hdrs = ''["include/backward.hpp"]''; + includes = ''["include"]''; + }; + + crypto = { + pkg = boringssl; + srcs = ''["lib/libcrypto.a"]''; + hdrs = ''glob(["include/openssl/**/*.h"])''; + includes = ''["include"]''; + }; + + event = { + pkg = libevent; + srcs = ''["lib/libevent.so"]''; + hdrs = ''glob(["include/event2/**/*.h"])''; + includes = ''["include"]''; + }; + + event_pthreads = { + pkg = libevent; + srcs = ''["lib/libevent_pthreads.so"]''; + deps = ''[":event"]''; + }; + + googletest = { + pkg = gtest; + srcs = ''[ "lib/libgmock.so", "lib/libgtest.so" ]''; + hdrs = ''glob(["include/gmock/**/*.h", "include/gtest/**/*.h"])''; + includes = ''["include"]''; + }; + + http_parser = { + pkg = http-parser; + srcs = ''["lib/libhttp_parser.so"]''; + hdrs = ''glob(["include/http_parser.h"])''; + includes = ''["include"]''; + }; + + lightstep = { + pkg = lightstep-tracer-cpp; + srcs = ''["lib/liblightstep_core_cxx11.a"]''; + hdrs = ''glob([ "include/lightstep/**/*.h", "include/mapbox_variant/**/*.hpp" ]) + [ "include/collector.pb.h", "include/lightstep_carrier.pb.h" ]''; + includes = ''["include"]''; + deps = ''[":protobuf"]''; + }; + + nghttp2 = { + pkg = nghttp2; + srcs = ''["lib/libnghttp2.so"]''; + hdrs = ''glob(["include/nghttp2/**/*.h"])''; + includes = ''["include"]''; + }; + + protobuf = { + pkg = protobuf3_2; + srcs = ''glob(["lib/libproto*.so"])''; + hdrs = ''glob(["include/google/protobuf/**/*.h"])''; + includes = ''["include"]''; + }; + + rapidjson = { + pkg = rapidjson; + hdrs = ''glob(["include/rapidjson/**/*.h"])''; + includes = ''["include"]''; + }; + + spdlog = { + pkg = spdlog; + name = "spdlog"; + hdrs = ''glob([ "include/spdlog/**/*.cc", "include/spdlog/**/*.h" ])''; + includes = ''["include"]''; + }; + + ssl = { + pkg = boringssl; + srcs = ''["lib/libssl.a"]''; + deps = ''[":crypto"]''; + }; + + tclap = { + pkg = tclap; + hdrs = ''glob(["include/tclap/**/*.h"])''; + includes = ''["include"]''; + }; + + tcmalloc_and_profiler = { + pkg = gperftools; + srcs = ''["lib/libtcmalloc_and_profiler.so"]''; + hdrs = ''glob(["include/gperftools/**/*.h"])''; + strip_include_prefix = ''"include"''; + }; + }; + + # Generate the BUILD file. + buildFile = + let field = name: attrs: + if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else ""; + in + '' + licenses(["notice"]) # Apache 2 + + package(default_visibility = ["//visibility:public"]) + + '' + + lib.concatStringsSep "\n\n" ( + lib.mapAttrsToList (name: value: + "cc_library(\n" + + " name = \"${name}\",\n" + + field "srcs" value + + field "hdrs" value + + field "deps" value + + field "includes" value + + field "strip_include_prefix" value + + ")" + ) ccTargets + ) + '' + + filegroup( + name = "protoc", + srcs = ["bin/protoc"], + ) + ''; + + workspaceFile = + '' + workspace(name = "nix") + + load("//bazel:repositories.bzl", "envoy_dependencies") + load("//bazel:cc_configure.bzl", "cc_configure") + + new_local_repository( + name = "nix_envoy_deps", + path = "${repoEnv}", + build_file = "nix_envoy_deps.BUILD" + ) + + envoy_dependencies( + path = "@nix_envoy_deps//", + skip_protobuf_bzl = True, + ) + + new_local_repository( + name = "protobuf_bzl", + path = "${protobuf_bzl}", + # We only want protobuf.bzl, so don't support building out of this repo. + build_file_content = "", + ) + + cc_configure() + ''; + + # The tree we'll use for our new_local_repository in our generated WORKSPACE. + repoEnv = buildEnv { + name = "repo-env"; + paths = lib.concatMap (p: + lib.unique [(lib.getBin p) (lib.getLib p) (lib.getDev p)] + ) allDeps; + }; + + rpath = stdenv.lib.makeLibraryPath (allDeps ++ [ stdenv.cc.cc ]); + + allDeps = [ + c-ares + backward-cpp + libevent + gtest + gperftools + http-parser + lightstep-tracer-cpp + nghttp2 + protobuf3_2 + tclap + rapidjson + spdlog + boringssl + ]; + + # Envoy checks at runtime that the git sha is valid, + # so we really can't avoid putting some sort of sha here. + rev = "3afc7712a04907ffd25ed497626639febfe65735"; + +in + +stdenv.mkDerivation rec { + name = "envoy-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "lyft"; + repo = "envoy"; + rev = "v${version}"; + sha256 = "0j1c9lyvncyhiq3kyhx91ckcjd2h68x56js7xb6ni6bzxinv6zb6"; + }; + + nativeBuildInputs = [ + pkgconfig bazel + ]; + + buildInputs = allDeps; + + patches = [ ./nixos.patch ]; + + hardeningDisable = "all"; + dontPatchELF = true; + dontStrip = true; + + # set up our workspace, + # and prevent an error where bazel/get_workspace_status tries to determine the + # version by invoking git. + postUnpack = '' + cat <<'EOF' > $sourceRoot/WORKSPACE + ${workspaceFile} + EOF + + cat <<'EOF' > $sourceRoot/nix_envoy_deps.BUILD + ${buildFile} + EOF + + cat <<'EOF' > $sourceRoot/bazel/get_workspace_status + #!${stdenv.shell} + echo "BUILD_SCM_REVISION ${rev}" + echo "BUILD_SCM_STATUS Modified" + EOF + ''; + + buildPhase = '' + runHook preBuild + + mkdir .home + export HOME=$PWD/.home + + BAZEL_OPTIONS="--package_path %workspace%:$PWD" + BAZEL_BUILD_OPTIONS="\ + --strategy=Genrule=standalone \ + --spawn_strategy=standalone \ + --verbose_failures \ + $BAZEL_OPTIONS \ + --action_env=HOME \ + --action_env=PYTHONUSERBASE \ + --show_task_finish" + + bazel \ + --batch \ + build \ + -s --verbose_failures \ + --experimental_ui \ + $BAZEL_BUILD_OPTIONS \ + -c opt \ + //source/exe:envoy-static + + exe=bazel-bin/source/exe/envoy-static + chmod +w $exe + patchelf --set-rpath ${rpath} $exe + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + mv $exe $out/bin/envoy + ''; + + meta = with lib; { + description = "L7 proxy and communication bus designed for large modern service oriented architectures"; + homepage = "https://lyft.github.io/envoy/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/networking/envoy/nixos.patch b/pkgs/tools/networking/envoy/nixos.patch new file mode 100644 index 000000000000..04b63a2dde92 --- /dev/null +++ b/pkgs/tools/networking/envoy/nixos.patch @@ -0,0 +1,41 @@ +diff --git a/bazel/cc_configure.bzl b/bazel/cc_configure.bzl +index 8a7a69c4f..75526520c 100644 +--- a/bazel/cc_configure.bzl ++++ b/bazel/cc_configure.bzl +@@ -292,6 +292,8 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin): + "-fstack-protector", + # All warnings are enabled. Maybe enable -Werror as well? + "-Wall", ++ ++ "-Wno-error=strict-aliasing" + # Enable a few more warnings that aren't part of -Wall. + ] + (["-Wthread-safety", "-Wself-assign"] if darwin else [ + "-B" + str(repository_ctx.path(cc).dirname), +@@ -365,10 +367,6 @@ def _opt_content(darwin): + # Profile first and / or use FDO if you need better performance than this. + "-O2", + +- # Security hardening on by default. +- # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. +- "-D_FORTIFY_SOURCE=1", +- + # Disable assertions + "-DNDEBUG", + +diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl +index f17671035..7938047bd 100644 +--- a/bazel/envoy_build_system.bzl ++++ b/bazel/envoy_build_system.bzl +@@ -131,11 +131,9 @@ def envoy_cc_binary(name, + # --build-id and avoid doing the following. + '-Wl,--build-id=md5', + '-Wl,--hash-style=gnu', +- "-static-libstdc++", +- "-static-libgcc", + ], + testonly = testonly, +- linkstatic = 1, ++ linkstatic = 0, + visibility = visibility, + malloc = tcmalloc_external_dep(repository), + # See above comment on MD5 hash, this is another "force MD5 stamps" to make sure our diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 8a474812e197..e1829bcaf7d8 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-var.patch ]; postPatch = '' - substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc" - substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc" + substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" + substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc" ''; configureFlags = [ diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 09459e0e2834..2cca57121e91 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, which, cctools }: let generic = { version, sha256 }: @@ -10,11 +10,14 @@ let inherit sha256; }; + nativeBuildInputs = [] ++ + stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; + patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; doCheck = !stdenv.isFreeBSD; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { homepage = http://miniupnp.free.fr/; diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix index 79fad953a2c5..82810e714d52 100644 --- a/pkgs/tools/networking/networkmanager_dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix @@ -3,14 +3,14 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { - name = "networkmanager_dmenu-unstable-${version}"; - version = "2017-05-28"; + name = "networkmanager_dmenu-${version}"; + version = "1.1"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "eeb8e6922dee887890884f129b51bb21b0047d30"; - sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6"; + rev = "v${version}"; + sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; }; buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 3ff028342472..d1827a6045d8 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,3 +1,5 @@ +# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent +# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others { stdenv, fetchFromGitHub, pkgconfig , libtool, autoconf, automake, cppunit , openssl, libsigcxx, zlib }: diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index e29c72fd0b95..aa9e5483408f 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "par2cmdline-${version}"; - version = "0.6.13"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; rev = "v${version}"; - sha256 = "0jxixkc8vid933nph2mvhgz58my42kwjlzbir38hml2xrzq00d8f"; + sha256 = "1hkb1brz70p79rv7dlzhnl1invjmkll81rcpnhwvafv1yriklfai"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/BlackIkeEagle/par2cmdline; + homepage = https://github.com/Parchive/par2cmdline; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' par2cmdline is a program for creating and using PAR2 files to detect diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 12744456cc4a..48a803268bed 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ autoreconfHook w3m man ]; buildInputs = [ zlib pcre ]; + makeFlags = [ "STRIP="]; + postInstall = '' rm -rf $out/var ''; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 22c6331cb446..6332d6c85774 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -13,14 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = "bash build.sh"; installPhase = '' - mkdir -p $out/bin rm out/quicktun*tgz - cp -v out/quicktun* $out/bin/ + install -vD out/quicktun* -t $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 00c1c86ea8b5..5e18ee80f99d 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -11,15 +11,11 @@ stdenv.mkDerivation rec { sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - makeFlags = "-C src"; installPhase = '' - mkdir -p $out/{bin,sbin,share/man/man8} - cp bin/ractl $out/bin - cp bin/rad $out/sbin - cp man/* $out/share/man/man8 + install -vD bin/* -t $out/bin + install -vD man/* -t $out/share/man/man8 ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix deleted file mode 100644 index efea10eaa4da..000000000000 --- a/pkgs/tools/networking/tlsdate/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, autoconf -, automake -, libevent -, libtool -, pkgconfig -, openssl -}: - -stdenv.mkDerivation rec { - version = "0.0.13"; - name = "tlsdate-${version}"; - - src = fetchFromGitHub { - owner = "ioerror"; - repo = "tlsdate"; - rev = name; - sha256 = "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl"; - }; - - patches = [ - (fetchpatch { - name = "tlsdate-no_sslv3.patch"; - url = "https://github.com/ioerror/tlsdate/commit/f9d3cba7536d1679e98172ccbddad32bc9ae490c.patch"; - sha256 = "0prv46vxvb4paxaswmc6ix0kd5sp0552i5msdldnhg9fysbac8s0"; - }) - ]; - - buildInputs = [ - autoconf - automake - libevent - libtool - pkgconfig - openssl - ]; - - preConfigure = '' - export COMPILE_DATE=0 - ./autogen.sh - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Secure parasitic rdate replacement"; - homepage = https://github.com/ioerror/tlsdate; - maintainers = with maintainers; [ tv fpletz ]; - platforms = platforms.allBut platforms.darwin; - }; -} diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 2a43358a5e1a..53465a0242dd 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -23,11 +23,9 @@ stdenv.mkDerivation rec { libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] ++ stdenv.lib.optional useSystemd systemd; - phases = [ "unpackPhase" "patchPhase" "postPatchPhase" "buildPhase" "installPhase" ]; - patches = [ ./fixing-rpath.patch ./configvar-fix.patch ]; - postPatchPhase = '' + postPatch = '' substituteInPlace etc/tlspool.conf \ --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \ --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so" @@ -41,9 +39,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/lib $out/sbin $out/man $out/etc/tlspool/ $out/include/${pname}/pulleyback - mkdir -p $out/${python.sitePackages}/tlspool - mkdir -p $out/bdb + mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback make DESTDIR=$out PREFIX=/ install cp -R etc/* $out/etc/tlspool/ cp include/tlspool/*.h $out/include/${pname} diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index b5119bc594b7..d38772604502 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good - gnome3.gtk gnome3.dconf + gnome3.gtk (stdenv.lib.getLib gnome3.dconf) ] ++ (stdenv.lib.optional (aria2 != null) aria2); @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index f37940c65c1e..95280bf60b30 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -8,19 +8,13 @@ let mkPrefetchScript = tool: src: deps: buildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + unpackPhase = ":"; + installPhase = '' - mkdir -p $out/bin - - local wrapArgs="" - cp ${src} $out/bin/$name; - for dep in ${stdenv.lib.concatStringsSep " " deps}; do - wrapArgs="$wrapArgs --prefix PATH : $dep/bin" - done - wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" - wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash - wrapArgs="$wrapArgs --set HOME : /homeless-shelter" - wrapProgram $out/bin/$name $wrapArgs + install -vD ${src} $out/bin/$name; + wrapProgram $out/bin/$name \ + --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \ + --set HOME /homeless-shelter ''; preferLocalBuild = true; @@ -32,11 +26,11 @@ let mkPrefetchScript = tool: src: deps: }; }; in rec { - nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar]; - nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; - nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; - nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; - nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; + nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; + nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ]; + nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index da700fe9f227..eadfbe230b3f 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation { ${coreutils}/bin/rm $out/bin ${coreutils}/bin/mkdir -p $out/bin ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin - - # Add gpg->gpg2 and gpgv->gpgv2 symlinks - ${coreutils}/bin/ln -s gpg2 $out/bin/gpg - ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ''; meta = gnupg.meta // { diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 2d43d3e977aa..1523f3e159ce 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.22"; + version = "2.1.23"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6"; + sha256 = "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59"; }; buildInputs = [ diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch index 4bfdc13ef598..65804bac7642 100644 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch @@ -7,7 +7,7 @@ index 903fb5b..d5611dc 100644 ret = asprintf (&command, - "gpg --list-keys --with-colons --with-key-data '%s'", -+ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'", ++ "@out@/bin/gpg --list-keys --with-colons --with-key-data '%s'", keyid); assert (ret > 0); diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 32bc1a4d7119..72cb19aa732b 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ upx patchelf ]; - phases = "unpackPhase installPhase"; unpackPhase = "tar xf ${src}"; installPhase = '' mkdir -p $out/bin @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { $out/bin/jd-gui ''; + dontStrip = true; + meta = { description = "Fast Java Decompiler with powerful GUI"; homepage = "http://jd.benow.ca/"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 6495634da33b..cce737af9c1e 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.50"; + version = "7.60"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9"; + sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index ae1c2c05f147..9e01e8f0a9f3 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, qt4, gdb, zlib }: -stdenv.mkDerivation rec { +{ stdenv, fetchurl, qt4, gdb, zlib }: +stdenv.mkDerivation rec { name = "omapd-${version}"; version = "0.9.2"; @@ -11,23 +11,20 @@ stdenv.mkDerivation rec { patches = [ ./zlib.patch ]; - buildInputs = [ cmake qt4 zlib gdb ]; - - phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ]; + buildInputs = [ qt4 zlib gdb ]; buildPhase = '' (cd plugins/RAMHashTables; qmake; make) qmake make - ''; + ''; installPhase = '' - mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins - cp omapd $out/bin/. - cp omapd.conf $out/etc/. - cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/. + install -vD omapd $out/bin/omapd + install -vD omapd.conf $out/etc/omapd.conf + install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so ln -s $out/usr/lib/omapd/plugins $out/bin/plugins - ''; + ''; meta = with stdenv.lib; { homepage = http://code.google.com/p/omapd; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index c81a01ef8962..af27fb6cd01f 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python ]; patchPhase = '' - sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' + sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg|g' ''; dontBuild = true; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 506b1d398d54..8530aab4e706 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, trousers, openssl, zlib }: stdenv.mkDerivation rec { - name = "tboot-1.8.2"; + name = "tboot-${version}"; + version = "1.9.6"; src = fetchurl { url = "mirror://sourceforge/tboot/${name}.tar.gz"; - sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m"; + sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v"; }; + patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; + buildInputs = [ trousers openssl zlib ]; - patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; + enableParallelBuilding = true; hardeningDisable = [ "pic" "stackprotector" ]; @@ -27,8 +30,7 @@ stdenv.mkDerivation rec { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = http://sourceforge.net/projects/tboot/; license = licenses.bsd3; - maintainers = [ maintainers.ak ]; + maintainers = with maintainers; [ ak ]; platforms = platforms.linux; }; } - diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 6f1b7fe6ef47..b64124b3c54d 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "volatility-2.4"; + version = "2.6"; + name = "volatility-${version}"; src = fetchurl { - url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz"; - sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8"; + url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; + sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; }; doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycrypto ]; + propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/volatility; + homepage = http://www.volatilityfoundation.org/; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index a058c2ee1a87..1beb2268fc6c 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,10 +1,6 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix, }: +{ stdenv, pythonPackages, fetchurl, callPackage, nix }: -let - external = callPackage ./requirements.nix { - inherit pythonPackages; - }; -in pythonPackages.buildPythonApplication rec{ +pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; version = "1.2.2"; @@ -28,7 +24,7 @@ in pythonPackages.buildPythonApplication rec{ lxml pyyaml requests - external.zodb + zodb ]); checkPhase = "py.test"; diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix deleted file mode 100644 index ef33c289d137..000000000000 --- a/pkgs/tools/security/vulnix/requirements.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ pythonPackages, fetchurl, stdenv }: - -rec { - zodb = pythonPackages.buildPythonPackage { - name = "ZODB-5.2.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz"; - sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x"; - }; - doCheck = false; - propagatedBuildInputs = [ - transaction - ] ++ (with pythonPackages; [ - six - wheel - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]); - - meta = with stdenv.lib; { - license = licenses.zpt21; - description = "Zope Object Database: object database and persistence"; - }; - }; - - transaction = pythonPackages.buildPythonPackage { - name = "transaction-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; - sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; - }; - propagatedBuildInputs = with pythonPackages; [ - zope_interface - six - wheel - mock - ]; - meta = with stdenv.lib; { - license = licenses.zpt21; - description = "Transaction management for Python"; - }; - }; -} diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix new file mode 100644 index 000000000000..cb8c4cc7d029 --- /dev/null +++ b/pkgs/tools/system/collectd/data.nix @@ -0,0 +1,14 @@ +{ stdenv, collectd }: + +stdenv.mkDerivation rec { + inherit (collectd) meta version; + + name = "collectd-data-${version}"; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/collectd + cp ${collectd}/share/collectd/*.{db,conf} $out/share/collectd/ + ''; +} diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b66cd7d6112e..56ac33ba23c6 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.6.4"; + version = "3.7.1"; src = fetchFromGitHub { - sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6"; + sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a"; rev = version; repo = "facter"; owner = "puppetlabs"; }; + CXXFLAGS = "-fpermissive"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_LDFLAGS = "-lblkid"; + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; # since we cant expand $out in cmakeFlags @@ -18,6 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; description = "A system inventory tool"; diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 4b8ea62219ee..de4687a6a57f 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -7,7 +7,7 @@ let in buildGoPackage rec { name = "journalbeat-${version}"; - version = "5.4.1"; + version = "5.5.0"; goPackagePath = "github.com/mheese/journalbeat"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "mheese"; repo = "journalbeat"; rev = "v${version}"; - sha256 = "14mhx3gqg19ljcr07ahbry9k5hkbj2mjji4qsjrbc7jknis6frz4"; + sha256 = "134n1kg6nx5yycn2cyldiayaqm8zps94hz4zfz9klp2jzq68m35y"; }; meta = with lib; { diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index af7e4543579f..1c8b386fc8c6 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, gzip, popt }: +{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }: stdenv.mkDerivation rec { - name = "logrotate-3.9.1"; + name = "logrotate-${version}"; + version = "3.12.3"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; - sha256 = "0i95qnacv5wf7kfkcpi38ys3i14fr01ifhm8b4ari04c53inj9q2"; + src = fetchFromGitHub { + owner = "logrotate"; + repo = "logrotate"; + rev = version; + sha256 = "04ygb709fj4ai8m2f1c6imzcmkdvr3ib5zf5qw2lif4fsb30jvyi"; }; # Logrotate wants to access the 'mail' program; to be done. patchPhase = '' sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' config.h + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \ + -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac ''; - preBuild = '' - makeFlags="BASEDIR=$out" + autoreconfPhase = '' + ./autogen.sh ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; meta = { @@ -27,5 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; - } diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 11f30f6f4448..5510ec0e9486 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub }: -let - version = "0.3.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "lr-${version}"; - inherit version; + version = "0.4"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k"; + sha256 = "16qp0791s652yi86x472wwr62w6nhiyb1i662d85y5zyfagdf7dd"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 055a480f92ad..71a4db63c84f 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.20.0"; + name = "monit-5.23.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b"; + sha256 = "04v7sp2vc1q6h8c5j8h4izffn9d97cdj0k64m4ml00lw6wxgwffx"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 59df5ee90a4e..bfbe217c2696 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "SystemdJournal2Gelf-${version}"; - version = "20160414"; + version = "20170413"; goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; src = fetchFromGitHub { - rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f"; + rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n"; + sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index f0ab06066a59..11fcae855281 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "gist"; - version = "4.5.0"; - sha256 = "0k9bgjdmnr14whmjx6c8d5ak1dpazirj96hk5ds69rl5d9issw0l"; + version = "4.6.1"; + sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0db140c7891c..089f3094b540 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { #doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD; doCheck = false; - # On Mac OS X, force use of mkdir -p, since Grep's fallback + # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. preConfigure = '' export MKDIR_P="mkdir -p" diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 4048093a3958..10b82342051a 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -25,15 +25,12 @@ stdenv.mkDerivation rec { TimeDate # == DateParse HTMLTemplate # IO::Socket::Socks is not in nixpkgs - # IOSocketSocks + # IOSocketSocks IOSocketSSL NetSSLeay SOAPLite ]); - - phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ]; - installPhase = '' mkdir -p $out/bin # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax @@ -42,11 +39,7 @@ stdenv.mkDerivation rec { cp -r * $out/bin cd $out/bin chmod +x *.pl - ''; - patchPhase = "patchShebangs $out"; - - postInstall = '' find $out -name '*.pl' -executable | while read path; do wrapProgram "$path" \ --prefix PERL5LIB : $PERL5LIB:$out/bin \ @@ -61,11 +54,9 @@ stdenv.mkDerivation rec { homepage = http://getpopfile.org; license = stdenv.lib.licenses.gpl2; - # Should work on OS X, but havent tested it. + # Should work on macOS, but havent tested it. # Windows support is more complicated. # http://getpopfile.org/docs/faq:systemrequirements platforms = stdenv.lib.platforms.linux; }; - } - diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix deleted file mode 100644 index 496d68df5b37..000000000000 --- a/pkgs/tools/text/sgml/opensp/compat.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, opensp }: - -stdenv.mkDerivation { - name = "sp-compat-${stdenv.lib.getVersion opensp}"; - - phases = [ "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -pv $out/bin - for i in ${opensp}/bin/o*; do - ln -sv $i $out/bin/''${i#${opensp}/bin/o} - done - ''; - - setupHook = opensp.setupHook; - - meta = opensp.meta // { - description = "Compatibility wrapper for old programs looking for original sp programs"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 495a5fcf8821..f494f1911593 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,8 +1,10 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, curl }: +{ stdenv, lib, bundlerEnv, ruby, curl }: -bundlerEnv rec { +bundlerEnv { pname = "asciidoctor"; - ruby = ruby_2_2; + + inherit ruby; + gemdir = ./.; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 49ba2d0ccdf8..5c9ae26c77b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -139,6 +139,7 @@ mapAliases (rec { telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 ucsFonts = ucs-fonts; # added 2016-07-15 + ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd9427c2ce0..d50e812eaf00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -50,7 +50,6 @@ with pkgs; inherit lib config; inherit (lib) lowPrio hiPrio appendToName makeOverridable; - inherit (misc) versionedDerivation; # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. @@ -100,6 +99,8 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; + dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -287,7 +288,8 @@ with pkgs; inherit contents compressor prepend; }; - makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook { deps = [ dieHook ]; } + ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = { kernel, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { @@ -611,9 +613,9 @@ with pkgs; inherit (androidenv) androidndk; - androidsdk = androidenv.androidsdk_7_1_1; + androidsdk = androidenv.androidsdk_8_0; - androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras; + androidsdk_extras = self.androidenv.androidsdk_8_0_extras; arc-theme = callPackage ../misc/themes/arc { }; @@ -898,6 +900,8 @@ with pkgs; crudini = callPackage ../tools/misc/crudini { }; + cucumber = callPackage ../development/tools/cucumber {}; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -999,9 +1003,7 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; - facter = callPackage ../tools/system/facter { - boost = boost160; - }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -1041,6 +1043,8 @@ with pkgs; go-dependency-manager = callPackage ../development/tools/gdm { }; + geekbench = callPackage ../tools/misc/geekbench { }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1051,6 +1055,8 @@ with pkgs; glock = callPackage ../development/tools/glock { }; + glslviewer = callPackage ../development/tools/glslviewer { }; + gmic = callPackage ../tools/graphics/gmic { }; goa = callPackage ../development/tools/goa { }; @@ -1334,7 +1340,8 @@ with pkgs; clementine = callPackage ../applications/audio/clementine { boost = boost155; - gst_plugins = [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-ffmpeg ]; + gst_plugins = + with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]; }; clementineFree = clementine.free; @@ -1378,6 +1385,8 @@ with pkgs; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; + collectd-data = callPackage ../tools/system/collectd/data.nix { }; + colormake = callPackage ../development/tools/build-managers/colormake { }; cpuminer = callPackage ../tools/misc/cpuminer { }; @@ -1816,6 +1825,8 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; + envoy = callPackage ../tools/networking/envoy { }; + eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -2372,6 +2383,8 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -2897,15 +2910,6 @@ with pkgs; enableNpm = false; }; - nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - enableNpm = false; - }; - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { libtool = darwin.cctools; }; @@ -2944,9 +2948,7 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - leatherman = callPackage ../development/libraries/leatherman { - boost = boost160; - }; + leatherman = callPackage ../development/libraries/leatherman { }; leela = callPackage ../tools/graphics/leela { }; @@ -2962,8 +2964,6 @@ with pkgs; libevdev = callPackage ../development/libraries/libevdev { }; - libevhtp = callPackage ../development/libraries/libevhtp { }; - libfann = callPackage ../development/libraries/libfann { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3194,7 +3194,8 @@ with pkgs; minissdpd = callPackage ../tools/networking/minissdpd { }; - inherit (callPackage ../tools/networking/miniupnpc { }) + inherit (callPackage ../tools/networking/miniupnpc + { inherit (darwin) cctools; }) miniupnpc_1 miniupnpc_2; miniupnpc = miniupnpc_1; @@ -3505,6 +3506,8 @@ with pkgs; oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + ola = callPackage ../applications/misc/ola { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -3558,8 +3561,6 @@ with pkgs; opensp = callPackage ../tools/text/sgml/opensp { }; - spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; - opentracker = callPackage ../applications/networking/p2p/opentracker { }; opentsdb = callPackage ../tools/misc/opentsdb {}; @@ -3826,9 +3827,7 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { - automake = automake113x; # fails with 14 - }; + povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; @@ -3906,7 +3905,9 @@ with pkgs; qarte = callPackage ../applications/video/qarte { }; - qnial = callPackage ../development/interpreters/qnial {}; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + + qnial = callPackage ../development/interpreters/qnial { }; ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; @@ -4472,8 +4473,6 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; - tlsdate = callPackage ../tools/networking/tlsdate { }; - tldr = callPackage ../tools/misc/tldr { }; tlspool = callPackage ../tools/networking/tlspool { }; @@ -5108,6 +5107,8 @@ with pkgs; oh = callPackage ../shells/oh { }; + oil = callPackage ../shells/oil { }; + pash = callPackage ../shells/pash { }; tcsh = callPackage ../shells/tcsh { }; @@ -5182,6 +5183,11 @@ with pkgs; clang = llvmPackages.clang; + clang-sierraHack = clang.override { + name = "clang-wrapper-with-reexport-hack"; + useMacosReexportHack = true; + }; + clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; @@ -5209,6 +5215,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -5219,13 +5226,10 @@ with pkgs; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert (( - if system == "x86_64-linux" - then { tools = pkgsi686Linux.stdenv.cc; } - else {} - ) // { - coq = coq_8_6; - }); + compcert = callPackage ../development/compilers/compcert { + # Pin the version of coq used in compcert to 8.6 until the next release + coq = callPackage ../applications/science/logic/coq { version = "8.6"; }; + }; # Users installing via `nix-env` will likely be using the REPL, @@ -5589,9 +5593,18 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go_bootstrap = if stdenv.isAarch64 then + srcOnly { + name = "go-1.8-linux-arm64-bootstrap"; + src = fetchurl { + url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; + sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; + }; + } + else + callPackage ../development/compilers/go/1.4.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; go_1_6 = callPackage ../development/compilers/go/1.6.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; @@ -6311,6 +6324,7 @@ with pkgs; pltScheme = racket; # just to be sure polyml = callPackage ../development/compilers/polyml { }; + polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; pure = callPackage ../development/interpreters/pure { llvm = llvm_35; @@ -6322,6 +6336,7 @@ with pkgs; python = python2; python2 = python27; python3 = python36; + pypy = pypy27; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -6329,7 +6344,6 @@ with pkgs; python2Full = python2.override{x11Support=true;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; - python33Full = python33.override{x11Support=true;}; python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; @@ -6343,10 +6357,6 @@ with pkgs; self = python27; inherit (darwin) CF configd; }; - python33 = callPackage ../development/interpreters/python/cpython/3.3 { - self = python33; - inherit (darwin) CF configd; - }; python34 = callPackage ../development/interpreters/python/cpython/3.4 { inherit (darwin) CF configd; self = python34; @@ -6360,17 +6370,22 @@ with pkgs; self = python36; }; - # Should eventually be moved inside Python interpreters. - python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - - pypy = pypy27; - pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; db = db.override { dbmSupport = true; }; }; + # Python package sets. + python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); + python34Packages = python34.pkgs; + python35Packages = python35.pkgs; + python36Packages = recurseIntoAttrs python36.pkgs; + pypyPackages = pypy.pkgs; + + # Should eventually be moved inside Python interpreters. + python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + python2nix = callPackage ../tools/package-management/python2nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); @@ -6594,12 +6609,6 @@ with pkgs; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; - - automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; - - automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; - automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; @@ -7103,6 +7112,10 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obelisk = callPackage ../development/tools/ocaml/obelisk { + ocamlPackages = ocaml-ng.ocamlPackages_4_03; + }; + obuild = callPackage ../development/tools/ocaml/obuild { }; omake = callPackage ../development/tools/ocaml/omake { @@ -7135,7 +7148,7 @@ with pkgs; phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -7469,6 +7482,8 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -7517,8 +7532,6 @@ with pkgs; capnproto = callPackage ../development/libraries/capnproto { }; - ccnx = callPackage ../development/libraries/ccnx { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; cddlib = callPackage ../development/libraries/cddlib {}; @@ -8033,6 +8046,9 @@ with pkgs; # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gns3-gui = callPackage ../applications/networking/gns3/gui.nix { }; + gns3-server = callPackage ../applications/networking/gns3/server.nix { }; + gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; inherit (darwin) cctools; @@ -8179,6 +8195,11 @@ with pkgs; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; + + pangolin = callPackage ../development/libraries/pangolin { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -8749,10 +8770,6 @@ with pkgs; libexosip = callPackage ../development/libraries/exosip {}; - libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix { - libosip = libosip_3; - }; - libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; @@ -9031,8 +9048,6 @@ with pkgs; libmrss = callPackage ../development/libraries/libmrss { }; - libmsn = callPackage ../development/libraries/libmsn { }; - libmspack = callPackage ../development/libraries/libmspack { }; libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { }; @@ -9216,9 +9231,7 @@ with pkgs; libtap = callPackage ../development/libraries/libtap { }; - libtsm = callPackage ../development/libraries/libtsm { - automake = automake114x; - }; + libtsm = callPackage ../development/libraries/libtsm { }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; @@ -9379,6 +9392,8 @@ with pkgs; lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; + linenoise = callPackage ../development/libraries/linenoise { }; linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; @@ -9633,6 +9648,8 @@ with pkgs; opencollada = callPackage ../development/libraries/opencollada { }; + opencore-amr = callPackage ../development/libraries/opencore-amr { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -10061,6 +10078,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; @@ -10077,7 +10096,7 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { - haskell-lib = haskell.lib; + haskellLib = haskell.lib; }; lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; @@ -10573,8 +10592,6 @@ with pkgs; wt = callPackage ../development/libraries/wt { }; - wvstreams = callPackage ../development/libraries/wvstreams { }; - wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { @@ -10903,22 +10920,6 @@ with pkgs; sqitchModule = perlPackages.AppSqitch; }; - ### DEVELOPMENT / PYTHON MODULES - - # Python package sets. - - python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - - python33Packages = python33.pkgs; - - python34Packages = python34.pkgs; - - python35Packages = python35.pkgs; - - python36Packages = recurseIntoAttrs python36.pkgs; - - pypyPackages = pypy.pkgs; - ### DEVELOPMENT / R MODULES R = callPackage ../applications/science/math/R { @@ -11360,6 +11361,8 @@ with pkgs; munin = callPackage ../servers/monitoring/munin { }; nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; + + checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; neo4j = callPackage ../servers/nosql/neo4j { }; @@ -11430,6 +11433,7 @@ with pkgs; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; @@ -11466,8 +11470,6 @@ with pkgs; restic = callPackage ../tools/backup/restic { }; - restund = callPackage ../servers/restund {}; - rethinkdb = callPackage ../servers/nosql/rethinkdb { libtool = darwin.cctools; }; @@ -11476,8 +11478,6 @@ with pkgs; boost = boost159; }; - #ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; - s6 = callPackage ../tools/system/s6 { }; s6-rc = callPackage ../tools/system/s6-rc { }; @@ -11582,7 +11582,7 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; - searx = callPackages ../servers/web-apps/searx { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; @@ -11936,7 +11936,6 @@ with pkgs; iproute = callPackage ../os-specific/linux/iproute { }; iputils = callPackage ../os-specific/linux/iputils { - sp = spCompat; inherit (perlPackages) SGMLSpm; }; @@ -11987,6 +11986,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; openisns = callPackage ../os-specific/linux/open-isns { }; @@ -12001,14 +12002,6 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - - linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { cross = if targetPlatform != hostPlatform then targetPlatform else null; }; @@ -12018,8 +12011,6 @@ with pkgs; if targetPlatform != hostPlatform then { # switch - "2.4" = linuxHeaders_2_4; - "2.6" = linuxHeaders_2_6; "4.4" = linuxHeaders_4_4; }.${targetPlatform.platform.kernelMajor} or (throw "Unknown linux kernel version") @@ -12038,10 +12029,11 @@ with pkgs; kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.tag_hardened ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; - inherit (linux) version; + inherit (linux_hardened_copperhead) version; }; }; @@ -12064,34 +12056,6 @@ with pkgs; ]; }; - linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - p9_fixes - lguest_entry-linkage - packet_fix_race_condition_CVE_2016_8655 - DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.4" - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12307,8 +12271,6 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; - linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); # Don't forget to update linuxPackages_latest! @@ -13034,6 +12996,8 @@ with pkgs; man-pages = callPackage ../data/documentation/man-pages { }; + material-icons = callPackage ../data/fonts/material-icons { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; miscfiles = callPackage ../data/misc/miscfiles { }; @@ -13126,7 +13090,7 @@ with pkgs; stix-two = callPackage ../data/fonts/stix-two { }; inherit (callPackages ../data/fonts/gdouros { }) - symbola aegyptus akkadian anatolian maya unidings musica analecta; + symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos; iana-etc = callPackage ../data/misc/iana-etc { }; @@ -13476,6 +13440,8 @@ with pkgs; bibletime = callPackage ../applications/misc/bibletime { }; + bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; }; + bitkeeper = callPackage ../applications/version-management/bitkeeper { gperf = gperf_3_0; }; @@ -14180,7 +14146,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = libsForQt56.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -14240,8 +14206,6 @@ with pkgs; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; - wvdial = callPackage ../os-specific/linux/wvdial { }; - fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { }; @@ -14961,10 +14925,6 @@ with pkgs; lci = callPackage ../applications/science/logic/lci {}; - ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome2) libglade; - }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; @@ -15527,6 +15487,8 @@ with pkgs; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + openmpt123 = callPackage ../applications/audio/openmpt123 {}; opusfile = callPackage ../applications/audio/opusfile { }; @@ -15888,9 +15850,8 @@ with pkgs; remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = callPackage ../applications/networking/p2p/retroshare { }; - - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare06 = retroshare; ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; @@ -15972,7 +15933,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }; - seafile-client = callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { protobuf = protobuf2_5; @@ -16431,8 +16392,6 @@ with pkgs; utox = callPackage ../applications/networking/instant-messengers/utox { }; - vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -17254,8 +17213,6 @@ with pkgs; gl117 = callPackage ../games/gl-117 {}; - glestae = callPackage ../games/glestae {}; - globulation2 = callPackage ../games/globulation { boost = boost155; }; @@ -17336,6 +17293,8 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; + moon-buggy = callPackage ../games/moon-buggy {}; + multimc = libsForQt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { @@ -17448,6 +17407,8 @@ with pkgs; openglSupport = mesaSupported; }; + rftg = callPackage ../games/rftg { }; + rigsofrods = callPackage ../games/rigsofrods { angelscript = angelscript_2_22; mygui = mygui.override { @@ -17592,14 +17553,7 @@ with pkgs; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx/1.1.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; - ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; + ultrastardx = callPackage ../games/ultrastardx/default.nix { }; unnethack = callPackage ../games/unnethack { }; @@ -17805,6 +17759,8 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; + numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -18193,6 +18149,7 @@ with pkgs; tini = callPackage ../applications/virtualization/tini {}; isabelle = callPackage ../applications/science/logic/isabelle { + polyml = polyml56; java = if stdenv.isLinux then jre else jdk; }; @@ -18326,7 +18283,6 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; maxima = callPackage ../applications/science/math/maxima { - sbcl = sbcl_1_3_12; ecl = null; }; maxima-ecl = callPackage ../applications/science/math/maxima { @@ -18605,18 +18561,16 @@ with pkgs; flat-plat = callPackage ../misc/themes/flat-plat { }; + flockit = callPackage ../tools/backup/flockit { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - freestyle = callPackage ../misc/freestyle { }; - gajim = callPackage ../applications/networking/instant-messengers/gajim { }; - gale = callPackage ../applications/networking/instant-messengers/gale { }; - gammu = callPackage ../applications/misc/gammu { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; @@ -18767,7 +18721,6 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { - automake = automake113x; gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; @@ -18908,10 +18861,12 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_11; + terraform_0_9_11 + terraform_0_10_0; terraform_0_8 = terraform_0_8_8; terraform_0_9 = terraform_0_9_11; + terraform_0_10 = terraform_0_10_0; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -19160,8 +19115,6 @@ with pkgs; inherit (gnome2) gtksourceview; }; - misc = callPackage ../misc/misc.nix { }; - bullet = callPackage ../development/libraries/bullet {}; bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {}; @@ -19222,6 +19175,8 @@ with pkgs; hy = callPackage ../development/interpreters/hy {}; + check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; @@ -19242,4 +19197,9 @@ with pkgs; houdini = callPackage ../applications/misc/houdini {}; xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; + + # `recurseIntoAttrs` for sake of hydra, not nix-env + tests = recurseIntoAttrs { + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; + }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 099e45f10226..09e3835712fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,24 +1,32 @@ -{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }: +{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: -let # These are attributes in compiler and packages that don't support integer-simple. - integerSimpleExcludes = [ - "ghc6102Binary" - "ghc704Binary" - "ghc742Binary" - "ghc6104" - "ghc6123" - "ghc704" - "ghc763" - "ghcjs" - "ghcjsHEAD" - "ghcCross" - "jhc" - "uhc" - "integer-simple" - ]; -in rec { +let + # These are attributes in compiler and packages that don't support integer-simple. + integerSimpleExcludes = [ + "ghc6102Binary" + "ghc704Binary" + "ghc742Binary" + "ghc6104" + "ghc6123" + "ghc704" + "ghc763" + "ghcjs" + "ghcjsHEAD" + "ghcCross" + "jhc" + "uhc" + "integer-simple" + ]; + + haskellLib = import ../development/haskell-modules/lib.nix { + inherit (pkgs) lib; + inherit pkgs; + }; - lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; + callPackage = newScope { inherit haskellLib; }; + +in rec { + lib = haskellLib; compiler = { @@ -76,7 +84,7 @@ in rec { selfPkgs = packages.ghc821; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc802; inherit (bootPkgs) alex happy; inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bc5253328cfa..492b22c05523 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -552,6 +552,8 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + process = callPackage ../development/ocaml-modules/process { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; @@ -610,6 +612,8 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + wasm = callPackage ../development/ocaml-modules/wasm { }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 156be853cebb..8601f2661860 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14183,12 +14183,13 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.72"; + name = "Text-BibTeX-0.81"; buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "0vfnj9ygdjympc8hsf38nc4a1lq45qbq7v6z6mrnfgr3k198b6gw"; + sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf"; }; + perlPreHook = "export LD=gcc"; meta = { description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cec9674c8b51..1d07acb8e77c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,14 +235,14 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1x467ngxb976ba2r9kqba7jpvm95a0db8nwaa2z14zs7xv1la6bb"; + sha256 = "107v8hdgmi2s15zsd9ffrr3jyw01qkwv174y9gw9fbpdrjwffi97"; }; + unpackPhase = ":"; - phases = [ "installPhase" ]; buildInputs = [ pkgs.makeWrapper ]; installPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3723dcb406..74be1ab3a768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -35,7 +35,24 @@ let mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix { }); - buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { + + # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. + # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. + makeOverridablePythonPackage = f: origArgs: + let + ff = f origArgs; + overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + in + if builtins.isAttrs ff then (ff // { + overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + }) + else if builtins.isFunction ff then { + overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); + __functor = self: ff; + } + else ff; + + buildPythonPackage = makeOverridablePythonPackage (callPackage ../development/interpreters/python/build-python-package.nix { inherit mkPythonDerivation; inherit bootstrapped-pip; flit = self.flit; @@ -146,6 +163,8 @@ in { discordpy = callPackage ../development/python-modules/discordpy { }; + distorm3 = callPackage ../development/python-modules/distorm3 { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; @@ -292,13 +311,23 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; - aiohttp = buildPythonPackage rec { + aiohttp = + let yarl_0_9_8 = self.yarl.overrideAttrs (old: rec { + pname = "yarl"; + version = "0.9.8"; + name = "${pname}-${version}"; + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; + }; + }); + in buildPythonPackage rec { name = "aiohttp-${version}"; - version = "1.1.6"; + version = "1.3.5"; src = pkgs.fetchurl { url = "mirror://pypi/a/aiohttp/${name}.tar.gz"; - sha256 = "0742feb9759a5832aa4a30abf64e53055e139ed41e26f79b9558d08e05c74d60"; + sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d"; }; disabled = pythonOlder "3.4"; @@ -306,15 +335,40 @@ in { doCheck = false; # Too many tests fail. buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl ]; + propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl_0_9_8 ]; meta = { - description = "http client/server for asyncio"; + description = "Http client/server for asyncio"; license = with licenses; [ asl20 ]; homepage = https://github.com/KeepSafe/aiohttp/; }; }; + aiohttp-cors = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "aiohttp-cors"; + # 0.5.3 is the current version but gns3-server requires 0.5.1 + version = "0.5.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/${pname}/${name}.tar.gz"; + sha256 = "0szma27ri25fq4nwwvs36myddggw3jz4pyzmq63yz4xpw0jjdxck"; + }; + + # Requires network access + doCheck = false; + + propagatedBuildInputs = with self; [ aiohttp ] + ++ optional (pythonOlder "3.5") typing; + + meta = { + description = "CORS support for aiohttp"; + homepage = "https://github.com/aio-libs/aiohttp-cors"; + license = licenses.asl20; + maintainers = with maintainers; [ primeos ]; + }; + }; + alabaster = callPackage ../development/python-modules/alabaster {}; alembic = callPackage ../development/python-modules/alembic {}; @@ -359,88 +413,6 @@ in { }; }; - almir = let - sqlalchemy_0_8 = buildPythonPackage rec { - name = "SQLAlchemy-0.8.7"; - disabled = isPy34 || isPy35; -# doCheck = !isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc"; - }; - - preConfigure = optionalString isPy3k '' - python3 sa2to3.py --no-diffs -w lib test examples - ''; - - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; - - checkPhase = '' - ${python.executable} sqla_nose.py - ''; - - doCheck = false; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - }; - }; - in buildPythonPackage rec { - name = "almir-0.1.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/almir/${name}.zip"; - sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe"; - }; - - buildInputs = with self; [ - pkgs.which - self.coverage - self.mock - self.tissue - self.unittest2 - self.webtest - ]; - - propagatedBuildInputs = with self; [ - pkgs.makeWrapper - pkgs.bacula - self.colander - self.deform - self.deform_bootstrap - self.docutils - self.nose - self.mysql_connector_repackaged - self.pg8000 - self.pyramid - self.pyramid_beaker - self.pyramid_exclog - self.pyramid_jinja2 - self.pyramid_tm - self.pytz - sqlalchemy_0_8 - self.transaction - self.waitress - self.webhelpers - self.psycopg2 - (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy_0_8 transaction ];}) - ]; - - postInstall = '' - ln -s ${pkgs.bacula}/bin/bconsole $out/bin - ''; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.all; - # Two versions of sqlalchemy in closure - broken = true; - }; - }; - alot = buildPythonPackage rec { rev = "0.5.1"; @@ -583,7 +555,7 @@ in { }; meta = { - description = "Disable App Nap on OS X"; + description = "Disable App Nap on macOS"; homepage = https://pypi.python.org/pypi/appnope; platforms = platforms.darwin; license = licenses.bsd3; @@ -721,7 +693,7 @@ in { sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001"; }; - # Mac OS X needs clang for testing + # macOS needs clang for testing buildInputs = with self; [ pytest hypothesis zope_interface pympler coverage ] ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; @@ -737,24 +709,7 @@ in { }; }); - audioread = buildPythonPackage rec { - name = "audioread-${version}"; - version = "2.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/audioread/${name}.tar.gz"; - sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e"; - }; - - # No tests, need to disable or py3k breaks - doCheck = false; - - meta = { - description = "Cross-platform audio decoding"; - homepage = "https://github.com/sampsyo/audioread"; - license = licenses.mit; - }; - }; + audioread = callPackage ../development/python-modules/audioread { }; audiotools = buildPythonPackage rec { name = "audiotools-${version}"; @@ -2582,7 +2537,7 @@ in { meta = { homepage = "http://www.buildout.org"; description = "A software build and configuration system"; - license = licenses.zpt21; + license = licenses.zpl21; maintainers = with maintainers; [ garbas ]; }; }; @@ -6436,7 +6391,7 @@ in { }; }; - gst-python = callPackage ../development/libraries/gstreamer/python { + gst-python = callPackage ../development/python-modules/gst-python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -6676,14 +6631,14 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; - version = "0.4.5-pre"; + version = "0.4.2.post1"; disabled = isPy26 || isPy27; src = pkgs.fetchFromGitHub { owner = "ipfs"; repo = "py-ipfs-api"; - rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f"; - sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; + rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; + sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; }; propagatedBuildInputs = with self; [ six requests ]; @@ -6953,6 +6908,8 @@ in { propagatedBuildInputs = with self; [ six pycrypto ]; + doCheck = false; + meta = { description = "libthumbor is the python extension to thumbor"; homepage = http://github.com/heynemann/libthumbor; @@ -8104,22 +8061,6 @@ in { }; - pyramid_tm = buildPythonPackage rec { - name = "pyramid_tm-0.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_tm/${name}.tar.gz"; - sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d"; - }; - - propagatedBuildInputs = with self; [ transaction pyramid ]; - meta = { - maintainers = with maintainers; [ garbas domenkozar matejc ]; - platforms = platforms.all; - }; - }; - - pyramid_multiauth = buildPythonPackage rec { name = "pyramid_multiauth-${version}"; version = "0.8.0"; @@ -8146,7 +8087,8 @@ in { sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; - propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ]; + propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ]; + buildInputs = with self; [ webtest ]; }; pyroute2 = callPackage ../development/python-modules/pyroute2 { }; @@ -8229,11 +8171,11 @@ in { }; raven = buildPythonPackage rec { - name = "raven-3.4.1"; + name = "raven-6.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "c27e40ab3ccf37f30a9f77acb4917370d9341e25abda8e94b9bd48c7127f7d48"; + sha256 = "1158fsjjl8byzl9nw52jhhdssjl6n7l0hjaxm5hdi69v2zxvzjh2"; }; # way too many dependencies to run tests @@ -8241,7 +8183,7 @@ in { doCheck = false; meta = { - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ primeos ]; }; }; @@ -8413,21 +8355,6 @@ in { }; }; - hypatia = buildPythonPackage rec { - name = "hypatia-0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hypatia/${name}.tar.gz"; - sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9"; - }; - - buildInputs = with self; [ zope_interface zodb ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - zope_copy = buildPythonPackage rec { name = "zope.copy-4.0.2"; @@ -8526,41 +8453,6 @@ in { }; }; - pyramid_zodbconn = buildPythonPackage rec { - name = "pyramid_zodbconn-0.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_zodbconn/${name}.tar.gz"; - sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63"; - }; - - # should be fixed in next release - doCheck = false; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ pyramid zodb zodburi ZEO ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - - - pyramid_mailer = buildPythonPackage rec { - name = "pyramid_mailer-0.13"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid_mailer/${name}.tar.gz"; - sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc"; - }; - - buildInputs = with self; [ pyramid transaction ]; - propagatedBuildInputs = with self; [ repoze_sendmail ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; pyrtlsdr = buildPythonPackage rec { name = "pyrtlsdr-0.2.0"; @@ -8583,53 +8475,6 @@ in { }; }; - - repoze_sendmail = buildPythonPackage rec { - name = "repoze.sendmail-4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/repoze.sendmail/${name}.tar.gz"; - sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2"; - }; - - buildInputs = with self; [ transaction ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - - - zodburi = buildPythonPackage rec { - name = "zodburi-2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zodburi/${name}.tar.gz"; - sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0"; - }; - - buildInputs = with self; [ zodb mock ZEO ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - - ZEO = self.buildPythonPackage rec { - name = "ZEO-4.0.0"; - - propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/Z/ZEO/${name}.tar.gz"; - sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/ZEO; - }; - }; - random2 = self.buildPythonPackage rec { name = "random2-1.0.1"; @@ -8860,18 +8705,6 @@ in { }; - zope_tales = buildPythonPackage rec { - name = "zope.tales-4.0.2"; - - propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.tales/${name}.zip"; - sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e"; - }; - }; - - zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-4.1.2"; @@ -9760,6 +9593,8 @@ in { }; }; + feedgen = callPackage ../development/python-modules/feedgen { }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; @@ -10200,7 +10035,7 @@ in { }; patchPhase = '' - substituteInPlace dialog.py ":/bin:/usr/bin" ":$out/bin" + substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin" ''; meta = with stdenv.lib; { @@ -12014,7 +11849,7 @@ in { konfig = buildPythonPackage rec { name = "konfig-${version}"; - version = "0.9"; + version = "1.1"; # konfig unconditionaly depend on configparser, even if it is part of # the standard library in python 3.2 or above. @@ -12023,10 +11858,26 @@ in { src = pkgs.fetchgit { url = https://github.com/mozilla-services/konfig.git; rev = "refs/tags/${version}"; - sha256 = "1kc5iy61ckbmf65d9ssyqiyb25lnxjvr7c2vcsdl9wx4n6fhwzx3"; + sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = with self; [ configparser argparse ]; + propagatedBuildInputs = with self; [ configparser six ]; + + patches = [ (pkgs.writeText "konfig.patch" '' + diff --git a/setup.py b/setup.py + index 96fd858..bb4db06 100644 + --- a/setup.py + +++ b/setup.py + @@ -20,7 +20,7 @@ setup(name='konfig', + author_email="tarek@mozilla.com", + include_package_data=True, + install_requires = [ + - 'configparser', 'argparse', 'six' + + 'configparser', 'six' + ], + zip_safe=False, + classifiers=classifiers, + '') ]; meta = { description = "Yet Another Config Parser"; @@ -12240,6 +12091,8 @@ in { }; }; + linode-api = callPackage ../development/python-modules/linode-api { }; + livereload = buildPythonPackage rec { name = "livereload-${version}"; version = "2.5.0"; @@ -12549,7 +12402,7 @@ in { meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = licenses.zpt20; + license = licenses.zpl20; }; }; @@ -15483,27 +15336,7 @@ in { ''; }; - pecan = buildPythonPackage rec { - name = "pecan-${version}"; - version = "1.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pecan/${name}.tar.gz"; - sha256 = "04abmybab8jzbwgmrr0fcpcfhcvvkdsv9q135dss02wyk9q9jv4d"; - }; - - propagatedBuildInputs = with self; [ - singledispatch logutils - ]; - buildInputs = with self; [ - webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv - ]; - - meta = with stdenv.lib; { - description = "Pecan"; - homepage = "http://github.com/pecan/pecan"; - }; - }; + pecan = callPackage ../development/python-modules/pecan { }; kaitaistruct = buildPythonPackage rec { name = "kaitaistruct-${version}"; @@ -16199,23 +16032,7 @@ in { }; - bottleneck = buildPythonPackage rec { - name = "Bottleneck-${version}"; - version = "1.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = [self.numpy]; - checkPhase = '' - nosetests -v $out/${python.sitePackages} - ''; - postPatch = '' - substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" - ''; - }; + bottleneck = callPackage ../development/python-modules/bottleneck { }; paho-mqtt = buildPythonPackage rec { name = "paho-mqtt-${version}"; @@ -16309,6 +16126,8 @@ in { }; }; + paramz = callPackage ../development/python-modules/paramz { }; + parsel = buildPythonPackage rec { name = "parsel-${version}"; version = "1.1.0"; @@ -16464,7 +16283,7 @@ in { pasteScript = buildPythonPackage rec { version = "1.7.5"; - name = "PasterScript-${version}"; + name = "PasteScript-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/P/PasteScript/${name}.tar.gz"; @@ -17271,7 +17090,7 @@ in { doCheck = false; meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = with licenses; [ gpl2 zpt20 ]; + license = with licenses; [ gpl2 zpl20 ]; }; }; @@ -21321,7 +21140,7 @@ in { meta = { description = "Simple generic functions"; homepage = http://cheeseshop.python.org/pypi/simplegeneric; - license = licenses.zpt21; + license = licenses.zpl21; }; }; @@ -22367,50 +22186,9 @@ in { }; }); - sphinx = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "Sphinx"; - version = "1.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; - }; - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; - propagatedBuildInputs = with self; [ - docutils - jinja2 - pygments - alabaster - Babel - snowballstemmer - six - sqlalchemy - whoosh - imagesize - requests - ]; - - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }); + sphinx = callPackage ../development/python-modules/sphinx { }; - sphinx_1_2 = self.sphinx.override rec { + sphinx_1_2 = self.sphinx.overridePythonAttrs rec { name = "sphinx-1.2.3"; src = pkgs.fetchurl { url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; @@ -23557,23 +23335,8 @@ in { }; - transaction = buildPythonPackage rec { - name = "transaction-${version}"; - version = "1.4.3"; + transaction = callPackage ../development/python-modules/transaction { }; - src = pkgs.fetchurl { - url = "mirror://pypi/t/transaction/${name}.tar.gz"; - sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5"; - }; - - propagatedBuildInputs = with self; [ zope_interface ]; - - meta = { - description = "Transaction management"; - homepage = http://pypi.python.org/pypi/transaction; - license = licenses.zpt20; - }; - }; transmissionrpc = buildPythonPackage rec { name = "transmissionrpc-${version}"; @@ -23609,7 +23372,7 @@ in { meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = licenses.zpt20; + license = licenses.zpl20; }; }; @@ -23896,23 +23659,7 @@ in { }; - umemcache = buildPythonPackage rec { - name = "umemcache-${version}"; - version = "1.6.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/umemcache/${name}.zip"; - sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; - }; - - meta = { - description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; - homepage = https://github.com/esnme/ultramemcache; - license = licenses.bsdOriginal; - broken = true; - }; - }; + umemcache = callPackage ../development/python-modules/umemcache {}; unicodecsv = buildPythonPackage rec { version = "0.14.1"; @@ -24779,7 +24526,7 @@ EOF meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -24815,52 +24562,27 @@ EOF }; }); - zodb3 = buildPythonPackage rec { - name = "zodb3-${version}"; - version = "3.11.0"; - disabled = isPyPy; + zipstream = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "zipstream"; + version = "1.1.4"; src = pkgs.fetchurl { - url = "mirror://pypi/Z/ZODB3/ZODB3-${version}.tar.gz"; - sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0"; + url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; }; - propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ]; + buildInputs = with self; [ nose ]; meta = { - description = "An object-oriented database for Python"; - homepage = http://pypi.python.org/pypi/ZODB3; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; + description = "A zip archive generator"; + homepage = "https://github.com/allanlei/python-zipstream"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ primeos ]; }; }; - zodb = buildPythonPackage rec { - name = "zodb-${version}"; - disabled = isPyPy; - - version = "4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz"; - sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58"; - }; - - propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] - ++ optionals isPy3k [ zodbpickle ]; - - preCheck = if isPy3k then '' - # test failure on py3.4 - rm src/ZODB/tests/testDB.py - '' else ""; - - meta = { - description = "An object-oriented database for Python"; - homepage = http://pypi.python.org/pypi/ZODB; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + zodb = callPackage ../development/python-modules/zodb {}; zodbpickle = callPackage ../development/python-modules/zodbpickle {}; @@ -24925,40 +24647,6 @@ EOF }; - zope_browser = buildPythonPackage rec { - name = "zope.browser-2.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.browser/${name}.zip"; - sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy"; - }; - - propagatedBuildInputs = with self; [ zope_interface ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - zope_browserresource = buildPythonPackage rec { - name = "zope.browserresource-4.0.1"; - - propagatedBuildInputs = with self; [ - zope_component zope_configuration zope_contenttype zope_i18n - zope_interface zope_location zope_publisher zope_schema zope_traversing - ]; - - # all tests fail - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.browserresource/zope.browserresource-4.0.1.zip"; - sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2"; - }; - }; - - - zope_component = buildPythonPackage rec { name = "zope.component-4.2.1"; @@ -25001,29 +24689,6 @@ EOF }; - zope_container = buildPythonPackage rec { - name = "zope.container-4.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.container/${name}.tar.gz"; - sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940"; - }; - - # a test is failing - doCheck = false; - - propagatedBuildInputs = with self; [ - zodb3 zope_broken zope_dottedname zope_publisher - zope_filerepresentation zope_lifecycleevent zope_size - zope_traversing - ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - zope_contenttype = buildPythonPackage rec { name = "zope.contenttype-4.0.1"; @@ -25063,7 +24728,7 @@ EOF meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25086,7 +24751,7 @@ EOF meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25196,24 +24861,6 @@ EOF }; - zope_publisher = buildPythonPackage rec { - name = "zope.publisher-3.12.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.publisher/${name}.tar.gz"; - sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4"; - }; - - propagatedBuildInputs = with self; [ - zope_browser zope_contenttype zope_i18n zope_security - ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - zope_schema = buildPythonPackage rec { name = "zope.schema-4.4.2"; @@ -25235,25 +24882,6 @@ EOF }; - zope_security = buildPythonPackage rec { - name = "zope.security-4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.security/${name}.tar.gz"; - sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec"; - }; - - propagatedBuildInputs = with self; [ - zope_component zope_configuration zope_i18nmessageid zope_schema - zope_proxy zope_testrunner - ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - zope_size = buildPythonPackage rec { name = "zope.size-3.5.0"; @@ -25270,26 +24898,6 @@ EOF }; - zope_sqlalchemy = buildPythonPackage rec { - name = "zope.sqlalchemy-0.7.6"; - - doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12 - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.sqlalchemy/${name}.zip"; - sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj"; - }; - - buildInputs = with self; [ zope_testing zope_interface ]; - propagatedBuildInputs = with self; [ sqlalchemy transaction ]; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; - - zope_testing = buildPythonPackage rec { name = "zope.testing-${version}"; version = "4.6.1"; @@ -25306,7 +24914,7 @@ EOF meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = licenses.zpt20; + license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; }; @@ -25314,24 +24922,6 @@ EOF zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - zope_traversing = buildPythonPackage rec { - name = "zope.traversing-4.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.traversing/${name}.zip"; - sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb"; - }; - - propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ]; - - # circular dependency on zope_browserresource - doCheck = false; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - zope_interface = callPackage ../development/python-modules/zope_interface { }; @@ -25814,7 +25404,7 @@ EOF substituteInPlace setup.py \ --replace pypng>=0.0.18 purepng \ --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ - --replace 'argparse==1.2.1' 'argparse' \ + --replace 'argparse==1.2.1' "" \ --replace 'protobuf==3.0.0a3' 'protobuf' \ --replace 'noise==1.2.2' 'noise' \ --replace 'PyPlatec==1.4.0' 'PyPlatec' \ @@ -26356,13 +25946,13 @@ EOF }; libvirt = let - version = "3.5.0"; + version = "3.6.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw"; + sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -26679,7 +26269,7 @@ EOF pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; - buildInputs = with self; [ testfixtures unittest2 ]; + buildInputs = with self; [ testfixtures unittest2 webtest ]; #doCheck = false; # lazy packager }; @@ -28358,7 +27948,7 @@ EOF doCheck = false; meta = { - description = "Send file to trash natively under Mac OS X, Windows and Linux"; + description = "Send file to trash natively under macOS, Windows and Linux"; homepage = https://github.com/hsoft/send2trash; license = licenses.bsd3; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index f329f2460d71..40218a2b7025 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -2,7 +2,7 @@ the load on Hydra when testing the `stdenv-updates' branch. */ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } -, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] }: with import ./release-lib.nix { inherit supportedSystems; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index be57b40fca64..f59b2debe86c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -8,20 +8,23 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ - { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false -, # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] -, # Strip most of attributes when evaluating to spare memory usage - scrubJobs ? true -, # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + # The platforms for which we build Nixpkgs. +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] +, limitedSupportedSystems ? [ "i686-linux" ] + # Strip most of attributes when evaluating to spare memory usage +, scrubJobs ? true + # Attributes passed to nixpkgs. Don't build packages marked as unfree. +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let + + systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems; + jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; @@ -42,6 +45,7 @@ let jobs.python.x86_64-darwin jobs.rustc.x86_64-darwin jobs.go.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin ]; }; @@ -54,53 +58,47 @@ let jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux - jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux - jobs.linux.i686-linux jobs.python.x86_64-linux - jobs.python.i686-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux - jobs.python3.i686-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux - jobs.nix-repl.i686-linux jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs - jobs.nox.i686-linux jobs.nox.x86_64-linux jobs.nox.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux - jobs.thunderbird.i686-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; - } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { - stdenvBootstrapTools.i686-linux = - { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { - stdenvBootstrapTools.x86_64-linux = - { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) { - stdenvBootstrapTools.aarch64-linux = - { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; }; - }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { - stdenvBootstrapTools.x86_64-darwin = - let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; - in { - # Lightweight distribution and test - inherit (bootstrap) dist test; - # Test a full stdenv bootstrap from the bootstrap tools definition - inherit (bootstrap.test-pkgs) stdenv; - }; - }) // (mapTestOn ((packagePlatforms pkgs) // rec { + + stdenvBootstrapTools = with lib; + genAttrs systemsWithAnySupport + (system: { + inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; }) + dist test; + }) + # darwin is special in this + // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { + x86_64-darwin = + let + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; + in { + # Lightweight distribution and test + inherit (bootstrap) dist test; + # Test a full stdenv bootstrap from the bootstrap tools definition + inherit (bootstrap.test-pkgs) stdenv; + }; + }; + + } // (mapTestOn ((packagePlatforms pkgs) // rec { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; @@ -129,6 +127,8 @@ let scikitlearn = unix; }; + # hack around broken eval of non-linux packages for now. + tests.macOSSierraShared = darwin; } )); in jobs |