diff options
576 files changed, 18348 insertions, 10329 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 92676378936b..8400aa5c684f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,4 +32,4 @@ See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](ht ## Reviewing contributions -See the nixpkgs manual for more details on how to [Review contributions](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-reviewing-contributions). +See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions). diff --git a/.mention-bot b/.mention-bot index 8aeeedace10f..2bbe4a40bd49 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,7 +1,8 @@ { "userBlacklist": [ "civodul", - "jhasse" + "jhasse", + "shlevy" ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, diff --git a/doc/functions.xml b/doc/functions.xml index 3850e58c0168..70326936a570 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -8,252 +8,295 @@ The nixpkgs repository has several utility functions to manipulate Nix expressions. </para> -<section xml:id="sec-pkgs-overridePackages"> - <title>pkgs.overridePackages</title> +<section xml:id="sec-overrides"> + <title>Overriding</title> <para> - This function inside the nixpkgs expression (<varname>pkgs</varname>) - can be used to override the set of packages itself. - </para> - <para> - Warning: this function is expensive and must not be used from within - the nixpkgs repository. - </para> - <para> - Example usage: - - <programlisting>let - pkgs = import <nixpkgs> {}; - newpkgs = pkgs.overridePackages (self: super: { - foo = super.foo.override { ... }; - }; -in ...</programlisting> + Sometimes one wants to override parts of + <literal>nixpkgs</literal>, e.g. derivation attributes, the results of + derivations or even the whole package set. </para> - <para> - The resulting <varname>newpkgs</varname> will have the new <varname>foo</varname> - expression, and all other expressions depending on <varname>foo</varname> will also - use the new <varname>foo</varname> expression. - </para> + <section xml:id="sec-pkgs-overridePackages"> + <title>pkgs.overridePackages</title> - <para> - The behavior of this function is similar to <link - linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>. - </para> + <para> + This function inside the nixpkgs expression (<varname>pkgs</varname>) + can be used to override the set of packages itself. + </para> + <para> + Warning: this function is expensive and must not be used from within + the nixpkgs repository. + </para> + <para> + Example usage: - <para> - The <varname>self</varname> parameter refers to the final package set with the - applied overrides. Using this parameter may lead to infinite recursion if not - used consciously. - </para> + <programlisting>let + pkgs = import <nixpkgs> {}; + newpkgs = pkgs.overridePackages (self: super: { + foo = super.foo.override { ... }; + }; + in ...</programlisting> + </para> - <para> - The <varname>super</varname> parameter refers to the old package set. - It's equivalent to <varname>pkgs</varname> in the above example. - </para> + <para> + The resulting <varname>newpkgs</varname> will have the new <varname>foo</varname> + expression, and all other expressions depending on <varname>foo</varname> will also + use the new <varname>foo</varname> expression. + </para> - <para> - Note that in previous versions of nixpkgs, this method replaced any changes from <link - linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>, - along with that from previous calls if this function was called repeatedly. - Now those previous changes will be preserved so this function can be "chained" meaningfully. - To recover the old behavior, make sure <varname>config.packageOverrides</varname> is unset, - and call this only once off a "freshly" imported nixpkgs: - - <programlisting>let - pkgs = import <nixpkgs> { config: {}; }; - newpkgs = pkgs.overridePackages ...; -in ...</programlisting> - </para> + <para> + The behavior of this function is similar to <link + linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>. + </para> -</section> + <para> + The <varname>self</varname> parameter refers to the final package set with the + applied overrides. Using this parameter may lead to infinite recursion if not + used consciously. + </para> -<section xml:id="sec-pkg-override"> - <title><pkg>.override</title> + <para> + The <varname>super</varname> parameter refers to the old package set. + It's equivalent to <varname>pkgs</varname> in the above example. + </para> - <para> - The function <varname>override</varname> is usually available for all the - derivations in the nixpkgs expression (<varname>pkgs</varname>). - </para> - <para> - It is used to override the arguments passed to a function. - </para> - <para> - Example usages: - - <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting> - <programlisting>pkgs.overridePackages (self: super: { - foo = super.foo.override { barSupport = true ; }; -})</programlisting> - <programlisting>mypkg = pkgs.callPackage ./mypkg.nix { - mydep = pkgs.mydep.override { ... }; -})</programlisting> - </para> + <para> + Note that in previous versions of nixpkgs, this method replaced any changes from <link + linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>, + along with that from previous calls if this function was called repeatedly. + Now those previous changes will be preserved so this function can be "chained" meaningfully. + To recover the old behavior, make sure <varname>config.packageOverrides</varname> is unset, + and call this only once off a "freshly" imported nixpkgs: + + <programlisting>let + pkgs = import <nixpkgs> { config: {}; }; + newpkgs = pkgs.overridePackages ...; + in ...</programlisting> + </para> - <para> - In the first example, <varname>pkgs.foo</varname> is the result of a function call - with some default arguments, usually a derivation. - Using <varname>pkgs.foo.override</varname> will call the same function with - the given new arguments. - </para> + </section> -</section> + <section xml:id="sec-pkg-override"> + <title><pkg>.override</title> -<section xml:id="sec-pkg-overrideAttrs"> - <title><pkg>.overrideAttrs</title> + <para> + The function <varname>override</varname> is usually available for all the + derivations in the nixpkgs expression (<varname>pkgs</varname>). + </para> + <para> + It is used to override the arguments passed to a function. + </para> + <para> + Example usages: + + <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting> + <programlisting>pkgs.overridePackages (self: super: { + foo = super.foo.override { barSupport = true ; }; + })</programlisting> + <programlisting>mypkg = pkgs.callPackage ./mypkg.nix { + mydep = pkgs.mydep.override { ... }; + })</programlisting> + </para> - <para> - The function <varname>overrideAttrs</varname> allows overriding the - attribute set passed to a <varname>stdenv.mkDerivation</varname> call, - producing a new derivation based on the original one. - This function is available on all derivations produced by the - <varname>stdenv.mkDerivation</varname> function, which is most packages - in the nixpkgs expression <varname>pkgs</varname>. - </para> + <para> + In the first example, <varname>pkgs.foo</varname> is the result of a function call + with some default arguments, usually a derivation. + Using <varname>pkgs.foo.override</varname> will call the same function with + the given new arguments. + </para> - <para> - Example usage: + </section> - <programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { - separateDebugInfo = true; -});</programlisting> - </para> + <section xml:id="sec-pkg-overrideAttrs"> + <title><pkg>.overrideAttrs</title> - <para> - In the above example, the <varname>separateDebugInfo</varname> attribute is - overriden to be true, thus building debug info for - <varname>helloWithDebug</varname>, while all other attributes will be - retained from the original <varname>hello</varname> package. - </para> + <para> + The function <varname>overrideAttrs</varname> allows overriding the + attribute set passed to a <varname>stdenv.mkDerivation</varname> call, + producing a new derivation based on the original one. + This function is available on all derivations produced by the + <varname>stdenv.mkDerivation</varname> function, which is most packages + in the nixpkgs expression <varname>pkgs</varname>. + </para> - <para> - The argument <varname>oldAttrs</varname> is conventionally used to refer to - the attr set originally passed to <varname>stdenv.mkDerivation</varname>. - </para> + <para> + Example usage: + + <programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + separateDebugInfo = true; + });</programlisting> + </para> - <note> <para> - Note that <varname>separateDebugInfo</varname> is processed only by the - <varname>stdenv.mkDerivation</varname> function, not the generated, raw - Nix derivation. Thus, using <varname>overrideDerivation</varname> will - not work in this case, as it overrides only the attributes of the final - derivation. It is for this reason that <varname>overrideAttrs</varname> - should be preferred in (almost) all cases to - <varname>overrideDerivation</varname>, i.e. to allow using - <varname>sdenv.mkDerivation</varname> to process input arguments, as well - as the fact that it is easier to use (you can use the same attribute - names you see in your Nix code, instead of the ones generated (e.g. - <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>, - and involves less typing. + In the above example, the <varname>separateDebugInfo</varname> attribute is + overriden to be true, thus building debug info for + <varname>helloWithDebug</varname>, while all other attributes will be + retained from the original <varname>hello</varname> package. </para> - </note> -</section> + <para> + The argument <varname>oldAttrs</varname> is conventionally used to refer to + the attr set originally passed to <varname>stdenv.mkDerivation</varname>. + </para> + + <note> + <para> + Note that <varname>separateDebugInfo</varname> is processed only by the + <varname>stdenv.mkDerivation</varname> function, not the generated, raw + Nix derivation. Thus, using <varname>overrideDerivation</varname> will + not work in this case, as it overrides only the attributes of the final + derivation. It is for this reason that <varname>overrideAttrs</varname> + should be preferred in (almost) all cases to + <varname>overrideDerivation</varname>, i.e. to allow using + <varname>sdenv.mkDerivation</varname> to process input arguments, as well + as the fact that it is easier to use (you can use the same attribute + names you see in your Nix code, instead of the ones generated (e.g. + <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>, + and involves less typing. + </para> + </note> + + </section> -<section xml:id="sec-pkg-overrideDerivation"> - <title><pkg>.overrideDerivation</title> + <section xml:id="sec-pkg-overrideDerivation"> + <title><pkg>.overrideDerivation</title> - <warning> - <para>You should prefer <varname>overrideAttrs</varname> in almost all - cases, see its documentation for the reasons why. - <varname>overrideDerivation</varname> is not deprecated and will continue - to work, but is less nice to use and does not have as many abilities as - <varname>overrideAttrs</varname>. + <warning> + <para>You should prefer <varname>overrideAttrs</varname> in almost all + cases, see its documentation for the reasons why. + <varname>overrideDerivation</varname> is not deprecated and will continue + to work, but is less nice to use and does not have as many abilities as + <varname>overrideAttrs</varname>. + </para> + </warning> + + <warning> + <para>Do not use this function in Nixpkgs as it evaluates a Derivation + before modifying it, which breaks package abstraction and removes + error-checking of function arguments. In addition, this + evaluation-per-function application incurs a performance penalty, + which can become a problem if many overrides are used. + It is only intended for ad-hoc customisation, such as in + <filename>~/.nixpkgs/config.nix</filename>. </para> - </warning> + </warning> - <warning> - <para>Do not use this function in Nixpkgs as it evaluates a Derivation - before modifying it, which breaks package abstraction and removes - error-checking of function arguments. In addition, this - evaluation-per-function application incurs a performance penalty, - which can become a problem if many overrides are used. - It is only intended for ad-hoc customisation, such as in - <filename>~/.nixpkgs/config.nix</filename>. - </para> - </warning> + <para> + The function <varname>overrideDerivation</varname> creates a new derivation + based on an existing one by overriding the original's attributes with + the attribute set produced by the specified function. + This function is available on all + derivations defined using the <varname>makeOverridable</varname> function. + Most standard derivation-producing functions, such as + <varname>stdenv.mkDerivation</varname>, are defined using this + function, which means most packages in the nixpkgs expression, + <varname>pkgs</varname>, have this function. + </para> - <para> - The function <varname>overrideDerivation</varname> creates a new derivation - based on an existing one by overriding the original's attributes with - the attribute set produced by the specified function. - This function is available on all - derivations defined using the <varname>makeOverridable</varname> function. - Most standard derivation-producing functions, such as - <varname>stdenv.mkDerivation</varname>, are defined using this - function, which means most packages in the nixpkgs expression, - <varname>pkgs</varname>, have this function. - </para> + <para> + Example usage: - <para> - Example usage: - - <programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: { - name = "sed-4.2.2-pre"; - src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; - }; - patches = []; -});</programlisting> - </para> + <programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: { + name = "sed-4.2.2-pre"; + src = fetchurl { + url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; + sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; + }; + patches = []; + });</programlisting> + </para> - <para> - In the above example, the <varname>name</varname>, <varname>src</varname>, - and <varname>patches</varname> of the derivation will be overridden, while - all other attributes will be retained from the original derivation. - </para> + <para> + In the above example, the <varname>name</varname>, <varname>src</varname>, + and <varname>patches</varname> of the derivation will be overridden, while + all other attributes will be retained from the original derivation. + </para> - <para> - The argument <varname>oldAttrs</varname> is used to refer to the attribute set of - the original derivation. - </para> + <para> + The argument <varname>oldAttrs</varname> is used to refer to the attribute set of + the original derivation. + </para> + + <note> + <para> + A package's attributes are evaluated *before* being modified by + the <varname>overrideDerivation</varname> function. + For example, the <varname>name</varname> attribute reference + in <varname>url = "mirror://gnu/hello/${name}.tar.gz";</varname> + is filled-in *before* the <varname>overrideDerivation</varname> function + modifies the attribute set. This means that overriding the + <varname>name</varname> attribute, in this example, *will not* change the + value of the <varname>url</varname> attribute. Instead, we need to override + both the <varname>name</varname> *and* <varname>url</varname> attributes. + </para> + </note> + + </section> + + <section xml:id="sec-lib-makeOverridable"> + <title>lib.makeOverridable</title> - <note> <para> - A package's attributes are evaluated *before* being modified by - the <varname>overrideDerivation</varname> function. - For example, the <varname>name</varname> attribute reference - in <varname>url = "mirror://gnu/hello/${name}.tar.gz";</varname> - is filled-in *before* the <varname>overrideDerivation</varname> function - modifies the attribute set. This means that overriding the - <varname>name</varname> attribute, in this example, *will not* change the - value of the <varname>url</varname> attribute. Instead, we need to override - both the <varname>name</varname> *and* <varname>url</varname> attributes. + The function <varname>lib.makeOverridable</varname> is used to make the result + of a function easily customizable. This utility only makes sense for functions + that accept an argument set and return an attribute set. </para> - </note> -</section> + <para> + Example usage: -<section xml:id="sec-lib-makeOverridable"> - <title>lib.makeOverridable</title> + <programlisting>f = { a, b }: { result = a+b; } + c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> - <para> - The function <varname>lib.makeOverridable</varname> is used to make the result - of a function easily customizable. This utility only makes sense for functions - that accept an argument set and return an attribute set. - </para> + </para> - <para> - Example usage: + <para> + The variable <varname>c</varname> is the value of the <varname>f</varname> function + applied with some default arguments. Hence the value of <varname>c.result</varname> + is <literal>3</literal>, in this example. + </para> - <programlisting>f = { a, b }: { result = a+b; } -c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> + <para> + The variable <varname>c</varname> however also has some additional functions, like + <link linkend="sec-pkg-override">c.override</link> which can be used to + override the default arguments. In this example the value of + <varname>(c.override { a = 4; }).result</varname> is 6. + </para> + + </section> + +</section> +<section xml:id="sec-generators"> + <title>Generators</title> + + <para> + Generators are functions that create file formats from nix + data structures, e. g. for configuration files. + There are generators available for: <literal>INI</literal>, + <literal>JSON</literal> and <literal>YAML</literal> </para> <para> - The variable <varname>c</varname> is the value of the <varname>f</varname> function - applied with some default arguments. Hence the value of <varname>c.result</varname> - is <literal>3</literal>, in this example. + All generators follow a similar call interface: <code>generatorName + configFunctions data</code>, where <literal>configFunctions</literal> is a + set of user-defined functions that format variable parts of the content. + They each have common defaults, so often they do not need to be set + manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" + ] name)</code> from the <literal>INI</literal> generator. It gets the name + of a section and returns a sanitized name. The default + <literal>mkSectionName</literal> escapes <literal>[</literal> and + <literal>]</literal> with a backslash. </para> + <note><para>Nix store paths can be converted to strings by enclosing a + derivation attribute like so: <code>"${drv}"</code>.</para></note> + <para> - The variable <varname>c</varname> however also has some additional functions, like - <link linkend="sec-pkg-override">c.override</link> which can be used to - override the default arguments. In this example the value of - <varname>(c.override { a = 4; }).result</varname> is 6. + Detailed documentation for each generator can be found in + <literal>lib/generators.nix</literal>. </para> </section> @@ -370,37 +413,37 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> </section> <section xml:id="sec-pkgs-dockerTools"> - <title>pkgs.dockerTools</title> +<title>pkgs.dockerTools</title> - <para> +<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 + Docker Image Specification v1.0.0 </link>. Docker itself is not used to perform any of the operations done by these functions. - </para> +</para> - <warning> +<warning> <para> - The <varname>dockerTools</varname> API is unstable and may be subject to - backwards-incompatible changes in the future. + The <varname>dockerTools</varname> API is unstable and may be subject to + backwards-incompatible changes in the future. </para> - </warning> +</warning> - <section xml:id="ssec-pkgs-dockerTools-buildImage"> +<section xml:id="ssec-pkgs-dockerTools-buildImage"> <title>buildImage</title> <para> - This function is analogous to the <command>docker build</command> command, - in that can used to build a Docker-compatible repository tarball containing - a single image with one or multiple layers. As such, the result - is suitable for being loaded in Docker with <command>docker load</command>. + This function is analogous to the <command>docker build</command> command, + in that can used to build a Docker-compatible repository tarball containing + a single image with one or multiple layers. As such, the result + is suitable for being loaded in Docker with <command>docker load</command>. </para> <para> - The parameters of <varname>buildImage</varname> with relative example values are - described below: + The parameters of <varname>buildImage</varname> with relative example values are + described below: </para> <example xml:id='ex-dockerTools-buildImage'><title>Docker build</title> @@ -408,11 +451,11 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> buildImage { name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' /> tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' /> - + fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' /> fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' /> fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' /> - + contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' /> runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' /> #!${stdenv.shell} @@ -431,131 +474,131 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> </example> <para>The above example will build a Docker image <literal>redis/latest</literal> - from the given base image. Loading and running this image in Docker results in - <literal>redis-server</literal> being started automatically. + from the given base image. Loading and running this image in Docker results in + <literal>redis-server</literal> being started automatically. </para> <calloutlist> - <callout arearefs='ex-dockerTools-buildImage-1'> + <callout arearefs='ex-dockerTools-buildImage-1'> <para> - <varname>name</varname> specifies the name of the resulting image. - This is the only required argument for <varname>buildImage</varname>. + <varname>name</varname> specifies the name of the resulting image. + This is the only required argument for <varname>buildImage</varname>. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-2'> + <callout arearefs='ex-dockerTools-buildImage-2'> <para> - <varname>tag</varname> specifies the tag of the resulting image. - By default it's <literal>latest</literal>. + <varname>tag</varname> specifies the tag of the resulting image. + By default it's <literal>latest</literal>. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-3'> + <callout arearefs='ex-dockerTools-buildImage-3'> <para> - <varname>fromImage</varname> is the repository tarball containing the base image. - It must be a valid Docker image, such as exported by <command>docker save</command>. - By default it's <literal>null</literal>, which can be seen as equivalent - to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>. + <varname>fromImage</varname> is the repository tarball containing the base image. + It must be a valid Docker image, such as exported by <command>docker save</command>. + By default it's <literal>null</literal>, which can be seen as equivalent + to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>. </para> - </callout> - - <callout arearefs='ex-dockerTools-buildImage-4'> + </callout> + + <callout arearefs='ex-dockerTools-buildImage-4'> <para> - <varname>fromImageName</varname> can be used to further specify - the base image within the repository, in case it contains multiple images. - By default it's <literal>null</literal>, in which case - <varname>buildImage</varname> will peek the first image available - in the repository. + <varname>fromImageName</varname> can be used to further specify + the base image within the repository, in case it contains multiple images. + By default it's <literal>null</literal>, in which case + <varname>buildImage</varname> will peek the first image available + in the repository. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-5'> + <callout arearefs='ex-dockerTools-buildImage-5'> <para> - <varname>fromImageTag</varname> can be used to further specify the tag - of the base image within the repository, in case an image contains multiple tags. - By default it's <literal>null</literal>, in which case - <varname>buildImage</varname> will peek the first tag available for the base image. + <varname>fromImageTag</varname> can be used to further specify the tag + of the base image within the repository, in case an image contains multiple tags. + By default it's <literal>null</literal>, in which case + <varname>buildImage</varname> will peek the first tag available for the base image. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-6'> + <callout arearefs='ex-dockerTools-buildImage-6'> <para> - <varname>contents</varname> is a derivation that will be copied in the new - layer of the resulting image. This can be similarly seen as - <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>. - By default it's <literal>null</literal>. + <varname>contents</varname> is a derivation that will be copied in the new + layer of the resulting image. This can be similarly seen as + <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>. + By default it's <literal>null</literal>. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-runAsRoot'> + <callout arearefs='ex-dockerTools-buildImage-runAsRoot'> <para> - <varname>runAsRoot</varname> is a bash script that will run as root - in an environment that overlays the existing layers of the base image with - the new resulting layer, including the previously copied - <varname>contents</varname> derivation. - This can be similarly seen as - <command>RUN ...</command> in a <filename>Dockerfile</filename>. - - <note> + <varname>runAsRoot</varname> is a bash script that will run as root + in an environment that overlays the existing layers of the base image with + the new resulting layer, including the previously copied + <varname>contents</varname> derivation. + This can be similarly seen as + <command>RUN ...</command> in a <filename>Dockerfile</filename>. + + <note> <para> - Using this parameter requires the <literal>kvm</literal> - device to be available. + Using this parameter requires the <literal>kvm</literal> + device to be available. </para> - </note> + </note> </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-buildImage-8'> + <callout arearefs='ex-dockerTools-buildImage-8'> <para> - <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"> + <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>. + </link>. </para> - </callout> + </callout> </calloutlist> <para> - After the new layer has been created, its closure - (to which <varname>contents</varname>, <varname>config</varname> and - <varname>runAsRoot</varname> contribute) will be copied in the layer itself. - Only new dependencies that are not already in the existing layers will be copied. + After the new layer has been created, its closure + (to which <varname>contents</varname>, <varname>config</varname> and + <varname>runAsRoot</varname> contribute) will be copied in the layer itself. + Only new dependencies that are not already in the existing layers will be copied. </para> <para> - At the end of the process, only one new single layer will be produced and - added to the resulting image. + At the end of the process, only one new single layer will be produced and + added to the resulting image. </para> <para> - The resulting repository will only list the single image - <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/> - it would be <varname>redis/latest</varname>. + The resulting repository will only list the single image + <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/> + it would be <varname>redis/latest</varname>. </para> <para> - It is possible to inspect the arguments with which an image was built - using its <varname>buildArgs</varname> attribute. + It is possible to inspect the arguments with which an image was built + using its <varname>buildArgs</varname> attribute. </para> - </section> +</section> - <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry"> +<section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry"> <title>pullImage</title> <para> - This function is analogous to the <command>docker pull</command> command, - in that can be used to fetch a Docker image from a Docker registry. - Currently only registry <literal>v1</literal> is supported. - By default <link xlink:href="https://hub.docker.com/">Docker Hub</link> - is used to pull images. + This function is analogous to the <command>docker pull</command> command, + in that can be used to fetch a Docker image from a Docker registry. + Currently only registry <literal>v1</literal> is supported. + By default <link xlink:href="https://hub.docker.com/">Docker Hub</link> + is used to pull images. </para> <para> - Its parameters are described in the example below: + Its parameters are described in the example below: </para> <example xml:id='ex-dockerTools-pullImage'><title>Docker pull</title> @@ -573,73 +616,73 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> </example> <calloutlist> - <callout arearefs='ex-dockerTools-pullImage-1'> + <callout arearefs='ex-dockerTools-pullImage-1'> <para> - <varname>imageName</varname> specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. <literal>library/debian</literal>). - This argument is required. + <varname>imageName</varname> specifies the name of the image to be downloaded, + which can also include the registry namespace (e.g. <literal>library/debian</literal>). + This argument is required. </para> - </callout> - - <callout arearefs='ex-dockerTools-pullImage-2'> + </callout> + + <callout arearefs='ex-dockerTools-pullImage-2'> <para> - <varname>imageTag</varname> specifies the tag of the image to be downloaded. - By default it's <literal>latest</literal>. + <varname>imageTag</varname> specifies the tag of the image to be downloaded. + By default it's <literal>latest</literal>. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-pullImage-3'> + <callout arearefs='ex-dockerTools-pullImage-3'> <para> - <varname>imageId</varname>, if specified this exact image will be fetched, instead - of <varname>imageName/imageTag</varname>. However, the resulting repository - will still be named <varname>imageName/imageTag</varname>. - By default it's <literal>null</literal>. + <varname>imageId</varname>, if specified this exact image will be fetched, instead + of <varname>imageName/imageTag</varname>. However, the resulting repository + will still be named <varname>imageName/imageTag</varname>. + By default it's <literal>null</literal>. </para> - </callout> + </callout> - <callout arearefs='ex-dockerTools-pullImage-4'> + <callout arearefs='ex-dockerTools-pullImage-4'> <para> - <varname>sha256</varname> is the checksum of the whole fetched image. - This argument is required. + <varname>sha256</varname> is the checksum of the whole fetched image. + This argument is required. </para> <note> - <para>The checksum is computed on the unpacked directory, not on the final tarball.</para> + <para>The checksum is computed on the unpacked directory, not on the final tarball.</para> </note> - </callout> + </callout> - <callout arearefs='ex-dockerTools-pullImage-5'> + <callout arearefs='ex-dockerTools-pullImage-5'> <para> - In the above example the default values are shown for the variables - <varname>indexUrl</varname> and <varname>registryVersion</varname>. - Hence by default the Docker.io registry is used to pull the images. + In the above example the default values are shown for the variables + <varname>indexUrl</varname> and <varname>registryVersion</varname>. + Hence by default the Docker.io registry is used to pull the images. </para> - </callout> + </callout> </calloutlist> - - </section> - - <section xml:id="ssec-pkgs-dockerTools-exportImage"> + +</section> + +<section xml:id="ssec-pkgs-dockerTools-exportImage"> <title>exportImage</title> <para> - This function is analogous to the <command>docker export</command> command, - in that can used to flatten a Docker image that contains multiple layers. - It is in fact the result of the merge of all the layers of the image. - As such, the result is suitable for being imported in Docker - with <command>docker import</command>. + This function is analogous to the <command>docker export</command> command, + in that can used to flatten a Docker image that contains multiple layers. + It is in fact the result of the merge of all the layers of the image. + As such, the result is suitable for being imported in Docker + with <command>docker import</command>. </para> <note> - <para> + <para> Using this function requires the <literal>kvm</literal> device to be available. - </para> + </para> </note> <para> - The parameters of <varname>exportImage</varname> are the following: + The parameters of <varname>exportImage</varname> are the following: </para> <example xml:id='ex-dockerTools-exportImage'><title>Docker export</title> @@ -648,35 +691,35 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> fromImage = someLayeredImage; fromImageName = null; fromImageTag = null; - + name = someLayeredImage.name; } </programlisting> </example> <para> - The parameters relative to the base image have the same synopsis as - described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that - <varname>fromImage</varname> is the only required argument in this case. + The parameters relative to the base image have the same synopsis as + described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that + <varname>fromImage</varname> is the only required argument in this case. </para> <para> - The <varname>name</varname> argument is the name of the derivation output, - which defaults to <varname>fromImage.name</varname>. + The <varname>name</varname> argument is the name of the derivation output, + which defaults to <varname>fromImage.name</varname>. </para> - </section> +</section> - <section xml:id="ssec-pkgs-dockerTools-shadowSetup"> +<section xml:id="ssec-pkgs-dockerTools-shadowSetup"> <title>shadowSetup</title> <para> - This constant string is a helper for setting up the base files for managing - users and groups, only if such files don't exist already. - It is suitable for being used in a - <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like - in the example below: + This constant string is a helper for setting up the base files for managing + users and groups, only if such files don't exist already. + It is suitable for being used in a + <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like + in the example below: </para> - + <example xml:id='ex-dockerTools-shadowSetup'><title>Shadow base files</title> <programlisting> buildImage { @@ -695,13 +738,13 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> </example> <para> - Creating base files like <literal>/etc/passwd</literal> or - <literal>/etc/login.defs</literal> are necessary for shadow-utils to - manipulate users and groups. + Creating base files like <literal>/etc/passwd</literal> or + <literal>/etc/login.defs</literal> are necessary for shadow-utils to + manipulate users and groups. </para> - - </section> - + +</section> + </section> </chapter> diff --git a/doc/manual.xml b/doc/manual.xml index 32e94e8e59c5..6ad66d486525 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -20,6 +20,7 @@ <xi:include href="package-notes.xml" /> <xi:include href="coding-conventions.xml" /> <xi:include href="submitting-changes.xml" /> + <xi:include href="reviewing-contributions.xml" /> <xi:include href="contributing.xml" /> </book> diff --git a/nixos/doc/manual/development/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f86928bcd5d0..f86928bcd5d0 100644 --- a/nixos/doc/manual/development/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml diff --git a/lib/default.nix b/lib/default.nix index cb9a9b0bd4d0..c0d7899b882a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -27,6 +27,7 @@ let # misc debug = import ./debug.nix; + generators = import ./generators.nix; misc = import ./deprecated.nix; # domain-specific @@ -39,7 +40,7 @@ in customisation maintainers meta sources modules options types licenses platforms systems - debug misc + debug generators misc sandbox fetchers; } # !!! don't include everything at top-level; perhaps only the most diff --git a/lib/generators.nix b/lib/generators.nix new file mode 100644 index 000000000000..27d4142e8d9a --- /dev/null +++ b/lib/generators.nix @@ -0,0 +1,72 @@ +/* Functions that generate widespread file + * formats from nix data structures. + * + * They all follow a similar interface: + * generator { config-attrs } data + * + * Tests can be found in ./tests.nix + * Documentation in the manual, #sec-generators + */ +with import ./trivial.nix; +let + libStr = import ./strings.nix; + libAttr = import ./attrsets.nix; + + flipMapAttrs = flip libAttr.mapAttrs; +in + +rec { + + /* Generates an INI-style config file from an + * attrset of sections to an attrset of key-value pairs. + * + * generators.toINI {} { + * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + * baz = { "also, integers" = 42; }; + * } + * + *> [baz] + *> also, integers=42 + *> + *> [foo] + *> ciao=bar + *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + * + * The mk* configuration attributes can generically change + * the way sections and key-value strings are generated. + * + * For more examples see the test cases in ./tests.nix. + */ + toINI = { + # apply transformations (e.g. escapes) to section names + mkSectionName ? (name: libStr.escape [ "[" "]" ] name), + # format a setting line from key and value + mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}") + }: attrsOfAttrs: + let + # map function to string for each key val + mapAttrsToStringsSep = sep: mapFn: attrs: + libStr.concatStringsSep sep + (libAttr.mapAttrsToList mapFn attrs); + mkLine = k: v: mkKeyValue k v + "\n"; + mkSection = sectName: sectValues: '' + [${mkSectionName sectName}] + '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues); + in + # map input to ini sections + mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; + + + /* Generates JSON from an arbitrary (non-function) value. + * For more information see the documentation of the builtin. + */ + toJSON = {}: builtins.toJSON; + + + /* YAML has been a strict superset of JSON since 1.2, so we + * use toJSON. Before it only had a few differences referring + * to implicit typing rules, so it should work with older + * parsers as well. + */ + toYAML = {}@args: toJSON args; +} diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b15f4542fb55..b908a261b1fa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -48,6 +48,7 @@ aske = "Kirill Boltaev <aske@fmap.me>"; asppsa = "Alastair Pharo <asppsa@gmail.com>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; + asymmetric = "Lorenzo Manacorda <lorenzo@mailbox.org>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; auntie = "Jonathan Glines <auntieNeo@gmail.com>"; avnik = "Alexander V. Nikolaev <avn@avnik.info>"; @@ -88,6 +89,7 @@ chris-martin = "Chris Martin <ch.martin@gmail.com>"; chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; + ckampka = "Christian Kampka <christian@kampka.net>"; cko = "Christine Koppelt <christine.koppelt@gmail.com>"; cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>"; @@ -129,6 +131,7 @@ doublec = "Chris Double <chris.double@double.co.nz>"; drets = "Dmytro Rets <dmitryrets@gmail.com>"; drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; + dtzWill = "Will Dietz <nix@wdtz.org>"; ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>"; @@ -198,8 +201,10 @@ jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; javaguirre = "Javier Aguirre <contacto@javaguirre.net>"; jb55 = "William Casarin <bill@casarin.me>"; + jbedo = "Justin Bedő <cu@cua0.org>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>"; + jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>"; jfb = "James Felix Black <james@yamtime.com>"; jgeerds = "Jascha Geerds <jascha@jgeerds.name>"; jgillich = "Jakob Gillich <jakob@gillich.me>"; @@ -273,6 +278,7 @@ mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>"; meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; + mguentner = "Maximilian Güntner <code@klandest.in>"; mic92 = "Jörg Thalheim <joerg@higgsboson.tk>"; michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; michalrus = "Michal Rus <m@michalrus.com>"; @@ -285,6 +291,7 @@ mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>"; + montag451 = "montag451 <montag451@laposte.net>"; moosingin3space = "Nathan Moos <moosingin3space@gmail.com>"; moretea = "Maarten Hoogendoorn <maarten@moretea.nl>"; mornfall = "Petr Ročkai <me@mornfall.net>"; @@ -330,6 +337,7 @@ palo = "Ingolf Wanger <palipalo9@googlemail.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>"; + periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>"; peterhoeg = "Peter Hoeg <peter@hoeg.com>"; peti = "Peter Simons <simons@cryp.to>"; diff --git a/lib/modules.nix b/lib/modules.nix index e66d6a6926cb..256d49ba27d8 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -375,10 +375,13 @@ rec { if def._type or "" == "merge" then concatMap dischargeProperties def.contents else if def._type or "" == "if" then - if def.condition then - dischargeProperties def.content + if isBool def.condition then + if def.condition then + dischargeProperties def.content + else + [ ] else - [ ] + throw "‘mkIf’ called with a non-Boolean condition" else [ def ]; diff --git a/lib/sources.nix b/lib/sources.nix index 156afaae5c98..f41abe1e1eae 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -12,19 +12,19 @@ rec { # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). - cleanSource = - let filter = name: type: let baseName = baseNameOf (toString name); in ! ( - # Filter out Subversion and CVS directories. - (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || - # Filter out backup files. - lib.hasSuffix "~" baseName || - # Filter out generates files. - lib.hasSuffix ".o" baseName || - lib.hasSuffix ".so" baseName || - # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) - ); - in src: builtins.filterSource filter src; + cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( + # Filter out Subversion and CVS directories. + (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || + # Filter out backup files. + lib.hasSuffix "~" baseName || + # Filter out generates files. + lib.hasSuffix ".o" baseName || + lib.hasSuffix ".so" baseName || + # Filter out nix-build result symlinks + (type == "symlink" && lib.hasPrefix "result" baseName) + ); + + cleanSource = builtins.filterSource cleanSourceFilter; # Get all files ending with the specified suffices from the given diff --git a/lib/tests.nix b/lib/tests.nix index c3b8839fda95..d59814987ed6 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -130,4 +130,78 @@ runTests { expected = false; }; + + /* Generator tests */ + # these tests assume attributes are converted to lists + # in alphabetical order + + testToINIEmpty = { + expr = generators.toINI {} {}; + expected = ""; + }; + + testToINIEmptySection = { + expr = generators.toINI {} { foo = {}; bar = {}; }; + expected = '' + [bar] + + [foo] + ''; + }; + + testToINIDefaultEscapes = { + expr = generators.toINI {} { + "no [ and ] allowed unescaped" = { + "and also no = in keys" = 42; + }; + }; + expected = '' + [no \[ and \] allowed unescaped] + and also no \= in keys=42 + ''; + }; + + testToINIDefaultFull = { + expr = generators.toINI {} { + "section 1" = { + attribute1 = 5; + x = "Me-se JarJar Binx"; + }; + "foo[]" = { + "he\\h=he" = "this is okay"; + }; + }; + expected = '' + [foo\[\]] + he\h\=he=this is okay + + [section 1] + attribute1=5 + x=Me-se JarJar Binx + ''; + }; + + /* right now only invocation check */ + testToJSONSimple = + let val = { + foobar = [ "baz" 1 2 3 ]; + }; + in { + expr = generators.toJSON {} val; + # trival implementation + expected = builtins.toJSON val; + }; + + /* right now only invocation check */ + testToYAMLSimple = + let val = { + list = [ { one = 1; } { two = 2; } ]; + all = 42; + }; + in { + expr = generators.toYAML {} val; + # trival implementation + expected = builtins.toJSON val; + }; + } diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 1b1576d3babe..d89d262eff4e 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -47,4 +47,12 @@ where <literal>eth0</literal> should be replaced with the desired external interface. Note that <literal>ve-+</literal> is a wildcard that matches all container interfaces.</para> +<para>If you are using Network Manager, you need to explicitly prevent +it from managing container interfaces: + +<programlisting> +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; +</programlisting> +</para> + </section> diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index b0364b346577..47343d93cde9 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -18,7 +18,6 @@ NixOS.</para> <xi:include href="building-nixos.xml" /> <xi:include href="nixos-tests.xml" /> <xi:include href="testing-installer.xml" /> -<xi:include href="reviewing-contributions.xml" /> <xi:include href="releases.xml" /> </part> diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 743f3dce2302..a133630e1464 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -68,6 +68,15 @@ following incompatible changes:</para> that may be in /etc. </para> </listitem> + + <listitem> + <para> + Parsoid service now uses YAML configuration format. + <literal>service.parsoid.interwikis</literal> is now called + <literal>service.parsoid.wikis</literal> and is a list of either API URLs + or attribute sets as specified in parsoid's documentation. + </para> + </listitem> </itemizedlist> diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 3b640334e17a..2baa4f667607 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $storePaths $out \ - -keep-as-directory -all-root + -keep-as-directory -all-root -comp xz ''; } diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index e26caa191643..0750a1b18c99 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,4 +1,8 @@ -#! /bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p qemu ec2_ami_tools jq ec2_api_tools awscli + +# To start with do: nix-shell -p awscli --run "aws configure" + set -o pipefail #set -x @@ -15,7 +19,7 @@ rm -f ec2-amis.nix types="hvm pv" stores="ebs s3" -regions="eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type @@ -57,7 +61,7 @@ for type in $types; do ami=$(aws ec2 copy-image \ --region "$region" \ --source-region "$prevRegion" --source-image-id "$prevAmi" \ - --name "$name" --description "$description" | json -q .ImageId) + --name "$name" --description "$description" | jq -r '.ImageId') if [ "$ami" = null ]; then break; fi else diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 770c3a03f9d8..52ad1e714fb9 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -301,9 +301,7 @@ in }; style = mkOption { - type = types.str // { - check = flip elem ["none" "slight" "medium" "full"]; - }; + type = types.enum ["none" "slight" "medium" "full"]; default = "full"; description = '' TrueType hinting style, one of <literal>none</literal>, @@ -329,9 +327,7 @@ in default = "rgb"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = '' - Subpixel order, one of <literal>none</literal>, - <literal>rgb</literal>, <literal>bgr</literal>, - <literal>vrgb</literal>, or <literal>vbgr</literal>. + Subpixel order. ''; }; @@ -339,9 +335,7 @@ in default = "default"; type = types.enum ["none" "default" "light" "legacy"]; description = '' - FreeType LCD filter, one of <literal>none</literal>, - <literal>default</literal>, <literal>light</literal>, or - <literal>legacy</literal>. + FreeType LCD filter. ''; }; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e341931aacce..d7fd38ebed9a 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -44,6 +44,7 @@ in consolePackages = mkOption { type = types.listOf types.package; default = with pkgs.kbdKeymaps; [ dvp neo ]; + defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]''; description = '' List of additional packages that provide console fonts, keymaps and other resources. diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 69db518ab21c..3ce97ad31c22 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -13,6 +13,8 @@ let useDisplayDevice = cfg.connectDisplay; }; + useBbswitch = cfg.pmMethod == "bbswitch"; + primus = pkgs.primus.override { inherit useNvidia; }; @@ -22,58 +24,69 @@ in { options = { - hardware.bumblebee.enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable the bumblebee daemon to manage Optimus hybrid video cards. - This should power off secondary GPU until its use is requested - by running an application with optirun. - - Only nvidia driver is supported so far. - ''; - }; - hardware.bumblebee.group = mkOption { - default = "wheel"; - example = "video"; - type = types.str; - description = ''Group for bumblebee socket''; - }; + hardware.bumblebee = { - hardware.bumblebee.connectDisplay = mkOption { - default = false; - type = types.bool; - description = '' - Set to true if you intend to connect your discrete card to a - monitor. This option will set up your Nvidia card for EDID - discovery and to turn on the monitor signal. + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable the bumblebee daemon to manage Optimus hybrid video cards. + This should power off secondary GPU until its use is requested + by running an application with optirun. + ''; + }; - Only nvidia driver is supported so far. - ''; - }; + group = mkOption { + default = "wheel"; + example = "video"; + type = types.str; + description = ''Group for bumblebee socket''; + }; + + connectDisplay = mkOption { + default = false; + type = types.bool; + description = '' + Set to true if you intend to connect your discrete card to a + monitor. This option will set up your Nvidia card for EDID + discovery and to turn on the monitor signal. + + Only nvidia driver is supported so far. + ''; + }; + + driver = mkOption { + default = "nvidia"; + type = types.enum [ "nvidia" "nouveau" ]; + description = '' + Set driver used by bumblebeed. Supported are nouveau and nvidia. + ''; + }; + + pmMethod = mkOption { + default = "auto"; + type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ]; + description = '' + Set preferred power management method for unused card. + ''; + }; - hardware.bumblebee.driver = mkOption { - default = "nvidia"; - type = types.enum [ "nvidia" "nouveau" ]; - description = '' - Set driver used by bumblebeed. Supported are nouveau and nvidia. - ''; }; }; - config = mkIf config.hardware.bumblebee.enable { - boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; - boot.kernelModules = [ "bbswitch" ]; - boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; + config = mkIf cfg.enable { + boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; + boot.kernelModules = optional useBbswitch [ "bbswitch" ]; + boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11; environment.systemPackages = [ bumblebee primus ]; systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; - wantedBy = [ "display-manager.service" ]; - path = [ kernel.bbswitch bumblebee ]; + wantedBy = [ "multi-user.target" ]; + before = [ "display-manager.service" ]; serviceConfig = { - ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver} --pm-method ${cfg.pmMethod}"; }; }; }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index b5ee57d9e22e..c44dff3bb60d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -1,20 +1,41 @@ # This module defines a NixOS installation CD that contains X11 and -# KDE 4. +# KDE 5. { config, lib, pkgs, ... }: with lib; { - imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ]; + imports = [ ./installation-cd-base.nix ]; - # Provide wicd for easy wireless configuration. - #networking.wicd.enable = true; + services.xserver = { + enable = true; + + # Automatically login as root. + displayManager.slim = { + enable = true; + defaultUser = "root"; + autoLogin = true; + }; + + desktopManager.kde5 = { + enable = true; + enableQt4Support = false; + }; + + # Enable touchpad support for many laptops. + synaptics.enable = true; + }; environment.systemPackages = - [ # Include gparted for partitioning disks. + [ pkgs.glxinfo + + # Include gparted for partitioning disks. pkgs.gparted + # Firefox for reading the manual. + pkgs.firefox + # Include some editors. pkgs.vim pkgs.bvi # binary editor @@ -32,80 +53,21 @@ with lib; # Don't start the X server by default. services.xserver.autorun = mkForce false; - # Auto-login as root. - services.xserver.displayManager.kdm.extraConfig = - '' - [X-*-Core] - AllowRootLogin=true - AutoLoginEnable=true - AutoLoginUser=root - AutoLoginPass="" - ''; - - # Custom kde-workspace adding some icons on the desktop - system.activationScripts.installerDesktop = let - openManual = pkgs.writeScript "nixos-manual.sh" '' - #!${pkgs.stdenv.shell} - cd ${config.system.build.manual.manual}/share/doc/nixos/ - konqueror ./index.html - ''; - desktopFile = pkgs.writeText "nixos-manual.desktop" '' [Desktop Entry] Version=1.0 Type=Application Name=NixOS Manual - Exec=${openManual} - Icon=konqueror + Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html + Icon=text-html ''; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop + ln -sfT ${pkgs.kde5.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop ''; - services.xserver.desktopManager.kde4.kdeWorkspacePackage = let - pkg = pkgs.kde4.kde_workspace; - - plasmaInit = pkgs.writeText "00-defaultLayout.js" '' - loadTemplate("org.kde.plasma-desktop.defaultPanel") - - for (var i = 0; i < screenCount; ++i) { - var desktop = new Activity - desktop.name = i18n("Desktop") - desktop.screen = i - desktop.wallpaperPlugin = 'image' - desktop.wallpaperMode = 'SingleImage' - - var folderview = desktop.addWidget("folderview"); - folderview.writeConfig("url", "desktop:/"); - - //Create more panels for other screens - if (i > 0){ - var panel = new Panel - panel.screen = i - panel.location = 'bottom' - panel.height = screenGeometry(i).height > 1024 ? 35 : 27 - var tasks = panel.addWidget("tasks") - tasks.writeConfig("showOnlyCurrentScreen", true); - } - } - ''; - - in - pkgs.runCommand pkg.name - { inherit (pkg) meta; } - '' - mkdir -p $out - cp -prf ${pkg}/* $out/ - chmod a+w $out/share/apps/plasma-desktop/init - cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js - ''; - - # Disable large stuff that's not very useful on the installation CD. - services.xserver.desktopManager.kde4.enablePIM = false; - } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 80a9a520e24e..b61c1f4799ec 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -84,7 +84,7 @@ spamd = 56; #networkmanager = 57; # unused nslcd = 58; - #scanner = 59; # unused + scanner = 59; nginx = 60; chrony = 61; #systemd-journal = 62; # unused @@ -279,6 +279,8 @@ hound = 259; leaps = 260; ipfs = 261; + stanchion = 262; + riak-cs = 263; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -528,6 +530,8 @@ hound = 259; leaps = 260; ipfs = 261; + stanchion = 262; + riak-cs = 263; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8254ada3ddf7..4589f47e7c19 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,6 +159,8 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix + ./services/databases/riak-cs.nix + ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/geoclue2.nix @@ -346,6 +348,7 @@ ./services/networking/connman.nix ./services/networking/consul.nix ./services/networking/coturn.nix + ./services/networking/dante.nix ./services/networking/ddclient.nix ./services/networking/dhcpcd.nix ./services/networking/dhcpd.nix @@ -539,7 +542,6 @@ ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix - ./services/x11/window-managers/bspwm-unstable.nix ./services/x11/window-managers/metacity.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 32bea97823ce..f90d0d992ec8 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,7 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.w3m # needed for the manual anyway + pkgs.w3m-nox # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr @@ -42,8 +42,6 @@ # Some compression/archiver tools. pkgs.unzip pkgs.zip - pkgs.dar # disk archiver - pkgs.cabextract ]; # Include support for various filesystems. diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index b047b7063653..e2497d04252e 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -14,4 +14,6 @@ with lib; programs.man.enable = mkDefault false; programs.info.enable = mkDefault false; + + sound.enable = mkDefault false; } diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix index 3292aa369d28..d31698c3b392 100644 --- a/nixos/modules/programs/java.nix +++ b/nixos/modules/programs/java.nix @@ -34,6 +34,7 @@ in package = mkOption { default = pkgs.jdk; + defaultText = "pkgs.jdk"; description = '' Java package to install. Typical values are pkgs.jdk or pkgs.jre. ''; diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index b6fd9868f98f..5f4d4dc9475e 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -165,7 +165,7 @@ in config = { programs.ssh.setXAuthLocation = - mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11); + mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11); assertions = [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 44e07f4618de..a89ce2c743d4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -30,6 +30,8 @@ with lib; (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") + (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) @@ -142,6 +144,12 @@ with lib; # murmur (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) + # parsoid + (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + + # tarsnap + (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir") + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 0e3a54325cad..97e2d39dc076 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -73,7 +73,7 @@ in }; failmode = mkOption { - type = types.str; + type = types.enum [ "safe" "enum" ]; default = "safe"; description = '' On service or configuration errors that prevent Duo @@ -115,7 +115,7 @@ in }; prompts = mkOption { - type = types.int; + type = types.enum [ 1 2 3 ]; default = 3; description = '' If a user fails to authenticate with a second factor, Duo @@ -181,13 +181,7 @@ in config = mkIf (cfg.ssh.enable || cfg.pam.enable) { assertions = - [ { assertion = cfg.failmode == "safe" || cfg.failmode == "secure"; - message = "Invalid value for failmode (must be safe or secure)."; - } - { assertion = cfg.prompts == 1 || cfg.prompts == 2 || cfg.prompts == 3; - message = "Invalid value for prompts (must be 1, 2, or 3)."; - } - { assertion = !cfg.pam.enable; + [ { assertion = !cfg.pam.enable; message = "PAM support is currently not implemented."; } ]; diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 53c2ace784ef..ea245ecc5b6a 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -6,14 +6,6 @@ let cfg = config.security.grsecurity; grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock"; - # Ascertain whether ZFS is required for booting the system; grsecurity is - # currently incompatible with ZFS, rendering the system unbootable. - zfsNeededForBoot = filter - (fs: (fs.neededForBoot - || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]) - && fs.fsType == "zfs") - config.system.build.fileSystems != []; - # Ascertain whether NixOS container support is required containerSupportRequired = config.boot.enableContainers && config.containers != {}; @@ -27,7 +19,14 @@ in options.security.grsecurity = { - enable = mkEnableOption "grsecurity/PaX"; + enable = mkOption { + type = types.bool; + example = true; + default = false; + description = '' + Enable grsecurity/PaX. + ''; + }; lockTunables = mkOption { type = types.bool; @@ -58,20 +57,10 @@ in config = mkIf cfg.enable { - # Allow the user to select a different package set, subject to the stated - # required kernel config boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos; boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; - system.requiredKernelConfig = with config.lib.kernelConfig; - [ (isEnabled "GRKERNSEC") - (isEnabled "PAX") - (isYes "GRKERNSEC_SYSCTL") - (isYes "GRKERNSEC_SYSCTL_DISTRO") - (isNo "GRKERNSEC_NO_RBAC") - ]; - nixpkgs.config.grsecurity = true; # Install PaX related utillities into the system profile. @@ -135,11 +124,5 @@ in "kernel.grsecurity.chroot_caps" = mkForce 0; }; - assertions = [ - { assertion = !zfsNeededForBoot; - message = "grsecurity is currently incompatible with ZFS"; - } - ]; - }; } diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 37314bdba8a5..6f9884336b1e 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -225,11 +225,9 @@ </para> <para> - The NixOS module makes several assumptions about the kernel and so may be - incompatible with your customised kernel. Most of these assumptions are - encoded as assertions — mismatches should ideally result in a build - failure. Currently, the only way to work around incompatibilities is to - eschew the NixOS module and do all configuration yourself. + The NixOS module makes several assumptions about the kernel and so + may be incompatible with your customised kernel. Currently, the only way + to work around incompatibilities is to eschew the NixOS module. </para> </sect1> diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index 38cf8eb72fb8..d0af2e416b63 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -49,7 +49,7 @@ with lib; ensureDir ${crashplan.vardir}/backupArchives 700 ensureDir ${crashplan.vardir}/log 777 cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf - for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do + for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do rm -f ${crashplan.vardir}/$x; ln -sf ${crashplan}/$x ${crashplan.vardir}/$x; done diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 24892a2a59a1..67112343c335 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -1,25 +1,25 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let - cfg = config.services.tarsnap; + gcfg = config.services.tarsnap; configFile = name: cfg: '' - cachedir ${config.services.tarsnap.cachedir}/${name} - keyfile ${cfg.keyfile} + keyfile ${cfg.keyfile} + ${optionalString (cfg.cachedir != null) "cachedir ${cfg.cachedir}"} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} ${optionalString cfg.printStats "humanize-numbers"} ${optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)} ${optionalString cfg.aggressiveNetworking "aggressive-networking"} - ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} - ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)} + ${concatStringsSep "\n" (map (v: "exclude ${v}") cfg.excludes)} + ${concatStringsSep "\n" (map (v: "include ${v}") cfg.includes)} ${optionalString cfg.lowmem "lowmem"} ${optionalString cfg.verylowmem "verylowmem"} - ${optionalString (cfg.maxbw != null) ("maxbw "+toString cfg.maxbw)} - ${optionalString (cfg.maxbwRateUp != null) ("maxbw-rate-up "+toString cfg.maxbwRateUp)} - ${optionalString (cfg.maxbwRateDown != null) ("maxbw-rate-down "+toString cfg.maxbwRateDown)} + ${optionalString (cfg.maxbw != null) "maxbw ${toString cfg.maxbw}"} + ${optionalString (cfg.maxbwRateUp != null) "maxbw-rate-up ${toString cfg.maxbwRateUp}"} + ${optionalString (cfg.maxbwRateDown != null) "maxbw-rate-down ${toString cfg.maxbwRateDown}"} ''; in { @@ -60,34 +60,13 @@ in ''; }; - cachedir = mkOption { - type = types.nullOr types.path; - default = "/var/cache/tarsnap"; - description = '' - The cache allows tarsnap to identify previously stored data - blocks, reducing archival time and bandwidth usage. - - Should the cache become desynchronized or corrupted, tarsnap - will refuse to run until you manually rebuild the cache with - <command>tarsnap --fsck</command>. - - Note that each individual archive (specified below) has its own cache - directory specified under <literal>cachedir</literal>; this is because - tarsnap locks the cache during backups, meaning multiple services - archives cannot be backed up concurrently or overlap with a shared - cache. - - Set to <literal>null</literal> to disable caching. - ''; - }; - archives = mkOption { - type = types.attrsOf (types.submodule ( + type = types.attrsOf (types.submodule ({ config, ... }: { options = { keyfile = mkOption { type = types.str; - default = config.services.tarsnap.keyfile; + default = gcfg.keyfile; description = '' Set a specific keyfile for this archive. This defaults to <literal>"/root/tarsnap.key"</literal> if left unspecified. @@ -107,6 +86,21 @@ in ''; }; + cachedir = mkOption { + type = types.nullOr types.path; + default = "/var/cache/tarsnap/${utils.escapeSystemdPath config.keyfile}"; + description = '' + The cache allows tarsnap to identify previously stored data + blocks, reducing archival time and bandwidth usage. + + Should the cache become desynchronized or corrupted, tarsnap + will refuse to run until you manually rebuild the cache with + <command>tarsnap --fsck</command>. + + Set to <literal>null</literal> to disable caching. + ''; + }; + nodump = mkOption { type = types.bool; default = true; @@ -249,7 +243,7 @@ in }; gamedata = - { directories = [ "/var/lib/minecraft "]; + { directories = [ "/var/lib/minecraft" ]; period = "*:30"; }; } @@ -262,8 +256,8 @@ in archive names are suffixed by a 1 second resolution timestamp. For each member of the set is created a timer which triggers the - instanced <literal>tarsnap@</literal> service unit. You may use - <command>systemctl start tarsnap@archive-name</command> to + instanced <literal>tarsnap-archive-name</literal> service unit. You may use + <command>systemctl start tarsnap-archive-name</command> to manually trigger creation of <literal>archive-name</literal> at any time. ''; @@ -271,63 +265,73 @@ in }; }; - config = mkIf cfg.enable { + config = mkIf gcfg.enable { assertions = (mapAttrsToList (name: cfg: { assertion = cfg.directories != []; message = "Must specify paths for tarsnap to back up"; - }) cfg.archives) ++ + }) gcfg.archives) ++ (mapAttrsToList (name: cfg: { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; - }) cfg.archives); - - systemd.services."tarsnap@" = { - description = "Tarsnap archive '%i'"; - requires = [ "network-online.target" ]; - after = [ "network-online.target" ]; - - path = [ pkgs.iputils pkgs.tarsnap pkgs.coreutils ]; - - # In order for the persistent tarsnap timer to work reliably, we have to - # make sure that the tarsnap server is reachable after systemd starts up - # the service - therefore we sleep in a loop until we can ping the - # endpoint. - preStart = "while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done"; - scriptArgs = "%i"; - script = '' - mkdir -p -m 0755 ${dirOf cfg.cachedir} - mkdir -p -m 0700 ${cfg.cachedir} - chown root:root ${cfg.cachedir} - chmod 0700 ${cfg.cachedir} - mkdir -p -m 0700 ${cfg.cachedir}/$1 - DIRS=`cat /etc/tarsnap/$1.dirs` - exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS - ''; - - serviceConfig = { - IOSchedulingClass = "idle"; - NoNewPrivileges = "true"; - CapabilityBoundingSet = "CAP_DAC_READ_SEARCH"; - PermissionsStartOnly = "true"; - }; - }; + }) gcfg.archives); + + systemd.services = + mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { + description = "Tarsnap archive '${name}'"; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ]; + + # In order for the persistent tarsnap timer to work reliably, we have to + # make sure that the tarsnap server is reachable after systemd starts up + # the service - therefore we sleep in a loop until we can ping the + # endpoint. + preStart = '' + while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done + ''; + + script = + let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" -c -f "${name}-$(date +"%Y%m%d%H%M%S")" ${concatStringsSep " " cfg.directories}''; + in if (cfg.cachedir != null) then '' + mkdir -p ${cfg.cachedir} + chmod 0700 ${cfg.cachedir} + + ( flock 9 + if [ ! -e ${cfg.cachedir}/firstrun ]; then + ( flock 10 + flock -u 9 + tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck + flock 9 + ) 10>${cfg.cachedir}/firstrun + fi + ) 9>${cfg.cachedir}/lockf + + exec flock ${cfg.cachedir}/firstrun ${run} + '' else "exec ${run}"; + + serviceConfig = { + Type = "oneshot"; + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ]; + PermissionsStartOnly = "true"; + }; + }) gcfg.archives; # Note: the timer must be Persistent=true, so that systemd will start it even # if e.g. your laptop was asleep while the latest interval occurred. - systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}" + systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { timerConfig.OnCalendar = cfg.period; timerConfig.Persistent = "true"; wantedBy = [ "timers.target" ]; - }) cfg.archives; + }) gcfg.archives; environment.etc = - (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" + mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" { text = configFile name cfg; - }) cfg.archives) // - (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" - { text = concatStringsSep " " cfg.directories; - }) cfg.archives); + }) gcfg.archives; environment.systemPackages = [ pkgs.tarsnap ]; }; diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix new file mode 100644 index 000000000000..5e73638913de --- /dev/null +++ b/nixos/modules/services/computing/boinc/client.nix @@ -0,0 +1,88 @@ +{config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.boinc; + allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + +in + { + options.services.boinc = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable the BOINC distributed computing client. If this + option is set to true, the boinc_client daemon will be run as a + background service. The boinccmd command can be used to control the + daemon. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.boinc; + defaultText = "pkgs.boinc"; + description = '' + Which BOINC package to use. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/boinc"; + description = '' + The directory in which to store BOINC's configuration and data files. + ''; + }; + + allowRemoteGuiRpc = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, any remote host can connect to and control this BOINC + client (subject to password authentication). If instead set to false, + only the hosts listed in <varname>dataDir</varname>/remote_hosts.cfg will be allowed to + connect. + + See also: <ulink url="http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access"/> + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [cfg.package]; + + users.users.boinc = { + createHome = false; + description = "BOINC Client"; + home = cfg.dataDir; + isSystemUser = true; + }; + + systemd.services.boinc = { + description = "BOINC Client"; + after = ["network.target" "local-fs.target"]; + wantedBy = ["multi-user.target"]; + preStart = '' + mkdir -p ${cfg.dataDir} + chown boinc ${cfg.dataDir} + ''; + script = '' + ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} + ''; + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + User = "boinc"; + Nice = 10; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [kierdavis]; + }; + } diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index d60b55e83d11..05adb18fbe91 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -37,6 +37,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD agent process. diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 4bb792055d25..07e00f17f1e8 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -68,6 +68,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD server's process. diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix new file mode 100644 index 000000000000..198efc29222a --- /dev/null +++ b/nixos/modules/services/databases/riak-cs.nix @@ -0,0 +1,202 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.riak-cs; + +in + +{ + + ###### interface + + options = { + + services.riak-cs = { + + enable = mkEnableOption "riak-cs"; + + package = mkOption { + type = types.package; + default = pkgs.riak-cs; + defaultText = "pkgs.riak-cs"; + example = literalExample "pkgs.riak-cs"; + description = '' + Riak package to use. + ''; + }; + + nodeName = mkOption { + type = types.str; + default = "riak-cs@127.0.0.1"; + description = '' + Name of the Erlang node. + ''; + }; + + anonymousUserCreation = mkOption { + type = types.bool; + default = false; + description = '' + Anonymous user creation. + ''; + }; + + riakHost = mkOption { + type = types.str; + default = "127.0.0.1:8087"; + description = '' + Name of riak hosting service. + ''; + }; + + listener = mkOption { + type = types.str; + default = "127.0.0.1:8080"; + description = '' + Name of Riak CS listening service. + ''; + }; + + stanchionHost = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of stanchion hosting service. + ''; + }; + + stanchionSsl = mkOption { + type = types.bool; + default = true; + description = '' + Tell stanchion to use SSL. + ''; + }; + + distributedCookie = mkOption { + type = types.str; + default = "riak"; + description = '' + Cookie for distributed node communication. All nodes in the + same cluster should use the same cookie or they will not be able to + communicate. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/riak-cs"; + description = '' + Data directory for Riak CS. + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/riak-cs"; + description = '' + Log directory for Riak CS. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to <filename>riak-cs.conf</filename>. + ''; + }; + + extraAdvancedConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to <filename>advanced.config</filename>. + ''; + }; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + environment.etc."riak-cs/riak-cs.conf".text = '' + nodename = ${cfg.nodeName} + distributed_cookie = ${cfg.distributedCookie} + + platform_log_dir = ${cfg.logDir} + + riak_host = ${cfg.riakHost} + listener = ${cfg.listener} + stanchion_host = ${cfg.stanchionHost} + + anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"} + + ${cfg.extraConfig} + ''; + + environment.etc."riak-cs/advanced.config".text = '' + ${cfg.extraAdvancedConfig} + ''; + + users.extraUsers.riak-cs = { + name = "riak-cs"; + uid = config.ids.uids.riak-cs; + group = "riak"; + description = "Riak CS server user"; + }; + + systemd.services.riak-cs = { + description = "Riak CS Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ + pkgs.utillinux # for `logger` + pkgs.bash + ]; + + environment.HOME = "${cfg.dataDir}"; + environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}"; + environment.RIAK_CS_LOG_DIR = "${cfg.logDir}"; + environment.RIAK_CS_ETC_DIR = "/etc/riak"; + + preStart = '' + if ! test -e ${cfg.logDir}; then + mkdir -m 0755 -p ${cfg.logDir} + chown -R riak-cs ${cfg.logDir} + fi + + if ! test -e ${cfg.dataDir}; then + mkdir -m 0700 -p ${cfg.dataDir} + chown -R riak-cs ${cfg.dataDir} + fi + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/riak-cs console"; + ExecStop = "${cfg.package}/bin/riak-cs stop"; + StandardInput = "tty"; + User = "riak-cs"; + Group = "riak-cs"; + PermissionsStartOnly = true; + # Give Riak a decent amount of time to clean up. + TimeoutStopSec = 120; + LimitNOFILE = 65536; + }; + + unitConfig.RequiresMountsFor = [ + "${cfg.dataDir}" + "${cfg.logDir}" + "/etc/riak" + ]; + }; + }; +} diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index 4477904f78c6..e0ebf164aef0 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -20,6 +20,8 @@ in package = mkOption { type = types.package; + default = pkgs.riak; + defaultText = "pkgs.riak"; example = literalExample "pkgs.riak"; description = '' Riak package to use. @@ -68,6 +70,14 @@ in ''; }; + extraAdvancedConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to <filename>advanced.config</filename>. + ''; + }; + }; }; @@ -88,6 +98,10 @@ in ${cfg.extraConfig} ''; + environment.etc."riak/advanced.config".text = '' + ${cfg.extraAdvancedConfig} + ''; + users.extraUsers.riak = { name = "riak"; uid = config.ids.uids.riak; diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix new file mode 100644 index 000000000000..f2dbb78b5c4b --- /dev/null +++ b/nixos/modules/services/databases/stanchion.nix @@ -0,0 +1,212 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.stanchion; + +in + +{ + + ###### interface + + options = { + + services.stanchion = { + + enable = mkEnableOption "stanchion"; + + package = mkOption { + type = types.package; + default = pkgs.stanchion; + defaultText = "pkgs.stanchion"; + example = literalExample "pkgs.stanchion"; + description = '' + Stanchion package to use. + ''; + }; + + nodeName = mkOption { + type = types.str; + default = "stanchion@127.0.0.1"; + description = '' + Name of the Erlang node. + ''; + }; + + adminKey = mkOption { + type = types.str; + default = ""; + description = '' + Name of admin user. + ''; + }; + + adminSecret = mkOption { + type = types.str; + default = ""; + description = '' + Name of admin secret + ''; + }; + + riakHost = mkOption { + type = types.str; + default = "127.0.0.1:8087"; + description = '' + Name of riak hosting service. + ''; + }; + + listener = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of Riak CS listening service. + ''; + }; + + stanchionHost = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of stanchion hosting service. + ''; + }; + + stanchionSsl = mkOption { + type = types.bool; + default = true; + description = '' + Tell stanchion to use SSL. + ''; + }; + + distributedCookie = mkOption { + type = types.str; + default = "riak"; + description = '' + Cookie for distributed node communication. All nodes in the + same cluster should use the same cookie or they will not be able to + communicate. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/stanchion"; + description = '' + Data directory for Stanchion. + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/stanchion"; + description = '' + Log directory for Stanchino. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to <filename>stanchion.conf</filename>. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + environment.etc."stanchion/advanced.config".text = '' + [{stanchion, []}]. + ''; + + environment.etc."stanchion/stanchion.conf".text = '' + listener = ${cfg.listener} + + riak_host = ${cfg.riakHost} + + ${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey} + ${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret} + + platform_bin_dir = ${pkgs.stanchion}/bin + platform_data_dir = ${cfg.dataDir} + platform_etc_dir = /etc/stanchion + platform_lib_dir = ${pkgs.stanchion}/lib + platform_log_dir = ${cfg.logDir} + + nodename = ${cfg.nodeName} + + distributed_cookie = ${cfg.distributedCookie} + + stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"} + + ${cfg.extraConfig} + ''; + + users.extraUsers.stanchion = { + name = "stanchion"; + uid = config.ids.uids.stanchion; + group = "stanchion"; + description = "Stanchion server user"; + }; + + users.extraGroups.stanchion.gid = config.ids.gids.stanchion; + + systemd.services.stanchion = { + description = "Stanchion Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ + pkgs.utillinux # for `logger` + pkgs.bash + ]; + + environment.HOME = "${cfg.dataDir}"; + environment.STANCHION_DATA_DIR = "${cfg.dataDir}"; + environment.STANCHION_LOG_DIR = "${cfg.logDir}"; + environment.STANCHION_ETC_DIR = "/etc/stanchion"; + + preStart = '' + if ! test -e ${cfg.logDir}; then + mkdir -m 0755 -p ${cfg.logDir} + chown -R stanchion:stanchion ${cfg.logDir} + fi + + if ! test -e ${cfg.dataDir}; then + mkdir -m 0700 -p ${cfg.dataDir} + chown -R stanchion:stanchion ${cfg.dataDir} + fi + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/stanchion console"; + ExecStop = "${cfg.package}/bin/stanchion stop"; + StandardInput = "tty"; + User = "stanchion"; + Group = "stanchion"; + PermissionsStartOnly = true; + # Give Stanchion a decent amount of time to clean up. + TimeoutStopSec = 120; + LimitNOFILE = 65536; + }; + + unitConfig.RequiresMountsFor = [ + "${cfg.dataDir}" + "${cfg.logDir}" + "/etc/stanchion" + ]; + }; + }; +} diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index a34037403123..8ddb9ef9c53b 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -7,9 +7,35 @@ let pkg = if config.hardware.sane.snapshot then pkgs.sane-backends-git else pkgs.sane-backends; - backends = [ pkg ] ++ config.hardware.sane.extraBackends; + + sanedConf = pkgs.writeTextFile { + name = "saned.conf"; + destination = "/etc/sane.d/saned.conf"; + text = '' + localhost + ${config.services.saned.extraConfig} + ''; + }; + + netConf = pkgs.writeTextFile { + name = "net.conf"; + destination = "/etc/sane.d/net.conf"; + text = '' + ${lib.optionalString config.services.saned.enable "localhost"} + ${config.hardware.sane.netConf} + ''; + }; + + env = { + SANE_CONFIG_DIR = config.hardware.sane.configDir; + LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; + }; + + backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; saneConfig = pkgs.mkSaneConfig { paths = backends; }; + enabled = config.hardware.sane.enable || config.services.saned.enable; + in { @@ -51,27 +77,86 @@ in hardware.sane.configDir = mkOption { type = types.string; + internal = true; description = "The value of SANE_CONFIG_DIR."; }; - }; + hardware.sane.netConf = mkOption { + type = types.lines; + default = ""; + example = "192.168.0.16"; + description = '' + Network hosts that should be probed for remote scanners. + ''; + }; + services.saned.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable saned network daemon for remote connection to scanners. - ###### implementation + saned would be runned from <literal>scanner</literal> user; to allow + access to hardware that doesn't have <literal>scanner</literal> group + you should add needed groups to this user. + ''; + }; - config = mkIf config.hardware.sane.enable { + services.saned.extraConfig = mkOption { + type = types.lines; + default = ""; + example = "192.168.0.0/24"; + description = '' + Extra saned configuration lines. + ''; + }; - hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; + }; - environment.systemPackages = backends; - environment.sessionVariables = { - SANE_CONFIG_DIR = config.hardware.sane.configDir; - LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; - }; - services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + ###### implementation - }; + config = mkMerge [ + (mkIf enabled { + hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; + + environment.systemPackages = backends; + environment.sessionVariables = env; + services.udev.packages = backends; + + users.extraGroups."scanner".gid = config.ids.gids.scanner; + }) + + (mkIf config.services.saned.enable { + networking.firewall.connectionTrackingModules = [ "sane" ]; + + systemd.services."saned@" = { + description = "Scanner Service"; + environment = mapAttrs (name: val: toString val) env; + serviceConfig = { + User = "scanner"; + Group = "scanner"; + ExecStart = "${pkg}/bin/saned"; + }; + }; + + systemd.sockets.saned = { + description = "saned incoming socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ "0.0.0.0:6566" "[::]:6566" ]; + socketConfig = { + # saned needs to distinguish between IPv4 and IPv6 to open matching data sockets. + BindIPv6Only = "ipv6-only"; + Accept = true; + MaxConnections = 1; + }; + }; + + users.extraUsers."scanner" = { + uid = config.ids.uids.scanner; + group = "scanner"; + }; + }) + ]; } diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 24dca15dd913..7e3b6431a133 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -25,7 +25,8 @@ in DBs = mkOption { type = types.listOf types.package; default = with pkgs.dictdDBs; [ wiktionary wordnet ]; - example = [ pkgs.dictdDBs.nld2eng ]; + defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]"; + example = literalExample "[ pkgs.dictdDBs.nld2eng ]"; description = ''List of databases to make available.''; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e5a125ad3245..e96645c79c77 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -41,6 +41,7 @@ in type = types.path; description = "The Disnix package"; default = pkgs.disnix; + defaultText = "pkgs.disnix"; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 3e4584c7a512..cb8fa901bbd2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -164,18 +164,21 @@ in { packages.gitlab = mkOption { type = types.package; default = pkgs.gitlab; + defaultText = "pkgs.gitlab"; description = "Reference to the gitlab package"; }; packages.gitlab-shell = mkOption { type = types.package; default = pkgs.gitlab-shell; + defaultText = "pkgs.gitlab-shell"; description = "Reference to the gitlab-shell package"; }; packages.gitlab-workhorse = mkOption { type = types.package; default = pkgs.gitlab-workhorse; + defaultText = "pkgs.gitlab-workhorse"; description = "Reference to the gitlab-workhorse package"; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 333782d15bcb..e2bbd4b01aa1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -172,8 +172,8 @@ in sshKey = "/root/.ssh/id_buildfarm"; system = "x86_64-linux"; maxJobs = 2; - supportedFeatures = "kvm"; - mandatoryFeatures = "perf"; + supportedFeatures = [ "kvm" ]; + mandatoryFeatures = [ "perf" ]; } ]; description = '' diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index ab1b54068772..ae3f84333d2d 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -6,20 +6,21 @@ let cfg = config.services.parsoid; - conf = '' - exports.setup = function( parsoidConfig ) { - ${toString (mapAttrsToList (name: str: "parsoidConfig.setInterwiki('${name}', '${str}');") cfg.interwikis)} - - parsoidConfig.serverInterface = "${cfg.interface}"; - parsoidConfig.serverPort = ${toString cfg.port}; - - parsoidConfig.useSelser = true; - - ${cfg.extraConfig} - }; - ''; + confTree = { + worker_heartbeat_timeout = 300000; + logging = { level = "info"; }; + services = [{ + module = "lib/index.js"; + entrypoint = "apiServiceWorker"; + conf = { + mwApis = map (x: if isAttrs x then x else { uri = x; }) cfg.wikis; + serverInterface = cfg.interface; + serverPort = cfg.port; + }; + }]; + }; - confFile = builtins.toFile "localsettings.js" conf; + confFile = pkgs.writeText "config.yml" (builtins.toJSON (recursiveUpdate confTree cfg.extraConfig)); in { @@ -38,9 +39,9 @@ in ''; }; - interwikis = mkOption { - type = types.attrsOf types.str; - example = { localhost = "http://localhost/api.php"; }; + wikis = mkOption { + type = types.listOf (types.either types.str types.attrs); + example = [ "http://localhost/api.php" ]; description = '' Used MediaWiki API endpoints. ''; @@ -71,8 +72,8 @@ in }; extraConfig = mkOption { - type = types.lines; - default = ""; + type = types.attrs; + default = {}; description = '' Extra configuration to add to parsoid configuration. ''; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 3c3d83c66ed0..01c6fb817669 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -9,7 +9,7 @@ let BaseDir "${cfg.dataDir}" PIDFile "${cfg.pidFile}" AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"} - Hostname ${config.networking.hostName} + Hostname "${config.networking.hostName}" LoadPlugin syslog <Plugin "syslog"> diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f1846b963252..f91827c379de 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -138,6 +138,45 @@ in ''; }; helper.enable = mkEnableOption "helper service"; + sftpd.enable = mkEnableOption "SFTP service"; + sftpd.port = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + The port on which the SFTP server will listen. + + This is the correct setting to tweak if you want Tahoe's SFTP + daemon to listen on a different port. + ''; + }; + sftpd.hostPublicKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host public key. + ''; + }; + sftpd.hostPrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host private key. + ''; + }; + sftpd.accounts.file = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the accounts file. + ''; + }; + sftpd.accounts.url = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + URL of the accounts server. + ''; + }; package = mkOption { default = pkgs.tahoelafs; defaultText = "pkgs.tahoelafs"; @@ -256,6 +295,19 @@ in [helper] enabled = ${if settings.helper.enable then "true" else "false"} + + [sftpd] + enabled = ${if settings.sftpd.enable then "true" else "false"} + ${optionalString (settings.sftpd.port != null) + "port = ${toString settings.sftpd.port}"} + ${optionalString (settings.sftpd.hostPublicKeyFile != null) + "host_pubkey_file = ${settings.sftpd.hostPublicKeyFile}"} + ${optionalString (settings.sftpd.hostPrivateKeyFile != null) + "host_privkey_file = ${settings.sftpd.hostPrivateKeyFile}"} + ${optionalString (settings.sftpd.accounts.file != null) + "accounts.file = ${settings.sftpd.accounts.file}"} + ${optionalString (settings.sftpd.accounts.url != null) + "accounts.url = ${settings.sftpd.accounts.url}"} ''; }); # Actually require Tahoe, so that we will have it installed. diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 7e981183353d..f50dae2ab7be 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -19,30 +19,21 @@ let type = types.str; description = "Public key at the opposite end of the tunnel."; }; - hostname = mkOption { - default = ""; - example = "foobar.hype"; - type = types.str; - description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; - }; }; }; - # Additional /etc/hosts entries for peers with an associated hostname - cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {} - # Generate a builder that produces an output usable as a Nix string value - '' - exec >$out - echo \'\' - ${concatStringsSep "\n" (mapAttrsToList (k: v: - optionalString (v.hostname != "") - "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") - (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} - echo \'\' - ''); - - parseModules = x: - x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; + # check for the required attributes, otherwise + # permit attributes not undefined here + checkPeers = x: + x // { + connectTo = mapAttrs + (name: value: + if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else + if !hasAttr "password" value then abort "cjdns peer ${name} missing a password" else + value + ) + x.connectTo; + }; # would be nice to merge 'cfg' with a //, # but the json nesting is wacky. @@ -53,8 +44,8 @@ let }; authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords; interfaces = { - ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ]; - UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ]; + ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ]; + UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ]; }; privateKey = "@CJDNS_PRIVATE_KEY@"; @@ -134,12 +125,12 @@ in ''; }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + type = types.attrsOf (types.attrsOf types.str); default = { }; example = { "192.168.1.1:27313" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + user = "foobar"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -179,12 +170,12 @@ in }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + type = types.attrsOf (types.attrsOf types.str); default = { }; example = { "01:02:03:04:05:06" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + user = "foobar"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -254,8 +245,6 @@ in }; }; - networking.extraHosts = cjdnsExtraHosts; - assertions = [ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null ); message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined."; diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix new file mode 100644 index 000000000000..8f4e15223ab0 --- /dev/null +++ b/nixos/modules/services/networking/dante.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.services.dante; + confFile = pkgs.writeText "dante-sockd.conf" '' + user.privileged: root + user.unprivileged: dante + + ${cfg.config} + ''; +in + +{ + meta = { + maintainers = with maintainers; [ arobyn ]; + }; + + options = { + services.dante = { + enable = mkEnableOption "Dante SOCKS proxy"; + + config = mkOption { + default = null; + type = types.str; + description = '' + Contents of Dante's configuration file + NOTE: user.privileged/user.unprivileged are set by the service + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.config != null; + message = "please provide Dante configuration file contents"; + } + ]; + + users.users.dante = { + description = "Dante SOCKS proxy daemon user"; + isSystemUser = true; + group = "dante"; + }; + users.groups.dante = {}; + + systemd.services.dante = { + description = "Dante SOCKS v4 and v5 compatible proxy server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "always"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index 28b6c4f657dd..ca47a18bc1f6 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -20,6 +20,7 @@ in { description = "Package to use for flannel"; type = types.package; default = pkgs.flannel.bin; + defaultText = "pkgs.flannel.bin"; }; publicIp = mkOption { diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 51f95af48029..fd4545e88e2d 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -86,7 +86,7 @@ in hwMode = mkOption { default = "g"; - type = types.string; + type = types.enum [ "a" "b" "g" ]; description = '' Operation mode. (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). @@ -152,9 +152,6 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = (cfg.hwMode == "a" || cfg.hwMode == "b" || cfg.hwMode == "g"); - message = "hwMode must be a/b/g"; - } { assertion = (cfg.channel >= 1 && cfg.channel <= 13); message = "channel must be between 1 and 13"; }]; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index dca8ccac7627..7eebecb23b00 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -148,11 +148,11 @@ in }; verbosity = mkOption { - type = types.str; + type = types.enum [ "error" "warning" "notice" "info" "debug" ]; default = "info"; example = "error"; description = '' - Verbosity level (error, warning, notice, info, debug) + Verbosity level ''; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index ccfd219620cf..481e267f6c38 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -345,12 +345,10 @@ let }; rrlWhitelist = mkOption { - type = types.listOf types.str; + type = with types; listOf (enum [ "nxdomain" "error" "referral" "any" "rrsig" "wildcard" "nodata" "dnskey" "positive" "all" ]); default = []; description = '' Whitelists the given rrl-types. - The RRL classification types are: nxdomain, error, referral, any, - rrsig, wildcard, nodata, dnskey, positive, all ''; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 3f0906fdb80d..edcc12170b20 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -26,10 +26,11 @@ in package = mkOption { type = types.package; default = pkgs.kde4.quasselDaemon; + defaultText = "pkgs.kde4.quasselDaemon"; description = '' The package of the quassel daemon. ''; - example = pkgs.quasselDaemon; + example = literalExample "pkgs.quasselDaemon"; }; interfaces = mkOption { diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 81941ce1cfb6..073391ffdbbc 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -228,8 +228,6 @@ in config = mkIf cfg.enable { - programs.ssh.setXAuthLocation = mkForce cfg.forwardX11; - users.extraUsers.sshd = { isSystemUser = true; description = "SSH privilege separation user"; diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index 1226cba682ec..a94a851e80ec 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -50,6 +50,8 @@ in { package = mkOption { default = pkgs.hound; + defaultText = "pkgs.hound"; + type = types.package; description = '' Package for running hound. ''; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index e4e5c1253b77..b045e140546d 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -3,26 +3,37 @@ with lib; let clamavUser = "clamav"; stateDir = "/var/lib/clamav"; - runDir = "/var/run/clamav"; - logDir = "/var/log/clamav"; + runDir = "/run/clamav"; clamavGroup = clamavUser; cfg = config.services.clamav; + pkg = pkgs.clamav; + clamdConfigFile = pkgs.writeText "clamd.conf" '' DatabaseDirectory ${stateDir} LocalSocket ${runDir}/clamd.ctl - LogFile ${logDir}/clamav.log PidFile ${runDir}/clamd.pid + TemporaryDirectory /tmp User clamav + Foreground yes ${cfg.daemon.extraConfig} ''; - pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; }; + + freshclamConfigFile = pkgs.writeText "freshclam.conf" '' + DatabaseDirectory ${stateDir} + Foreground yes + Checks ${toString cfg.updater.frequency} + + ${cfg.updater.extraConfig} + + DatabaseMirror database.clamav.net + ''; in { options = { services.clamav = { daemon = { - enable = mkEnableOption "clamd daemon"; + enable = mkEnableOption "ClamAV clamd daemon"; extraConfig = mkOption { type = types.lines; @@ -34,16 +45,27 @@ in }; }; updater = { - enable = mkEnableOption "freshclam updater"; + enable = mkEnableOption "ClamAV freshclam updater"; frequency = mkOption { + type = types.int; default = 12; description = '' Number of database checks per day. ''; }; - config = mkOption { + interval = mkOption { + type = types.str; + default = "hourly"; + description = '' + How often freshclam is invoked. See systemd.time(7) for more + information about the format. + ''; + }; + + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration for freshclam. Contents will be added verbatim to the @@ -68,50 +90,53 @@ in gid = config.ids.gids.clamav; }; - services.clamav.updater.config = mkIf cfg.updater.enable '' - DatabaseDirectory ${stateDir} - Foreground yes - Checks ${toString cfg.updater.frequency} - DatabaseMirror database.clamav.net - ''; + environment.etc."clamav/freshclam.conf".source = freshclamConfigFile; + environment.etc."clamav/clamd.conf".source = clamdConfigFile; - systemd.services.clamd = mkIf cfg.daemon.enable { + systemd.services.clamav-daemon = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - path = [ pkg ]; - after = [ "network.target" "freshclam.service" ]; - requires = [ "freshclam.service" ]; + after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; + requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ clamdConfigFile ]; + preStart = '' - mkdir -m 0755 -p ${logDir} mkdir -m 0755 -p ${runDir} - chown ${clamavUser}:${clamavGroup} ${logDir} chown ${clamavUser}:${clamavGroup} ${runDir} ''; + serviceConfig = { - ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}"; - Type = "forking"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - RestartSec = "10s"; - StartLimitInterval = "1min"; + ExecStart = "${pkg}/bin/clamd"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + PrivateNetwork = "yes"; }; }; - systemd.services.freshclam = mkIf cfg.updater.enable { - description = "ClamAV updater (freshclam)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkg ]; + systemd.timers.clamav-freshclam = mkIf cfg.updater.enable { + description = "Timer for ClamAV virus database updater (freshclam)"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.updater.interval; + Unit = "clamav-freshclam.service"; + }; + }; + + systemd.services.clamav-freshclam = mkIf cfg.updater.enable { + description = "ClamAV virus database updater (freshclam)"; + restartTriggers = [ freshclamConfigFile ]; + preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} ''; + serviceConfig = { - ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - RestartSec = "10s"; - StartLimitInterval = "1min"; + Type = "oneshot"; + ExecStart = "${pkg}/bin/freshclam"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; }; }; }; diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix index d86b9fea2d79..74f443381d92 100644 --- a/nixos/modules/services/torrent/opentracker.nix +++ b/nixos/modules/services/torrent/opentracker.nix @@ -13,6 +13,7 @@ in { opentracker package to use ''; default = pkgs.opentracker; + defaultText = "pkgs.opentracker"; }; extraOptions = mkOption { diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix index 7de9480d4c46..d19e4bc58277 100644 --- a/nixos/modules/services/web-apps/quassel-webserver.nix +++ b/nixos/modules/services/web-apps/quassel-webserver.nix @@ -31,6 +31,8 @@ in { }; pkg = mkOption { default = pkgs.quassel-webserver; + defaultText = "pkgs.quassel-webserver"; + type = types.package; description = "The quassel-webserver package"; }; quasselCoreHost = mkOption { diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index bda4eec01026..7cbca1dcddfd 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -188,6 +188,7 @@ in { package = mkOption { type = types.package; default = pkgs.compton; + defaultText = "pkgs.compton"; example = literalExample "pkgs.compton"; description = '' Compton derivation to use. diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index bc010d1ce1cf..9b51b92faa4d 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -22,6 +22,15 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; + enableQt4Support = mkOption { + type = types.bool; + default = true; + description = '' + Enable support for Qt 4-based applications. Particularly, install the + Qt 4 version of the Breeze theme and a default backend for Phonon. + ''; + }; + }; }; @@ -105,7 +114,7 @@ in kde5.sonnet kde5.threadweaver - kde5.breeze + kde5.breeze-qt5 kde5.kactivitymanagerd kde5.kde-cli-tools kde5.kdecoration @@ -141,13 +150,12 @@ in kde5.konsole kde5.print-manager - # Oxygen icons moved to KDE Frameworks 5.16 and later. - (kde5.oxygen-icons or kde5.oxygen-icons5) + # Install Breeze icons if available + (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons) pkgs.hicolor_icon_theme - kde5.kde-gtk-config + kde5.kde-gtk-config kde5.breeze-gtk - pkgs.phonon-backend-gstreamer pkgs.qt5.phonon-backend-gstreamer ] @@ -155,15 +163,14 @@ in # If it is not available, Orion is very similar to Breeze. ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion - # Install Breeze icons if available - ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons - # Install activity manager if available ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd # frameworkintegration was split with plasma-integration in Plasma 5.6 ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ] + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm @@ -217,7 +224,6 @@ in kde5.ecm # for the setup-hook kde5.plasma-workspace kde5.breeze-icons - (kde5.oxygen-icons or kde5.oxygen-icons5) ]; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 36daf55a36a5..dda8d0f7629e 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -27,7 +27,6 @@ let ${cfg.stopScript} ''; - cfgFile = pkgs.writeText "sddm.conf" '' [General] HaltCommand=${pkgs.systemd}/bin/systemctl poweroff @@ -47,7 +46,7 @@ let HideShells=/run/current-system/sw/bin/nologin [X11] - MinimumVT=${toString xcfg.tty} + MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} @@ -254,5 +253,10 @@ in users.extraGroups.sddm.gid = config.ids.gids.sddm; + services.dbus.packages = [ sddm.unwrapped ]; + + # To enable user switching, allow sddm to allocate TTYs/displays dynamically. + services.xserver.tty = null; + services.xserver.display = null; }; } diff --git a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix deleted file mode 100644 index 3282e0d0851f..000000000000 --- a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.windowManager.bspwm-unstable; -in - -{ - options = { - services.xserver.windowManager.bspwm-unstable = { - enable = mkEnableOption "bspwm-unstable"; - startThroughSession = mkOption { - type = with types; bool; - default = false; - description = " - Start the window manager through the script defined in - sessionScript. Defaults to the the bspwm-session script - provided by bspwm - "; - }; - sessionScript = mkOption { - default = "${pkgs.bspwm-unstable}/bin/bspwm-session"; - defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session"; - description = " - The start-session script to use. Defaults to the - provided bspwm-session script from the bspwm package. - - Does nothing unless `bspwm.startThroughSession` is enabled - "; - }; - }; - }; - - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { - name = "bspwm-unstable"; - start = if cfg.startThroughSession - then cfg.sessionScript - else '' - export _JAVA_AWT_WM_NONREPARENTING=1 - SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 & - ${pkgs.bspwm-unstable}/bin/bspwm - ''; - }; - environment.systemPackages = [ pkgs.bspwm-unstable ]; - }; -} diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 03a1b7a72e88..6783ac3479e6 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -9,40 +9,69 @@ in { options = { services.xserver.windowManager.bspwm = { - enable = mkEnableOption "bspwm"; - startThroughSession = mkOption { - type = with types; bool; - default = false; - description = " - Start the window manager through the script defined in - sessionScript. Defaults to the the bspwm-session script - provided by bspwm - "; - }; - sessionScript = mkOption { - default = "${pkgs.bspwm}/bin/bspwm-session"; - defaultText = "(pkgs.bspwm)/bin/bspwm-session"; - description = " - The start-session script to use. Defaults to the - provided bspwm-session script from the bspwm package. + enable = mkEnableOption "bspwm"; + + package = mkOption { + type = types.package; + default = pkgs.bspwm; + defaultText = "pkgs.bspwm"; + example = "pkgs.bspwm-unstable"; + description = '' + bspwm package to use. + ''; + }; + configFile = mkOption { + type = with types; nullOr path; + example = "${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"; + default = null; + description = '' + Path to the bspwm configuration file. + If null, $HOME/.config/bspwm/bspwmrc will be used. + ''; + }; - Does nothing unless `bspwm.startThroughSession` is enabled - "; + sxhkd = { + package = mkOption { + type = types.package; + default = pkgs.sxhkd; + defaultText = "pkgs.sxhkd"; + example = "pkgs.sxhkd-unstable"; + description = '' + sxhkd package to use. + ''; }; + configFile = mkOption { + type = with types; nullOr path; + example = "${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"; + default = null; + description = '' + Path to the sxhkd configuration file. + If null, $HOME/.config/sxhkd/sxhkdrc will be used. + ''; + }; + }; }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = singleton { - name = "bspwm"; - start = if cfg.startThroughSession - then cfg.sessionScript - else '' - export _JAVA_AWT_WM_NONREPARENTING=1 - SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 & - ${pkgs.bspwm}/bin/bspwm - ''; + name = "bspwm"; + start = '' + export _JAVA_AWT_WM_NONREPARENTING=1 + SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + waitPID=$! + ''; }; - environment.systemPackages = [ pkgs.bspwm ]; + environment.systemPackages = [ cfg.package ]; }; + + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] + "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm.") + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ] + "bspwm package does not provide bspwm-session anymore.") + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "sessionScript" ] + "bspwm package does not provide bspwm-session anymore.") + ]; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index dabe2c26a72f..f005decfa33c 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -10,7 +10,6 @@ in imports = [ ./afterstep.nix ./bspwm.nix - ./bspwm-unstable.nix ./compiz.nix ./dwm.nix ./exwm.nix diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index cfe9439b688c..f9c75e80db41 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -3,52 +3,58 @@ with lib; let - wmCfg = config.services.xserver.windowManager; + cfg = config.services.xserver.windowManager.i3; +in + +{ + options.services.xserver.windowManager.i3 = { + enable = mkEnableOption "i3 window manager"; - i3option = name: { - enable = mkEnableOption name; configFile = mkOption { - default = null; - type = types.nullOr types.path; + default = null; + type = with types; nullOr path; description = '' Path to the i3 configuration file. If left at the default value, $HOME/.i3/config will be used. ''; }; + extraSessionCommands = mkOption { - default = ""; - type = types.lines; + default = ""; + type = types.lines; description = '' Shell commands executed just before i3 is started. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.i3; + defaultText = "pkgs.i3"; + example = "pkgs.i3-gaps"; + description = '' + i3 package to use. + ''; + }; }; - i3config = name: pkg: cfg: { + config = mkIf cfg.enable { services.xserver.windowManager.session = [{ - inherit name; + name = "i3"; start = '' ${cfg.extraSessionCommands} - ${pkg}/bin/i3 ${optionalString (cfg.configFile != null) + ${cfg.package}/bin/i3 ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\"" } & waitPID=$! ''; }]; - environment.systemPackages = [ pkg ]; - }; - -in - -{ - options.services.xserver.windowManager = { - i3 = i3option "i3"; - i3-gaps = i3option "i3-gaps"; + environment.systemPackages = [ cfg.package ]; }; - config = mkMerge [ - (mkIf wmCfg.i3.enable (i3config "i3" pkgs.i3 wmCfg.i3)) - (mkIf wmCfg.i3-gaps.enable (i3config "i3-gaps" pkgs.i3-gaps wmCfg.i3-gaps)) + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ] + "Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.") ]; } diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index a8c7d4b3ee5e..59ecaf8d5a6d 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -122,7 +122,7 @@ in mkdir -p /root/.ssh ${concatStrings (map (key: '' - echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys + echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} dropbear -s -j -k -E -m -p ${toString cfg.port} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 17c842ddc533..294fc1988e9f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -53,7 +53,7 @@ let inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) - version extraConfig extraPerEntryConfig extraEntries + version extraConfig extraPerEntryConfig extraEntries forceInstall extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ @@ -403,6 +403,16 @@ in ''; }; + forceInstall = mkOption { + default = false; + type = types.bool; + description = '' + Whether to try and forcibly install GRUB even if problems are + detected. It is not recommended to enable this unless you know what + you are doing. + ''; + }; + trustedBoot = { enable = mkOption { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b93395300b72..24442ca12a30 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -65,6 +65,7 @@ my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); my $bootloaderId = get("bootloaderId"); +my $forceInstall = get("forceInstall"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -531,13 +532,14 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { foreach my $dev (@deviceTargets) { next if $dev eq "nodev"; print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; - if ($grubTarget eq "") { - system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)) == 0 - or die "$0: installation of GRUB on $dev failed\n"; - } else { - system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 - or die "$0: installation of GRUB on $dev failed\n"; + my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)); + if ($forceInstall eq "true") { + push @command, "--force"; + } + if ($grubTarget ne "") { + push @command, "--target=$grubTarget"; } + (system @command) == 0 or die "$0: installation of GRUB on $dev failed\n"; } } @@ -546,6 +548,9 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint"); + if ($forceInstall eq "true") { + push @command, "--force"; + } if ($canTouchEfiVariables eq "true") { push @command, "--bootloader-id=$bootloaderId"; } else { diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index b7400e333e21..eb8ea6130972 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ in boot.loader.raspberryPi.version = mkOption { default = 2; - type = types.int; + type = types.enum [ 1 2 ]; description = '' ''; }; @@ -44,10 +44,5 @@ in system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; system.boot.loader.kernelFile = platform.kernelTarget; - assertions = [ - { assertion = (cfg.version == 1 || cfg.version == 2); - message = "loader.raspberryPi.version should be 1 or 2"; - } - ]; }; } diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 60a587af8e9f..d45b1686c1ea 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -51,6 +51,10 @@ in url = "https://nixos.org/logo/nixos-hires.png"; sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; }; + defaultText = ''pkgs.fetchurl { + url = "https://nixos.org/logo/nixos-hires.png"; + sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; + }''; description = '' Logo which is displayed on the splash screen. ''; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 1faa8abd5f7f..aaa78daeb3a3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -782,13 +782,12 @@ in }; type = mkOption { - type = types.string; + type = types.enum [ "managed" "ibss" "monitor" "mesh" "wds" ]; default = "managed"; example = "ibss"; description = '' - The type of the WLAN interface. The type has to be either <literal>managed</literal>, - <literal>ibss</literal>, <literal>monitor</literal>, <literal>mesh</literal> or <literal>wds</literal>. - Also, the type has to be supported by the underlying hardware of the device. + The type of the WLAN interface. + The type has to be supported by the underlying hardware of the device. ''; }; @@ -799,17 +798,11 @@ in }; flags = mkOption { - type = types.nullOr types.string; + type = with types; nullOr (enum [ "none" "fcsfail" "control" "otherbss" "cook" "active" ]); default = null; example = "control"; description = '' - Flags for interface of type <literal>monitor</literal>. The valid flags are: - none: no special flags - fcsfail: show frames with FCS errors - control: show control frames - otherbss: show frames from other BSSes - cook: use cooked mode - active: use active mode (ACK incoming unicast packets) + Flags for interface of type <literal>monitor</literal>. ''; }; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index aa28a25be7ac..cfc1065b7294 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -129,9 +129,12 @@ let --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ - ${if cfg.additionalCapabilities != null then + ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" } \ + ${if cfg.tmpfs != null && cfg.tmpfs != [] then + ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" + } \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; @@ -367,6 +370,7 @@ let hostAddress6 = null; localAddress = null; localAddress6 = null; + tmpfs = null; }; in @@ -510,6 +514,18 @@ in ''; }; + tmpfs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/var" ]; + description = '' + Mounts a set of tmpfs file systems into the container. + Multiple paths can be specified. + Valid items must conform to the --tmpfs argument + of systemd-nspawn. See systemd-nspawn(1) for details. + ''; + }; + } // networkOptions; config = mkMerge diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index abc2e766959e..5039118d78ee 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -24,7 +24,7 @@ with lib; copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart + cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart ln -s sed $out/bin/gnused ''; diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index b9a4f3b11dc1..ac5f87817fe9 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.vmwareGuest; open-vm-tools = pkgs.open-vm-tools; + xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { options = { @@ -29,18 +30,17 @@ in services.xserver = { videoDrivers = mkOverride 50 [ "vmware" ]; + modules = [ xf86inputvmmouse ]; config = '' - Section "InputDevice" + Section "InputClass" Identifier "VMMouse" + MatchDevicePath "/dev/input/event*" + MatchProduct "ImPS/2 Generic Wheel Mouse" Driver "vmmouse" EndSection ''; - serverLayoutSection = '' - InputDevice "VMMouse" - ''; - displayManager.sessionCommands = '' ${open-vm-tools}/bin/vmware-user-suid-wrapper ''; diff --git a/nixos/release.nix b/nixos/release.nix index 639ee45b38d6..4fd48bc2477f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,6 +228,7 @@ in rec { tests.containers-imperative = callTest tests/containers-imperative.nix {}; tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {}; + tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; tests.ecryptfs = callTest tests/ecryptfs.nix {}; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index f61c82b916ad..f32ec52dfc26 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.cjdns = { UDPInterface = { bind = "0.0.0.0:1024"; - connectTo."192.168.0.1:1024}" = + connectTo."192.168.0.1:1024" = { password = carolPassword; publicKey = carolPubKey; }; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix new file mode 100644 index 000000000000..564831fa2737 --- /dev/null +++ b/nixos/tests/containers-tmpfs.nix @@ -0,0 +1,79 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ckampka ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + containers.tmpfs = + { + autoStart = true; + tmpfs = [ + # Mount var as a tmpfs + "/var" + + # Add a nested mount inside a tmpfs + "/var/log" + + # Add a tmpfs on a path that does not exist + "/some/random/path" + ]; + config = { }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->waitForUnit("default.target"); + $machine->succeed("nixos-container list") =~ /tmpfs/ or die; + + # Start the tmpfs container. + #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die; + + # Verify that /var is mounted as a tmpfs + #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null"); + + # Verify that /var/log is mounted as a tmpfs + $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null"); + + # Verify that /some/random/path is mounted as a tmpfs + $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null"); + + # Verify that files created in the container in a non-tmpfs directory are visible on the host. + # This establishes legitimacy for the following tests + $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null"); + $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null"); + $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file"); + + + # Verify that /some/random/path is writable and that files created there + # are not in the hosts container dir but in the tmpfs + $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null"); + $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null"); + + $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file"); + + # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted + # are not visible to the container as the do not exist in the tmpfs + $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file"); + + $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file"); + $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null"); + + $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null"); + + ''; + +}) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index e19acab36b5a..3b94235889cf 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { xorg.xproto ]; + patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic + + configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi"; + preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 1504cce1d582..871621d3bb1b 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, deadbeef, glib }: stdenv.mkDerivation rec { - version = "1.8"; name = "deadbeef-mpris2-plugin-${version}"; + version = "1.10"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1xg880zlxbqz7hs5g7xwc128l08j8c3isn45rdi138hi4fqbyjfi"; + sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; + homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix new file mode 100644 index 000000000000..36ce40490222 --- /dev/null +++ b/pkgs/applications/audio/ecasound/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, libjack2 +, liblo +, liboil +, libsamplerate +, libsndfile +, lilv +, lv2 +}: + +# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. + +stdenv.mkDerivation rec { + name = "ecasound-${version}"; + version = "2.9.1"; + + src = fetchurl { + url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; + }; + + buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + + meta = { + description = "Ecasound is a software package designed for multitrack audio processing"; + license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + homepage = http://nosignal.fi/ecasound/; + }; +} diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/applications/audio/faust/faust2ladspa.nix new file mode 100644 index 000000000000..67de98cab9a2 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2ladspa.nix @@ -0,0 +1,12 @@ +{ boost +, faust +, ladspaH +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2ladspa"; + + propagatedBuildInputs = [ boost ladspaH ]; + +} diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 4cb7668a43f5..50996b71c643 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -5,16 +5,18 @@ stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2"; - sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj"; + sha256 = "1wn4za08z64bhsgfhr9c0crfyvy8c3b6a337wx7gz19am5srqh8v"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ - ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis - libmpc libsndfile libjack2 db libmodplug timidity libid3tag libtool + ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2 + db libmodplug timidity libid3tag libtool ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix new file mode 100644 index 000000000000..c6609814ea0b --- /dev/null +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchgit +, autoreconfHook +, help2man +, pkgconfig +, libsndfile +, fftwFloat +, libjack2 +, libxml2 +, qt4 +, boost +, ecasound +, glibcLocales +, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +}: + +stdenv.mkDerivation rec { + name = "soundscape-renderer-unstable-${version}"; + + version = "2016-11-03"; + + src = fetchgit { + url = https://github.com/SoundScapeRenderer/ssr; + rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; + sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + }; + + # Without it doesn't find all of the boost libraries. + BOOST_LIB_DIR="${boost}/lib"; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + + # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 + # 2) Make it find ecasound headers + # 3) Fix locale for help2man + prePatch = '' + substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||'; + substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/' + substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8' + ''; + + meta = { + homepage = http://spatialaudio.net/ssr/; + description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.fridh; + }; + +} diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 90e7d41a97b9..d7072e961635 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "svox-${version}"; - version = "2016-01-25"; + version = "2016-10-20"; src = fetchgit { url = "https://android.googlesource.com/platform/external/svox"; - rev = "dfb9937746b1828d093faf3b1494f9dc403f392d"; - sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk"; + rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d"; + sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g"; }; postPatch = '' diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index b6c658636bb2..1a125de0a872 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: let - version = "4.7.0"; - rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time + version = "4.8.0"; + rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8"; + sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs"; }; srcs = [ crashPlanArchive ]; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi domenkozar ]; + maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; }; buildInputs = [ makeWrapper cpio ]; @@ -43,7 +43,6 @@ in stdenv.mkDerivation rec { install -d -m 755 unpacked $out - install -D -m 644 EULA.txt $out/EULA.txt install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3f8d5aec4aa1..9fd56a49b5f5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -57,7 +57,7 @@ let meta = with stdenv.lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; + homepage = "https://github.com/sddm/sddm"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ttuegel ]; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 96b26e6bee1b..03b858c896cc 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.12.2"; + version = "1.12.5"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "03kznbxfxyjq9fqq1jvq3gvvy50dz3wqvn098n9k9gv8x3595mw4"; + sha256 = "0bxv9j6v77g9sjlg6vjcxjdsgbh10v3c8f0qp5fpzr7dzk7k9w41"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 42396b72e7cb..1ad97a0f7649 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "6.19.1.201607051943"; + version = "7.2.0.201611082205"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.19.1/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "03aah57g0cgxym95p1wcj2h69xy3r9c0vv7js3gpmw1hx8w9sjsf"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1"; }; meta = with stdenv.lib; { @@ -403,16 +403,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.12.201607091356"; + version = "6.9.13.201609291640"; srcFeature = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; - sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54"; + sha256 = "02wzcysl7ga3wnvnwp6asl8d77wgc547c5qqawixw94lw6fn1a15"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br"; + sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index ef006439a555..6b51f117ad85 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { install *.el* $out/share/emacs/site-lisp ''; - meta = { + meta = with stdenv.lib; { description = "Precision colors for machines and people"; homepage = http://ethanschoonover.com/solarized; - maintainers = "Samuel Rivas <samuelrivas@gmail.com>"; - license = stdenv.lib.licenses.mit; - - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.samuelrivas ]; + license = licenses.mit; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f62d0963c03..aacc3f9e7927 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext libselinux ] - ++ lib.optional stdenv.isLinux dbus + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 1ce86e96c4da..a768ecb7c8a6 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -156,12 +156,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.2.5"; + version = "2016.3"; 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 = "0d1pssnrn36fibwsyjh30fsd5hn7qw3nljdnwg40q52skilcdk0v"; + sha256 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3"; }; wmClass = "jetbrains-idea-ce"; }; @@ -192,12 +192,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.2.5"; + version = "2016.3"; 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}.tar.gz"; - sha256 = "0g8v3fw3610gyi25x489vlb72200rgb3b4rwh0igr4w35gwdv91h"; + sha256 = "1sax3sjhsyvb9qfnn0gc74p3ym6j5f30mmapd4irq9fk4bsl8c31"; }; wmClass = "jetbrains-idea"; }; @@ -288,12 +288,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.2.4"; + version = "2016.3"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1h61l44xnbcdb26q8ylb25sj3rs43nxki203i2jra2i6j5jzxrvg"; + sha256 = "12jv8x7rq0cpvrbrb2l2x1p7is8511fx6ia79z5v3fnwxf17i3w5"; }; wmClass = "jetbrains-webstorm"; }; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index fb6c76be0794..44e07cc22c0b 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, pythonPackages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] - ++ (with pythonPackages; [ python dateutil wxPython30 numpy ]); + ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); configureFlags = [ "--with-proj-share=${proj}/share/proj" @@ -59,7 +59,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${pythonPackages.python}/bin/${pythonPackages.python.executable} + --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} ln -s $out/grass-*/lib $out/lib ''; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index cce683067e70..680cf921ce26 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl -, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper +, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); + (with python2Packages; [ numpy psycopg2 requests2 python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix new file mode 100644 index 000000000000..3e5d1b7b52ef --- /dev/null +++ b/pkgs/applications/graphics/digikam/5.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchurl, cmake, ecm, makeQtWrapper + +# For `digitaglinktree` +, perl, sqlite + +, qtbase +, qtxmlpatterns +, qtsvg +, qtwebkit + +, kconfigwidgets +, kcoreaddons +, kdoctools +, kfilemetadata +, knotifications +, knotifyconfig +, ktextwidgets +, kwidgetsaddons +, kxmlgui + +, bison +, boost +, eigen +, exiv2 +, flex +, jasper +, lcms2 +, lensfun +, libgphoto2 +, libkipi +, liblqr1 +, libusb1 +, marble +, mysql +, opencv +, threadweaver + +# For panorama and focus stacking +, enblend-enfuse +, hugin +, gnumake + +, oxygen +}: + +stdenv.mkDerivation rec { + name = "digikam-${version}"; + version = "5.3.0"; + + src = fetchurl { + url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k"; + }; + + nativeBuildInputs = [ cmake ecm makeQtWrapper ]; + + buildInputs = [ + qtbase + qtxmlpatterns + qtsvg + qtwebkit + + kconfigwidgets + kcoreaddons + kdoctools + kfilemetadata + knotifications + knotifyconfig + ktextwidgets + kwidgetsaddons + kxmlgui + + bison + boost + eigen + exiv2 + flex + jasper + lcms2 + lensfun + libgphoto2 + libkipi + liblqr1 + libusb1 + marble.unwrapped + mysql + opencv + threadweaver + + oxygen + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" + "-DENABLE_MYSQLSUPPORT=1" + "-DENABLE_INTERNALMYSQL=1" + ]; + + fixupPhase = '' + substituteInPlace $out/bin/digitaglinktree \ + --replace "/usr/bin/perl" "${perl}/bin/perl" \ + --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" + + wrapQtProgram $out/bin/digikam \ + --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" + + wrapQtProgram $out/bin/showfoto + ''; + + meta = { + description = "Photo Management Program"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 9fd669551dec..fa6db4e7f02f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -233,21 +233,20 @@ rec { }; gimplensfun = pluginDerivation rec { - name = "gimplensfun-0.1.1"; + version = "0.2.4"; + name = "gimplensfun-${version}"; - src = fetchurl { - url = "http://lensfun.sebastiankraft.net/${name}.tar.gz"; - sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q"; + src = fetchFromGitHub { + owner = "seebk"; + repo = "GIMP-Lensfun"; + rev = version; + sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz"; }; - patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' ''; - buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ]; installPhase = " - installPlugins gimplensfun - mkdir -p $out/bin - cp gimplensfun $out/bin + installPlugins gimp-lensfun "; meta = { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 91f8e677adba..651bfafcead9 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -15,15 +15,15 @@ stdenv.mkDerivation { patches = [ ./disable-popen.patch (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part1.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch"; sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch"; + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch"; sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; }) (fetchpatch { diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index f29d09b8ef7b..fded09545e1f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, extra-cmake-modules, makeQtWrapper +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -8,12 +8,11 @@ stdenv.mkDerivation rec { name = "krita-${version}"; - version = "3.0"; + version = "3.0.1.1"; - src = fetchgit { - url = "http://phabricator.kde.org/diffusion/KRITA/krita.git"; - rev = "refs/tags/v${version}"; - sha256 = "0aas86667ncp8jz00c8qk7bm26g76l65cysh06wxr8kxbvqynrdn"; + src = fetchurl { + url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 4b8c7a4fe921..c0a0206ddd1f 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -4,25 +4,26 @@ with stdenv.lib; let installSanePath = path: '' - if test -e "${path}/lib/sane"; then + if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do - ln -s $backend $out/lib/sane/$(basename $backend) + ln -s "$backend" "$out/lib/sane/$(basename "$backend")" done fi - if test -e "${path}/etc/sane.d"; then + if [ -e "${path}/etc/sane.d" ]; then find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do - if test $(basename $conf) = "dll.conf"; then - cat $conf >> $out/etc/sane.d/dll.conf + name="$(basename $conf)" + if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then + cat "$conf" >> "$out/etc/sane.d/$name" else - ln -s $conf $out/etc/sane.d/$(basename $conf) + ln -s "$conf" "$out/etc/sane.d/$name" fi done fi - if test -e "${path}/etc/sane.d/dll.d"; then + if [ -e "${path}/etc/sane.d/dll.d" ]; then find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do - ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf) + ln -s "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" done fi ''; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 0d52e563c9de..3d4e8c592abb 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: let perlModules = with perlPackages; @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak"; }; + patches = [ + (fetchpatch { + url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co"; + name = "CVE-2015-0854.patch"; + sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12"; + }) + ]; + buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index b81efb08d8ac..669fc5a28a73 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler @@ -21,6 +21,32 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lX11" "-lz" ]; + desktopItem = makeDesktopItem { + name = name; + exec = "xournal"; + icon = "xournal"; + desktopName = "Xournal"; + comment = meta.description; + categories = "Office;Graphics;"; + mimeType = "application/pdf;application/x-xoj"; + genericName = "PDF Editor"; + }; + + postInstall='' + mkdir --parents $out/share/mime/packages + cat << EOF > $out/share/mime/packages/xournal.xml + <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/x-xoj"> + <comment>Xournal Document</comment> + <glob pattern="*.xoj"/> + </mime-type> + </mime-info> + EOF + cp --recursive ${desktopItem}/share/applications $out/share + mkdir --parents $out/share/icons + cp $out/share/xournal/pixmaps/xournal.png $out/share/icons + ''; + meta = { homepage = http://xournal.sourceforge.net/; description = "Note-taking application (supposes stylus)"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index afb48c697b5c..d97a970df2a5 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.16.1"; + version = "3.16.2.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0h7ykcpvsikjfap51hpcz6z814riiwyps585j2i1yv9dmsbqdi7j"; + sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27"; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - homepage = http://www.yworks.com/en/products/yfiles/yed/; + homepage = "http://www.yworks.com/en/products/yfiles/yed/"; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index bc562b7d5778..458aed051a28 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "electrum-${version}"; version = "2.7.11"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ dns ecdsa jsonrpclib diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index efe39e5d8b76..497ac298d281 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.9.2"; + version = "3.7.10.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki"; + sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3"; }; buildInputs = [ diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index fa0097272ffb..71705b005453 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -16,11 +16,11 @@ let sockjs-tornado = pythonPackages.buildPythonPackage rec { name = "sockjs-tornado-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; }; # This is needed for compatibility with OctoPrint @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { description = "SockJS python server implementation on top of Tornado framework"; - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = "http://github.com/mrjoes/sockjs-tornado/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; @@ -37,13 +37,13 @@ let in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.2.15"; + version = "1.2.17"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56"; + sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh"; }; # We need old Tornado @@ -67,6 +67,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ -e 's,markdown>=[^"]*,markdown,g' \ -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ + -e 's,Flask-Login>=[^"]*,Flask-Login,g' \ -e 's,rsa>=[^"]*,rsa,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \ setup.py diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index 968983696feb..cbfb6111ec51 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,18 +1,18 @@ -From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001 +From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> -Date: Fri, 12 Aug 2016 23:41:22 +0300 +Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library --- - octoprint_m33fio/__init__.py | 66 +----------------------------------------- - shared library source/Makefile | 59 +++---------------------------------- - 2 files changed, 5 insertions(+), 120 deletions(-) + octoprint_m33fio/__init__.py | 67 ++---------------------------------------- + shared library source/Makefile | 62 +++----------------------------------- + 2 files changed, 6 insertions(+), 123 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index da539f5..b0a17ad 100755 +index f9f84c4..b365024 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -979,71 +979,7 @@ class M33FioPlugin( +@@ -1061,71 +1061,8 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -81,19 +81,20 @@ index da539f5..b0a17ad 100755 - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") # Check if shared library was set if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index a43d657..0b254aa 100755 +index 887899b..4c74f5c 100755 --- a/shared library source/Makefile +++ b/shared library source/Makefile -@@ -1,62 +1,11 @@ - # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 +@@ -1,68 +1,14 @@ +-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 -LIBRARY_NAME = preprocessor +-TARGET_PLATFORM = LINUX64 +LIBRARY_NAME = libpreprocessor - TARGET_PLATFORM = LINUX64 VER = .1 -ifeq ($(TARGET_PLATFORM), LINUX32) @@ -122,19 +123,19 @@ index a43d657..0b254aa 100755 - -ifeq ($(TARGET_PLATFORM), PI) - PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - -ifeq ($(TARGET_PLATFORM), PI2) - PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - -ifeq ($(TARGET_PLATFORM), ARM7) - PROG = $(LIBRARY_NAME)_arm7.so -- CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ +- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ - CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - @@ -151,11 +152,17 @@ index a43d657..0b254aa 100755 - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -endif +PROG = $(LIBRARY_NAME).so -+CC = g++ +CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) SRCS = preprocessor.cpp gcode.cpp vector.cpp CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared + + all: +- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) ++ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) + + clean: + rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.9.2 +2.10.2 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 09f9e654b94c..8f0152457632 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.7"; + version = "1.11"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp"; + sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl"; }; patches = [ diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 96ad943ad57c..812c7ec61145 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala_0_26, gtk3, libgee +{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk"; + sha256 = "1fcwxvik3nnn0g37xvb30vxaxwrd881fw07fyfb9c6ami9bnva3p"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ gstreamer gst-plugins-base vala_0_26 gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg ]; + buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler + libpthreadstubs makeWrapper librsvg ]; postInstall = '' wrapProgram $out/bin/pdfpc \ diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix new file mode 100644 index 000000000000..b8fa38268c38 --- /dev/null +++ b/pkgs/applications/misc/plover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python27Packages, wmctrl }: + +python27Packages.buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.0"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + }; + + # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 + postPatch = '' + substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" + ''; + + buildInputs = with python27Packages; [ pytest mock ]; + propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi + wxPython xlib wmctrl ]; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index d07863df0e0d..cbf602b75dab 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper -, pkgconfig, python, pythonPackages, vte }: +, pkgconfig, python, pythonPackages, vte +, wrapGAppsHook}: # TODO: Still getting following warning. # WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files # Seems related to this: # https://forums.gentoo.org/viewtopic-t-947210-start-0.html -let version = "2.9.4"; +let version = "3.3.2"; in stdenv.mkDerivation rec { name = "roxterm-${version}"; src = fetchurl { - url = "mirror://sourceforge/roxterm/${name}.tar.bz2"; - sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x"; + url = "mirror://sourceforge/roxterm/${name}.tar.xz"; + sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; }; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper pkgconfig python pythonPackages.lockfile ]; - - propagatedBuildInputs = - [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib + gdk_pixbuf gsettings_desktop_schemas gtk3 + hicolor_icon_theme vte ]; NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" @@ -37,16 +39,12 @@ in stdenv.mkDerivation rec { # Fix up the LD_LIBRARY_PATH so that expat is on it export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" - python mscript.py configure --prefix="$out" + python mscript.py configure --prefix="$out" --disable-nls --disable-translations python mscript.py build ''; installPhase = '' python mscript.py install - - wrapProgram "$out/bin/roxterm" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; meta = with stdenv.lib; { @@ -54,10 +52,10 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; description = "Tabbed, VTE-based terminal emulator"; longDescription = '' - Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome. + Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without + the dependencies on Gnome. ''; maintainers = with maintainers; [ cdepillabout ]; platforms = platforms.linux; - broken = true; # https://github.com/NixOS/nixpkgs/issues/19579 }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index 901afab78bca..194bb8397fb5 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "urxvt-tabbedex-2016-08-09"; + name = "urxvt-tabbedex-2016-08-17"; src = fetchFromGitHub { owner = "mina86"; repo = "urxvt-tabbedex"; - rev = "ac220eb3984e151ba14dce08f446bc7bc8ca29a2"; - sha256 = "1b5mff5137jb5ysklsmfp5ql3m4g1z3bdhk0nwhz2hgwz40ap6k8"; + rev = "089d0cb724eeb62fa8a5dfcb00ced7761e794149"; + sha256 = "0a5jrb7ryafj55fgi8fhpy3gmb1xh5j7pbn8p5j5k6s2fnh0g0hq"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix new file mode 100644 index 000000000000..7367c8207054 --- /dev/null +++ b/pkgs/applications/misc/simplenote/default.nix @@ -0,0 +1,63 @@ +{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: + + stdenv.mkDerivation rec { + + name = "simplenote-${pkgver}"; + pkgver = "1.0.6"; + + src = fetchurl { + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; + sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + }; + + buildCommand = let + + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + + in '' + mkdir -p $out/share/ + mkdir -p $out/bin + tar xvzf $src -C $out/share/ + mv $out/share/Simplenote-linux-x64 $out/share/simplenote + mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote + mkdir -p $out/share/applications + + cat > $out/share/applications/simplenote.desktop << EOF + [Desktop Entry] + Name=Simplenote + Comment=Simplenote for Linux + Exec=$out/bin/simplenote + Icon=$out/share/simplenote/Simplenote.png + Type=Application + StartupNotify=true + Categories=Development; + EOF + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/simplenote" \ + $out/share/simplenote/simplenote + + ln -s $out/share/simplenote/simplenote $out/bin/simplenote + ''; + + meta = with stdenv.lib; { + description = "The simplest way to keep notes"; + homepage = https://github.com/Automattic/simplenote-electron; + license = licenses.lgpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix new file mode 100644 index 000000000000..be4a004fb8ba --- /dev/null +++ b/pkgs/applications/misc/subsurface/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + cmake, + curl, + fetchgit, + grantlee, + libdivecomputer, + libgit2, + libmarble-ssrf, + libssh2, + libxml2, + libxslt, + libzip, + pkgconfig, + qtbase, + qtconnectivity, + qttools, + qtwebkit, + sqlite +}: + +stdenv.mkDerivation rec { + version = "4.5.6"; + name = "subsurface-${version}"; + + # use fetchgit instead of the official tgz is not complete + src = fetchgit { + sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f"; + url = "git://git.subsurface-divelog.org/subsurface"; + rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0"; + branchName = "v4.5-branch"; + }; + + buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt + libzip libxml2 grantlee qtwebkit qttools + qtconnectivity libgit2 libssh2 curl ]; + nativeBuildInputs = [ pkgconfig cmake ]; + + enableParallelBuilding = true; + + # hack incoming... + preConfigure = '' + marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ + -DMARBLE_LIBRARIES=$marble_libs \ + -DNO_PRINTING=OFF \ + -DUSE_LIBGIT23_API=1" + ''; + + meta = with stdenv.lib; { + description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; + longDescription = '' + Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. + It allows tracking of dive locations including GPS coordinates (which can also + conveniently be entered using a map interface), logging of equipment used and + names of other divers, and lets users rate dives and provide additional notes. + ''; + homepage = https://subsurface-divelog.org; + license = licenses.gpl2; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 43b7312cda64..a64ab0ea2ca3 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.2.4"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e"; + sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; }; buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index adc0c3c9fb63..8d157d414f86 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "xterm-325"; + name = "xterm-327"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v"; + sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 9b779ab98928..bad888bff52e 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 = "23.0.0.205"; + version = "23.0.0.207"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0gj5d8475qcplm3iqs3hkq0i6qkmbhci1zp3ljnhafc6xz0avyhj"; + sha256 = "1spwv06rynaw45pdll6hzsq6zbz1q10bf7dx4zz25gh8x3sl9l6a"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index a785b8593504..cc34318edf3c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl -, spidermonkey, gpm +, spidermonkey_1_8_5, gpm , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] + buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { '' --enable-finger --enable-html-highlight --with-perl --enable-gopher --enable-cgi --enable-bittorrent - --with-spidermonkey=${spidermonkey} + --with-spidermonkey=${spidermonkey_1_8_5} --enable-nntp --with-openssl=${openssl.dev} '' + stdenv.lib.optionalString enableGuile " --with-guile" + stdenv.lib.optionalString enablePython " --with-python"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 9d895a383e1d..ac4bc88e1280 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "49.0.2"; + version = "50.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "d1fc1b384b44067920b63385d486d41e6fcd47ed14ab31dce708ae25029bb5b437ba5824725c90573d9ccd010c3d4c83131afaf2a2494fdee56a8b7f2ad3c24b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "cb4a8a03e4a2fd495c8fd6e9b42d6a9556ef7033b8aa6d587b45ed64f2d7b96e1cdaf3dd4413f1a55aaf4300c473ca6abda8cd823efc3a33f15b6f2c693cfc31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "f2d22dda5b35a4a093fdde9fd6d99b7ba6540c5da218ab8ec87fdf1094b740c71a73e3bd62997fd4a3726a99c39a4c441e1cf3adfb5d56f07752dd508001c802"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "4dee2a39797423ae4f525b14a007019ac0f4ec2ca781c3ba2b2e6d62dc7fa538c1fa8d2f4b8d7eebdfbece391bcf56bf96a2ef74fb290ebfd217e7ce8f43717b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "56778bd3626177faaeed0a0da8d5db2913fe9fd0f2341b9f438a9862066a8e5818f2ae746f79e03c6c576c5735945c5df378c72269f80054bfb93228b881403b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "b509fddc94fca6960be4bf358391e2dcd256c70d7a0c730759ba2832b56b654c5d4aff74773499f7be4bf2238c6b575a97a4df28c5943439d0025dda9dab7c18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "5480712a3a2a40872ca7ac9625d76761b81a64319b3bb8e675d86022973784621a104dd28c651d7ab633ec11f50823d1a849def5cb06016b54d44c86f586d383"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2fc3d317f1afca7784f949bf56dec725228db5f41c8e3be855d5d2bedf416803ba7e32a1fb89628ab844967212cc3a7d0b6320f4a820563e71a70edf0637d3f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d6634c1ca6d82e2ed2e7e283431ed95dd65b1db558f50c73130b6d3804517a199d22819c74d6caf66cbbbb3185241990c7bc90fb4932249e5d19c6c48eee6caa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1688ec07557c477fdb6ea2df524e28a3acc125016d6d2ea5042d8bc0cc8ba3a8e77f65f44ff41298502459f10749f615484aac9dd3ac6ffcfa8db04f6355d8b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "96ec194358754aa1c71c1d929fe0641544fb25bbc73e31a865b7f31b5def4320c56d56ffe81388348bc24ac9cb62c4d5055aa2e6b31124cbea9637c1e529f13b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "46497eb1eb6c432bddd6ae1e9a39f4d86c9f14d3f956302ab2bc5d57625a6f966f687d978e1e93bc351be2c0d32150a5b2873fbb62309698fa7c37794adefb00"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "208d81168e9cdabee3b590813d64bce6211ab9e3cc2bcd11ebeff90a2705f037d2c489a6a50c6e786ade80eaa17faf388b6540610e51f308da03e14e453cc7b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "844f3be9b6f52d34f2fb87d8a881a50e49a4820fa97f522d9e462127b88ea4ffdd36a514f353fbbf80e702452a26e2dc30bcd750a0cbd43b26452937955c9c68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "e0e2f3d6eef948867888f4564dd3322d5e44cde5573675c6d58fbbaddee65e787a31284172f688854e3646bb57e71961ca04ee4623ea3192be1483e5d677dcff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "459f5192ca7a1f8dc6f3f22c106db1dd216a41cb11122050e02f86cec06e578fa033b00c1d8355a5a2a759fd8702a14dbaa3a706ec28c50911c2250d4561b228"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3ce16e6e974c41d671a58c16b44f660f420dabb7eba7eba9213ba6d86fb029ff495f507a09a1669c6c3641a6dfa9b377a511141b0c3d55839a7ca1e2790a188d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "53e965cdf50e12a876a9301370029254953eea1bf4e6ff45ef62835a48d25630a59de0ef655b8bd1664e1746b656c556d0955f39ca2e0c9fbf95b795a93197e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "789eb6dc6f3f42051ba5f91999fb675955b568198dbe7cce3b2bfe3f3763859a1610009480edd348c857f42704da3338eea28617f97d8272b24a2ff95c7b2450"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "9cd693b98776e426c0c6d66934c0f7beb7c692b0df5967d09c91889dd12a8a2652cd4641acaaf1c6d7aff9b740504ca54c4fe518496d855316eeb82f82c6f31b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "b36d55da04a98b29291b65c6f6ced5ccc67bdce7d3265665258e2ad212c5c0f7928943f55b98678924ed1d05121e2d2beaf7fafea9044d7ea4e0263ae2aad3a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "f9049cd7d5d67fb52587710d5b7a273819439064a621af6de051a196c5ea597d0d27aaecf638eca1670ac08570df91be906d30935e1f79c2d53c080a5d715ccf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c8c61f8ab7476c073776e27a9c8110ed5c2968782c9580b5d9afe3670472f984fb4e586a2ce50cc6b0f65dc3628f9fa632c12c9219cb9a5375c5d845f1d39f18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "601f5785b61f6900c496cd73430d679d459ef8e4fe37463e752b483ddb16c4c879451fca67c97a4e74bf75473116c171f5ae4ce8da4fb17742785ef7d0baa365"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "c45716c519a29b5b94383b7c23c592b4d7922c0778abdd0c87519576ba1af459180dbdd87aee112cb9b7f607d3100cf38bb47c59ec1b2dabb6f96169f09c97c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a3a4873487737ca3ad80f4b683ee3342a340dee4543af007b21e7bec008c3187755857cfbd3aa63a16478e93d80b4f40ab1fda44cbf9bb7ed7abfc760073b535"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "5470ebe85f960627e9b9f08ae37fda4eaf0203542d8e4c2aca85ba54fa8fd8d1694b8722a67e647c9b71ceb75d7eeedb338f9b75f630694fe084160c241d6a1d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "98ac4372d48b0b7f714ea81da512ca46ccb2fc5d35c17a8e4e17f48942a34008de55935ed65295034376a6d6c6d0b9c984cf7eb82f9450a90adc7d714c8514c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "499fc78ab65e872218282cecfdb72ea8ffc54cada9e9f533d5b678c235512489a3f75c78893058a05853372c23cce11e581cc95b9dc249c9932e9d0e4d9ede30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "e92f0713a43a1ef4884de071ac598df37499bef2f636031f3e685308dcbc62bdd11ad5b633c4e35f07eb85279bf1114a0210a890f4813d68b114ca52a9122636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "0f068b5756a5c6bea869207282cd916703ddabdefe815bdc08a27c70e9992a1041db9ce6dcbb3cc063788ee438cab624cf89ddea480765ef3f09d6b4467c3eb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "12f0eae081ddaadbc89283f17b0f69ba677c4f368b29f6cc3bbe308be5beb5be7938019fdcd924abf274c49464ce23e03277e010fe40bbc78f7aba2b6ad8995b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "ab8a1f8afdece2b69a510a3946dd6fc5763c25bd03456ffe4181aa2b6c3f17471578a64ea1b0a65085ca8682bb7f6cd8c4939394c4686e9ffc3478aa2a7b3a7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "2aec664a8884547a81b2cb0bb8a0cf2aa7f5f1ad6c02ead41e6e752cfd0d6739aa408b6d0461a88eacdadf4f2c8323f4de9f8d50669ce756c904510a243d964d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "77d28752fb60f2347393cd952329ab9ab128cbe3442117d2f4d53e84ea69ff10862d930a1884788db61bf6a910909d9ded46e56f2b3ea791a2e4f89b8dc1fab1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "e864623ef2af94a161f1a22d233480f7bf94adf0a9f75cb23caae207b47a5d34ba9d1d1cc00fe8a51121d3d465f5af087ac5020fc6ba246fc850c5ae4ff3edda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "148e4c1990f0e68e0550f00d517355f0d2e81f744ec592b297ad3c6a1be12baadedc0d7485ac1585e09891a162fc3fcab1d96645a2b4ab04dbe3b2853fe837f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a13463559ebdd0409d9e2c5de410b748be28de1455fc5b38d8531fd3afaac17e5e5520435908788f5370d4d8329c9dd692d3c2c1e6e0cd00e7f0ec76b2797b1e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "699f12418a92ea82b3bf96b2b2217f20260dbea294c2e7a37f03f9a6f15820fc15cbfb73c0ef3f2e0ff10353b5e6f61a39a4c57d61d6e51da5ba48cce9b6a0a1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7a8de523144d4f87062f2984788f77e2a36a12087d62e5bb3f054ae7251821aeb9b8d11b5f1c45304dfb9bdd2380f4b5a131c1d5c5a9918d23e0c419f0f27fc0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "9058fa8f99d96eb073581ba96ed37fb6d17ac87040730219962b0afa7348ae39582167b051d3c5e8f11ed6467b36fd73433c3262217f4990b917ad14470a4255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "7b4230b827e08863c427ad1b059a8509d9e4bd8de953f588cf750b0dfef5e40bf310022301a2005152fea31c9fe14510c9503ee4fea2362c37e98e52f90abc16"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "352ef41a90a9bb237a223d33235d98b0b1d319d30ff091e4b7c3bcf62c7f2511c8fb42d78bc8cbc41f52be4e0111975ad7e7e67e71611170409f41d126e648e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d452f6bf0bf4a361ca42e9545dc98cae9dbaffe1815efc92e3ee59a91d59554a248b95737d6cfb0e1e40b6cff3fdbbb66a13ded7366572a2b7bb5acb15bcb62e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ed9153779e91537aab0f44f86262663da2c0fd32850cb18c86a31952926d0df0ad07108989d698bfbe9f6fd4db8d4e000d5eccb10a9080f1ff0e7fc055e8319a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "f9c077f4f196cb664383824ef8899db8916890addafaf850aaa99629ede100cfd438af674f37dabe2bd5f8f1e56b870cc308476e5d13e5a24bd3f1694b9719fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "baa0c4a63a9849dddabfc99f63f42ef007eaec21bfbd9929629c7b3201005256f4862046896a4099c143653bc29967d26c3db35dcf8b39bedc920b8c06625103"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "28c11301d9937a1a7489d2d26d86b44b942d84396a8c0ec4af2cda078ba7c2159452ed44a0132ff3c0d6b93487bead5de373aa0463eede5ea4a9cec3eb95c698"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "400763f0273a3be94cde7c38bb410e654e99d190ace2a81d1b588f2bfb143fa7e4a425a9549b5edcdb02a324825d70faa65020752f236043d9e3448313062748"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "8bcea2944595a7900dc3a55c4e1d8b0fd70bede700bb244bc75ae981f33e32b67e89878715114e073e64d17b5ab351019628224b47bfe33ddc9a195a0ef08ed4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "57a5daa81df3381f32246813e352d453424264cf724b3666d796a0181f08ff0e1a57df53fd089facd5fa32ed072e7821412383de997141cf50fb8a8d73c0ade9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "caad9fe9203dbcb03dde31c3a3826d9ab3fc6a8df9a55e79036848d055d7594988c479e6021762a94d5a47fd931aa8f6650947e34d3bbbaccb702002f967e5f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "61ea4becca8ccd9ee635567bb87e881b57ddda08ec00a0cdf4a50c80532789f9730a3a5e7a1c1368d6a80354369471603e89f3e7f2539c6dbce2a40b7821524f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "748fec2bf32a63ee7eeb59835e17dc0c60ae78ff3fb3f05b59d4082e29475d8b3758c978a8fbf260ff616c32487e36f2efd0b51b69c8647e9997e8a6c7d0e5f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "2fa4107225c498691148f444eb6497e71111613097d50e4610ac0bec893acd7893e0f3bd4024e2351509f4778af281df3baea97a523d4be4540c6ff28f29aafb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1d9b298fc979b7baab7dfbfca12c172544cec8828afca494a75d0e0517b6cdc89693e94e3cd1c2887d7156a0fd54da9c59adbbc055947f1e9f4c4880f6a125fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "903146601206d5e196684fd908de24ea34d287aee2d03ce68fe2ae8092799a38054ec5a9be2d94b2d3680088eb4a58d2a8a8834652519dd3db2340667041e032"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e84dac8ca10564581f6a13b436a86010da60e88c38ae6f06c67129f2d3c33b4c1bf202810c19bd781aea7a55a809f4bb46cc8fed4b26e892dcd798731d19ea92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "689674c1ce12fe8f04d0a2824d78ccc0e0685320dbfc83ce5ad00b07ef62dd34bac5ec9719d97241d790daaf20dedfaf63f05b062aff63ca87eaf9b43f796b9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "37b8a6b008402ec8ae0dca89a062e9f6b0c84de04a3ebef98de45453252e3f373bc5c58c918c5e7caf05afd8c97fb4b691ec67b22330e3386ff8810d8b46dab9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "54d5963fbed7204c0311430f620479ce5eeb0ee3f8d5dc2611c8bf7fc76ca6e44c26d5bc8156afc2406d17b7e6c72a966469333ee1426e2de053666a246a9008"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "8296591b01349424dcdea4683795b5063b89d15aed67c299298abc2842e313b18c426e42e687fb7fabe7d6a54cb39af7ebbb1374ad0fbdba42d9c012a82ec8f0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3da3bd8e914e155662c9d8377e198e3363b931d4c2483ed880b1d7f7199380165e44183d9e9bb8189a7d461f080c3a0b5cc5b2041c939a2fb8625e4728f4c8ed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "1fbaceba15cd7e11b93c0e6977f5711e9aeae64d42e2b8a21aa42c814ee432c7cb0a64a84f0b5d1268275a69dfe2677859f37fb5f62e3d8c729473f4483fe794"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "21825fd0502866603d3878702d505e3db60e21fde005a4e3ce1d6ddb2c695859c56c1ee352f9a4dcfa6ab4f3bab7a8f7bb4f75d0868920af0186f16d88850d20"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "52ee181257cac9b916be9c804a1ff7e33f363a1ad2b6aafbbe00d461c4f9d1949345cd7b55d10df0eecf7f0e410ac07a9d7d5ae6dfe142cd594b5b72348726e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "612013364ce9f9d984d00c815e8e76f1b45c2de7bc013bdf49aa83c46d522c940e694c530c8a1d9971c1c5a2234b1bdd438f41903fd777b29ea5d51df6c314b4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aa93258af4ffa49068887638a33ff41ad29895ecc86ed329094a2b925b655755048b08f862cfb1a5c1d86365dcc1adef2227054c8b5eeac9f46268e1558d10ef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "be02f1bcc28af5d4b3cd6e1eca126846cd1443a2f0caa3d1e59be0f3046c5373a22b3fd5c3a853601249ee3e34100cf308bfc1ba54c514bc4cce3b647ce0c691"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "008d3b64553faaff26ff79a2123d81c0df3d5aa2dc9a6c678cbf472bee47c11d235c59711c5915e5ac991401d076dc7f3edc1da8207481d1c1f871a79a4362b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "74dbea8c626496a356a0b29fc302f03565dfcdd60e9ea4d68b8b3d3a45f43d66230b2c76919ec4cfd2e4b8d5d4d07d901912a471aeb582c3d35c5799c4d3dda4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "982ed9e4b817e90b19b2c104b3eae8117b59bded0b066dc773b9515aa8daadc322dc80105a5bc961ce7b0a3c5630838a26492f014be41d92ebde140030dad5c1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "4be2dfcaf244ec9a3ac64291dc1a77a6359fa4922bfda8a57d847418104adc7f591ae3ff51a5b2d0b2b04e916649889d852e9527b0b59f965fa90b3c091be431"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "151ca36fa5fd165a1992a682934f0219fb2b85a7a9aab8f503f4cc6685bce5253c7c9317c71007e8fcb2064c3c63c4107c696b5c2651bb1aa3b25897a2d3b17e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "37dd8b1d6162c05bffe114ea632485316e99cade321f4bda64ee61718f85d61e39c85f543b221833ba3bfbffec29926c907c9ea9349fb54600172c64d1d751a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "ae2b24bbbbac0eac95e559cb21561e15221d4d40acb4b6bc069c353e1c0af123cc396a960918683f88f2ab8d6b0207e585a83289704c18ff4735fea3c7e8f51a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "7105f05777629d12e7c90ec1574cc96a762938841e19185b3b077bdd52d6c28827e285eca95d2d6b0be899541981370f09944bad7773edd646b5199100f50b7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "a7dec692e8500d9e884a46cb1f2e340522d770c35b5f0c2743448747ce4322cea63149679f7409162772bd9a13c8275d099ea22ad711ce124d426300e0bb9473"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "74a46b05abfe713b3f9df1fd651dccd97b281d7d5c5ff93856c6d88c50b0a49428610dc7d8fe6ad5748290d15c2194750e890ddb79b7f7b2eeee77cf9d277bed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "486d32491f9f54d374fe24622477677ee90d09209c0eb74bcb52b93d33c2d0a8a540e195cdcc3fb117bf82ed0b777bee6465da51291f1d2998b0fcc1dcec1557"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "e471f9cf94e85bcf3a0404c9ea0cec7adfb38b64f93a931b86a164814d7b8cdb95d9e78d3790b21235a4da816710ca7f2b9fc547ceb5c11f9d4ed949a7a68ab2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "70399ee841ca80a3add669509249a57d5be11a7fd69aec4bfdf6eb0d5df5d40941fd59ebd79a0598699fc3adb5e162837691261e31922af8d8074caae6ea0977"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "dacacdfcc223c9709d0082be2a1f51568b8d8adece09640cfd4df74e29ee41c0cf28fc926899310d15a3ee81975f860ae00e896a825f3660ada72fc9318aa23e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "fbf321e64deba8b83d5e128179671b4c9fc6582ec5447b1a85044f1b142cbbf7f1a38abaab1b6d85f6ce9fff00575f3cc1dc08906f469a8f51b9a51f2d1c86ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "3434e4e259373981127422de30f8d659789651ba5220135a05286ac76e5a468d6d80c9a09f379ea0f4f03f1542ba5fbec064c54718c73bfa85cdd3144ccf5991"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d400e6afb62dbcf65e1697bca8aca8d2aabd5391bce50b83201e28fd140c00cef11dcaa7d68ad69a9e82f31e93b3ae350bb0aa2ddf4370cc672a77510bdab89c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "2210439603d946eca55701bdb95449fffb898442efe85d31059d0314e033c39a8b460b6e7f95c08bb9da145acd27744dc7d59600111bddfee05302c9743aaf4f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "154d4124cd2fab2f7c01e8e8c4b55ceac6a6582d2c425517a04ab0ba7211f9a834840baf56042a106d59e33e2e6f616597e1f29a21b183567f410627a1bf658b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d33f95c47d6d56599b67e19185b629b05e35ef085d0b8fe08ae461aba3cf9d21b186667f55a5dceba1019fdee6fdc4c105b7e5d7f625252cca5f939c8b7a0cd7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "a10434af0fd28a6c38a3bc57acd257dced2f2ec476ce18c7da07927295a98e8ec86f5dcc9012e2c6eb155b70d0ac7c143f74ead9f18bba932c192e5efff87087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "f82ba0dea755c93cac27cdfa58b40a79cba3cf09efa126bd978aaead0d64716ec4f9aefbdc3a8e1af0d06fcf2279f1c545efb6177b641fbbcdc24052c7655860"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "65ae4501c718705163fdccf39e53ef9c753f8b841221832ad6967921e0e7b385a23c0dacf9a1d5f5b309cd1dbfa813879f5a2fd3f0ca93c3dec6865ff36ef5ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "dded53d77f186a64336517d5d0cc7777bea256de43cb31f96d35cffc64a55c703b9b986038e82949369348ac83a7a42d4356b72e329e635ec827ddad8d6b5cf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "95c883bed5f89a826241b0e8c0f8ca5db10a534a1045ac2b0bc4ac9c93b9dd788644bb3404a95883641c6ed18696096f198dfb74f243a6a6a2d9b59f5e075c4e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "1dbd123dc5a8c15eaf311964fa46175cbefd6a72c84f0e046bdcf0904d942f8e375ad0205e2b708403482ace902b8457377c988eb57aec5a64f366273f818177"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "d1ccf36aaf7f85cfbdf34f5ec80b73757fb5fa7d1a0f7929bb97e5ebe5ad0cd189d0d288a4ca9466467968234b5b3939b1ffd2650266e26c506c95d0ab36ef61"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7092e252bb6ed7290d0e0acb6d6fa0be6a4b89e48610909b74a954246eac6066fc2931132afdd15aee617000f59ad042141fe8a83e1a37a1ec9f0bb96197330e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "1f4b21c65356dc4fb959072020123850654cd0eaecc6057f138608ecdcdca215a64089441d0a2cb2f0b892c430d41f5b24cfc202f3f2fc994ec2cfb5d520cfc3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "41a1e8b539b0eeefbae4c031a997fd8196a05ff4e7883288936b8a4caf6d30f0b6104aad3b955843bd982f8a6785e038bc15913a6423c4a8bc43c5815f890343"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cdd26321281d3049b9e34ccbc153af22f8f6a8b43f989df7ad74c448f21b5bc318ec3f6d26d6b9e35e60efe856b831a26e2785bb08b005791ad5b5a7d68feb15"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "87a8b95bfb8171dd49999ae47f788b1818df0916fc66da9a4bacab5ffafd9791055e49ac5497d19aeb9404a62c6cb9874596f7d5a29c4c7355f119b5105e80bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "04c6e5be875955cb4333ccf5bf8134c8485cd65bec9f86f3b06e8e9593bc45ca0d85ffccb7a0477287ed9a5700621d0555627c1261bcc2322d4c446086b6cdf1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e3e597bac7ec1aa163a1e758d23c633d9d453613f8b52bac4b566b6499b1fe1658fcaff1b466f37a752f862a48985a811606ac9c92ea65b8f75a9ff8c2172d7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "1f686ebf1cf1ca38e7e67a9ebfc73af6e9e72e648c34f7e3d2a0e4092c14697dd7608ab4ead11ce38edf3eaead09f96e01d81ad6b8491b54523f37268d1527e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "b21bba0745523be576c2f99002e01463bbcf5a3dd122578bf78b5614c303e336d3e5c1a27a2b7ad88d53b7df4b063352c867fe66bfd25c167c17c7fc2e81622b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "9f6b1506ed8fa820f1619d30dc045781a1bcb92f6755c0aad38fc5143c522341ff62afc39d6158aab863996d400a89546d4d2b4fec4f207c01d5c1ad1df8163c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "1822443cf61962f06ba82bfb5bf344aeedd12ee77e44acec0fb292ed6ec9fd843f2dab3e43caa0cb633107b8b79f30db88d0fbdfbbceaa5b6441141796a82699"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "54542ebefdeecc74344396862dd443bc09c910ff02cc49980e40dc8ec202cc187ee925d560e3d5c409f88b92158aaea2fe2be3ac24a56d370e50f6a9d0caaff1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ca6dca9be0e957d35adfb7f95a38677836620be986fe2b99a5437d5dc64258d081b91c31502103ad61f8f7828d1d6f18049fdd3248721a44ea31a0648512366"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9503bd88caf715738f8fcfb2b249fac0cb69873c4c5ed36eda4b06fd1e7f3032c7c8488613a042fc8236cbdaa93c1ef5d7a1d81d374559070006bbd714597313"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "666615b5905236e42c96c40d911a26b5d9c6c888d825d5bfeb6eccf9881668df41258920093c477e06470ba97046896390fc9fdae4e29e00ef5aad12064fd66a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "88d7accbd48856477137efde6b2b3d37b017c2b7126e4d37e0b328094e6d110e278ac75b61ac3a09cb5de63aa76b21adfb093327a099013d107fc772b1a7686a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "eb2300f63ac5983be2138afe6d588385b80595b736ec4d2f878bec3adebb27c5f1fa789103fd500e7297ae5034541287512602d6edf35035bff2c4d2b8f4c087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "b45dbcde74268f95b2279ab735140a14ebb2c2a375e8dd296be95136d24f60c2ddf687f61a09218f9bc17575b0014827415b02dad4b3958540cb1fb2b78fff40"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "6252465e24583b2ee5599a47ff008287a3321955cdfccfb0a8d9b174e02b644e463c2aedf77d9ae9678cf2c682fbec07796a13fea060c735ccc6b11390c3792e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "068ecd5325471dffe741bcd02adcb3308497eb3c1e2a1679675e27fc8ac58e233457589a56d4eae658540a0876b2e3c1f39407b404a322ea079d95195ae736b9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "4690b802d91833bd96f7beaabd302ffd9bd40795893cd196a0f09ea47e333e7d645f0462b12fa0ca8909cdee07f2efab5094a0925d3fc11e48138098468ab43e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "88b4c27346fd74cea35eb635b02840ea771f015fd9f2700751ca26978f502ebce23cecf425e70cf558e38ad4ccb6cc86558190aeb559194005474b6777399591"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "171fe438b11434ef3ed68507d6bd1465b0d8f9af9a77fefcd2fc7730f0bc8a46a319d9e3d94227b2051e18b990cd8167103e0cf50293bfc0fa57a3b539b4fe5b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "1f59cd9237149dc22c540461abc640367f02d65103cd60e1d7afb8f43b973cf03122130fb6c665b418896932cae1d4deb7241b45f7d4dcdfe8ea69f0bd4b8143"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "0cfc6ff07e0fa2b194ca8851d52e3f819f96626d21b827fac14319c849f0fdde21d269637cd5c833d6f0adadd49656b9dbf603d1c0f761aea912c4b8f89917dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "de1c49aff4dc4cc4fe2c57a658d1c7dd2ef7b7b7067247c1c261a89109548ba3d22ec7ae488b9c7d338fdef50317ed095ac4cb7390673c6e10e5eb28ffaa3d08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f4a470619058a8d509d4fb25f017f859628c0f502de4af7504ec189e70dd07460aedf7ad0dd36224c57eb6b6acad763d6781893369e1db7ed1e12050a0bbd6e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "13e5c2fd2f0aab0ebf186d4042e3aaba4b5a7d01a6de1515e9ae34c2d1d81825fd6db52ae7994f0c6f711830dd95e32fbe61e1e09a020cae08a85f575ae2d22d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3ee62d50bf8dbf1d013e61b19856efebe5a5624f4111286c81ccb4449a6d8124702106a49405570cfa810c0a32f0737e9cc105bd75229d466864e8471a5e5c44"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "39531760eb1cfe7ef58d7c2eb8eee3fa8c467e9880d3a1ddb0f957364949df0af06c0d03b91e50efe420f16c26df32ce5214979fa7088a79cd1de70691fa8a9c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e566041725660698d2c51941859301036801aef3596ff250ad9faa96d1333951ba388df09aaedf04204becfa9e177448fff5229845f6a8b5507784e4df0665c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "b11ca7ad3089bdcd2921a882395384cc2e35512488224e0d3b7b227c05436064a8fa6d174221adbcf405bf274a63e61d365a3a3b4b5a6d9f053714448cb267c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "7f6f5a34bd1f2a6c9b637768af109f7612847258f45dd59d713004dc2b7c9cb46387310b000416d96e6ce1266e709f30df9fc48bdc97312f082ffa9c5ed3fc28"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "db633339a4ab8c788b267aa2435a13607a5d1fda365c06f1d90f19e5604b60a809dae31e8d135204fb14d8af8a67334dcf62a88e29102c30a19c1ecb9ef415ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "841de10098e98a2148dd035983d7d1e2429e1b10789d5bdc8fad5d3276427eafc6ad9d9cf2db0038eab313484835a8ebd77098c7018f81fb0b9fb523c4841bdd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ae58d4a6a5d0b5ea1d5d080598fbcd6235c06657b4a3ee3b294bcd4f7360094a47a26bbdc6d5de8d2b782b3f243dda31bfb663bd3c7f81b0b980b9b75a089205"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "20d1a99edb738fde9791404ab0b55385386d33c74b1d2f944c1f8cd3b3175fc8a8ddf7351ab8f551a6d6299379e7551366a6cc02461c8ce3a28e59da4094e636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b3e77c5d5730c616170361d785ce138bba1ebff030b33d88eb3340eee53114e07e9129072e77e2cc10513b036bd05ccf7e1e1e46ab3a7c760b8eab7963a69152"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7e2a99511fb20a8f34a9fa18f66a45643cae32313818dde229239a48eed7ab8ddc71c501f8b14233e67daaf0f4dc914fb9ffbb0ef807a89209a5a46fe4ae62cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "8d3b86add09c64c76bbf0ce7530d43785704fd38c98859dc9c2c42364f58633de61de8dbe00dfae9f89f8c9960acc42eef317c1d87b8e7944daf54e18b295073"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "9aa2853624394395ac0f17ca3a0fbf90b8519e852e16b12ea8221a9ba146cb87d7e3b881e26db4be69aa9499e8f6c2f83be2ce7aca9a4c1ed8eaf562d98b80d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "7dd5dfa772b8869eef4b47ba01380b84989135690fae5417ff029ce2b1226c7335239e4832fae760a311c184d21a6cf3f92f30531620614c16829084b41cb48d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "d9a431bd40fdefe3c84e820c6d6df478dd26a8eefe7ec42537891fb8043ac0101363e256d953f85cf48f812aca09e8800aad4263f6999da1e079d75d09386031"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "f1c2a10e5ecb74570c5e985ba09763d362105242b53fc9e9cd51098f3bc8f4f9280c7290b9ba4335e455ce9e3dd175f67554fb25aa86544d37fc609b8b98adca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "0958cb1f5ef1260da0931cc4e16c81ab8995711acf846a2658c5f184968c13fd8d40af27613ce2b5c6e5ad462ee14f39f2a614294bea9cfb2dc875d0f0e8779c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "5ae4cf72ebc9af54a7b24ae0a37947cb4e8045f674538d26ee642d4fb7547e6ee2fe5525c4e04b8aa41a34ec26276832663088ba379f6abbcc9ccde533388f7b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "48c20ddc5d312f3720bdb8b40cde75830475fcc00ef579c100aa45d668416ae9dd048fe5711448eab59d50b019326aea7885110ef15112e7c4e58185dade84cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "4e2a66781f0d7e7349debaab08a6c532a82a603562a65437230c7301f2abc6674a6acbd4254c616e3bff8eab53978c780f870141cab42872a0361f853e3be6ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "d2cbb5bd4e7dea0596c3fe16ce2dc383e4c8408f5a4f0a9035094a8b714961d3d541b473c586ec8a3140984e8ac902d940e5e86be5215321090c14fb67688a33"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "81ec70d793ece3f33ca7dbf7667764a9ed9d0234b084dbd2ea1e92bcce281ed71133f342618c30be4195da49247ac09b44eb27c9a2996cf07d5f5a17455ea939"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "07e460bf0545e35399c937f06a6a848e4967eed45e86562a6a9a673baeaf1beade10ff7bad1d3892f9304e6018bc87260e212c067a81ca7bc25f2a8e9fbc5f2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "23a097dd2e8047f9623a35f4190c7acc70123f9f0347e2ca204bc7cd71da4b2c20a3c26192773eae70bc5fbaa7ec194b9137a8f30c28bae672c608c58bdb3f23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "1bfac64a39a787f02311a0486badc56f0a3058362b6c4947b92688cc654e21c6502703464f0e3a90ec7eac35fb2596e3ddff7b23b3970316320d38e013d5db88"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "dddf6b5248c71ec8fd152d5d9ee24809add324d529fddfca6166c48e300e92a9bcc96084b2b3b99968044174cefa757e8af8f5d13198a0ff0fac59c321b3f00c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "1ca56172371a3470cec3ec174b6cc14fd5721bc29e3f7683d8f5009c5ace2a5aeb005d28cc9096398e79c03dbeb6a3f14677b9792ce95fb36c8c69d0070a0b78"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2fa6ec9328ab40f46eae66e18ae167d9bccd4d5be43fe3ab5fce73059941178af8813bfe7fe26106ad569e6d1c03338e440ee32722f041e73ec63338828e4d23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b3aa500e2b55b502d60f322c63f08f5add6063b8b5f0f2d4cbecabd56b08ab8a20792f47c34daac6d9c56e9d74d10fc15ef3901f27442e5de2db0933932b3dfe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "c1deecac7551c39b3b47b0b97896ae8264519251e58f5f34272bf15f53f4d6b28a82bd8a55ff584d501aeed00b6c2d6c56a7d6594d2ea4129fa2f16951cec4d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4655634990c822e94bc9cea432a0c90de92dbdc3b6d033a546c8d30a23c078b5725e20151f61c60c92ade138aca083032c7182fb7030d53accf2586d03d435f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8c5a0d0e3a042750a72b40908a862e4e98d0350efe9f10ee7a1c0c27913ebdc94ebbf4cc216f12b7ba459b2b12c889df2715e2664a6eb3ad52107c3c791f26c3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7a9616abba37469aa5c8686a726723f32059a682ab35c0d3ca179ae8c817490c01947b69d329e224526a972e9116d4755303fc99f601b1a4d2581e75b77924b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "39b28857af6b2ca281eda2525731987a9eb3474f538fcdc402d3bc067ed28d43c445f88355ed84a30c5f99f1b9f7281435501fb4dc89ba217ff9a0b2d7121026"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "318dd8b07c62f2c98c35695d36b4273d4e3189d0003b5047be5f5c1bf49ae9b82a33ea3244f37e354b4c6b0db75c068042c22a6949b2dc90045ae2f87a8b45c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "690ff481c3c79ed3bb8b0ee3157a5f1708f53a985cefa245776a47ccb93ad769228fe76db665d8488884a93f397d219dd8474fd1a63744be54d7b9cfa58ef37e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "d55e6447238a8bcd1521eae2167064eb4951bc11dcd7a16227ec4690d4ca7d56a567a70d2737a084bbe3aa4e5276970586b4bf21d16c85e2435ed60824d32a38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f48485a6ce34e2915d91a4673af7bc050776bdbffb8e9dd3656691e9cd389c9534666969de7bef065c4825012594ee1e4e633b1fcf4f4947bdcf644c08962304"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b7b006f1ff11895bca5b33cb138385055b902730892dccd5620d1537c3dba6c4a5a8c6a11d4a61ed0baa75feadccf04aad29ca251f7bf19c17c7d8db13c401b7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "1f7c5dd068f4829569b398691ebb719c851ff165844eb4ca1d26026a4d40926ebc3c71c4ddcaa5e8d9b9b159ed5d08d24e2b50d3a93d111cad3d3d02d5a26f43"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ee698d3366f202ae4ff8ed2f1d8bbe1e592fa6200e9734469292d76595e3629d3818744ae05d1d37e7372c622f79b4e8c075011dd7b835a61aba86b272c6ac94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "7037a57a9e456bed79b7527b35bd680c32a94204c94b1b9d0247c0e521867ea0c606875e11a3bce6f5c2271a5e322f3481cc5451fc413cec5a5f6f199a676a2b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "62870d113beadebcfafba9c6d133cdc88769f20088b788a8577a99afa85562df901f14ce1f2c8bf6e344ac31b8a8dcb96172a5724add11936f78aba7d26d5444"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "5c9cca0455a4da647b8f2b178bbe73037b1d5c7ffe95dd12ee3042ab982da0cea21ff9afd4b954805966d25b035d0ad83fe138dc80a7d345a81a01df722a9dba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "0f7e16b46d0c931e147f1f6efa7ba4d12d629bb909f220bfccd9646e968e52e1d7641ab174880313781f1c149ef7b4f6311acb042b704fd18337a31531fc8863"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "864a500456f1728c2043e6841256a21613864501d7428248606495c8c34ceefe0db23b3dca6a3fca9f92a22af663109d41ffe46daf19d64aad379774848a448f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "94cbfc40c5c9cbf13592a7134cc4ec2ee2fea4b733738acb45ca454e029228cf741111c5478961494a9e7965f771fca06aef0e58eca076721e8bfb11ee237202"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a4d7ca792c89f37fc1457e36beba54e75a5901bbad1832272a03b0bcaa3536ed237559aca38775e16940c035b117efd1caa1929e96c889843d2732d5cbbe38a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3b740953b1a9456321e684cb0dd606967d46d9ebc120d43a10244b88586c1ac4fa7cd6c7ede0fdb52690fb102e8a8a456c1c226ac7eecaa50776b52062e5285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "6a45689d06f4d52c5352d69049e55346c8791720f1d38257a49ad8ddeb9d94c0b0adafdb10a3432b4e4a75dd83eff618d7731a3bbf8752c979c0efc09b67a363"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "f1691996ead43b59409f590a46bd97359183a05ca5f5bf49966d128b2de6b8bcc2fff2c3f73e3966a8f6182aff9c1dabb88e659ce128ca6ae4cf11aa877c8df1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "9fd0fe5312763143d83677b11efd0dab2e84fd93cf4a884261d33dfc23d76facd7be7d6e3701e3dc9134bfe7ac7cf8d3138f63dc490964d1b6dd696451ae18cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f15b3c3e4b57447023a6086b948b5f68bb5c6301c3e7f138d7e61b2cf34d87357b7e5894bcc6262552449a5d67c2548f52fa3942b01603c15cdc9803fa45660e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b28e30d95f608733099acfc6c39e0062bc3470d8ba386ea563d9b376f95e5a4bb9374d0fc360d0a387b9edd1ba252b437cf32c555c68667323648830efd96e45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "b351d0c9f5bce2da39dd4dc500377e7a07812c6ee2c3359a15b095be562b90b43da6bd7c61435c04791278b9e47eb2ed9dbcb589fc86abdf84a16dea86c88dca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3912d4ef5bd3e9cb5bd7e6f559c66e06568a1441394c41a9a47433c28a551f3c012717adb66f02441106e20cbf866a4a201af079f4f59b9c34ed1250fb64b22e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1438e36a719409637e246b2d2b18b7493b00446daaa18579d2c1c45866e0aa597a8934e9d3c15893d987dccf1c1df5d4a03d34f37cbb3b3f2d2fcd52392621ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "cd5f4baef991942ac555dcc8ed37857d4a9faa29befb8b8dcce82f000a87b0bf62f0ce208df7f7238b8d7e684294f33d63194bedb21e988085bc64241fcf633f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 650f4a3006a2..e0689206382c 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -70,6 +70,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk2" + "--with-google-api-keyfile=ga" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] @@ -85,6 +86,11 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir + + # Google API key used by Chromium and Firefox. + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga ''; preInstall = @@ -141,14 +147,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "49.0.2"; - sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e"; + version = "50.0"; + sha512 = "cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.4.0esr"; - sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715"; + version = "45.5.0esr"; + sha512 = "fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d"; }; } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0c6d36b3818d..0edd982f0f75 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -36,7 +36,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "40.0.2308.90"; + version = "41.0.2353.56"; rpath = stdenv.lib.makeLibraryPath [ @@ -89,12 +89,12 @@ in stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k"; + sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g"; + sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0d9c1a113f8d..5e5f8848ebe0 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -7,11 +7,11 @@ let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; - version = "1.4.20"; + version = "1.5.188"; src = fetchurl { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1ca1fzyc5qnan6gavcd8bnfqriqqvgdsf4m8ka4nayf50k64xxj9"; + sha256 = "1y3yaqfgjj96qzvbm5200x68j5hy1qs7l2mqm3kbbj2b58z9f1qv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index df08fadfbdf9..2eb91b06ac3f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,16 +10,16 @@ }: let - version = "1.4"; - build = "589.38-1"; + version = "1.5"; + build = "658.44-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "08qdpl5dkb2snpqlk3rsqlyl9rfas9v6bbcw2p4kzazhinak5hv3"; + sha256 = "02zb9pw8h7gm0hlhk95bn8fz14x68ax2jz8g7bgzppyryq8xlg6l"; } else { arch = "i386"; - sha256 = "0wpaglc1aaam5bqxgvf5zwcbr0xll8yj63l19q792l51j1vkv56q"; + sha256 = "1cwpmdsv4rrr13d1x017rms7cjp5zh3vpz3b44ar49ip6zj6j0a8"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e4486943e628..f07668756adf 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch +{ stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl ? null , graphicsSupport ? true, imlib2 ? null @@ -15,12 +15,13 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "w3m-0.5.3-2015-12-20"; + name = "w3m-v0.5.3+git20161120"; - src = fetchgit { - url = "git://anonscm.debian.org/collab-maint/w3m.git"; - rev = "e0b6e022810271bd0efcd655006389ee3879e94d"; - sha256 = "1vahm3719hb0m20nc8k88165z35f8b15qasa0whhk78r12bls1q6"; + src = fetchFromGitHub { + owner = "tats"; + repo = "w3m"; + rev = "v0.5.3+git20161120"; + sha256 = "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc"; }; NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index ac7d94d5c9a8..8857e6ba4e35 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -2,6 +2,7 @@ , automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent +, ethtool, coreutils , bash }: @@ -10,7 +11,7 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.28.2"; + version = "1.0.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0wh4h11w5qvqa66fiz0qbm9q48d3jz48mw6mm22bcy9q9wmzrxcn"; + sha256 = "1hdh2wh11ck98ycfrxfzgivgk2pjl3638vkyw14xj7faj9qxjlz0"; }; patches = [ @@ -29,7 +30,8 @@ in stdenv.mkDerivation rec { ./rb51324.patch ./rb51325.patch - ./maven_repo.patch + # see https://github.com/cstrahan/mesos/tree/nixos-${version} + ./nixos.patch ]; buildInputs = [ @@ -45,59 +47,59 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} + substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ + --subst-var-by sh ${bash}/bin/bash - substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/stout/include/stout/os/posix/shell.hpp \ + --subst-var-by sh ${bash}/bin/bash - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/Makefile.am \ + --subst-var-by mavenRepo ${mavenRepo} - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/shell.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/cli/mesos-scp \ - --replace "'scp " "'${openssh}/bin/scp " - - substituteInPlace src/launcher/executor.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/cli/mesos-scp \ + --subst-var-by scp ${openssh}/bin/scp substituteInPlace src/launcher/fetcher.cpp \ - --replace '"gzip' '"${gzip}/bin/gzip' \ - --replace '"tar' '"${gnutar}/bin/tar' \ - --replace '"unzip' '"${unzip}/bin/unzip' + --subst-var-by gzip ${gzip}/bin/gzip \ + --subst-var-by tar ${gnutar}/bin/tar \ + --subst-var-by unzip ${unzip}/bin/unzip substituteInPlace src/python/cli/src/mesos/cli.py \ - --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + --subst-var-by mesos-resolve $out/bin/mesos-resolve - substituteInPlace src/slave/containerizer/mesos/launch.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \ + --subst-var-by du ${coreutils}/bin/du \ + --subst-var-by cp ${coreutils}/bin/cp - '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \ + --subst-var-by cp ${coreutils}/bin/cp - substituteInPlace configure.ac \ - --replace /usr/include/libnl3 ${libnl.dev}/include/libnl3 + substituteInPlace src/uri/fetchers/copy.cpp \ + --subst-var-by cp ${coreutils}/bin/cp - substituteInPlace src/linux/perf.cpp \ - --replace '"perf ' '"${perf}/bin/perf ' + substituteInPlace src/uri/fetchers/curl.cpp \ + --subst-var-by curl ${curl}/bin/curl + + substituteInPlace src/uri/fetchers/docker.cpp \ + --subst-var-by curl ${curl}/bin/curl + + '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/linux/systemd.cpp \ - --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' + substituteInPlace src/linux/perf.cpp \ + --subst-var-by perf ${perf}/bin/perf substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ + --subst-var-by mount ${utillinux}/bin/mount substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ + --subst-var-by mount ${utillinux}/bin/mount substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ - --replace '"tc ' '"${iproute}/bin/tc ' \ - --replace '"ip ' '"${iproute}/bin/ip ' \ - --replace '"mount ' '"${utillinux}/bin/mount ' \ - --replace '/bin/sh' "${stdenv.shell}" + --subst-var-by tc ${iproute}/bin/tc \ + --subst-var-by ip ${iproute}/bin/ip \ + --subst-var-by mount ${utillinux}/bin/mount \ + --subst-var-by sh ${stdenv.shell} \ + --subst-var-by ethtool ${ethtool}/sbin/ethtool ''; configureFlags = [ @@ -113,8 +115,11 @@ in stdenv.mkDerivation rec { "--with-ssl=${openssl.dev}" "--enable-libevent" "--with-libevent=${libevent.dev}" + "--with-protobuf=${pythonProtobuf.protobuf}" + "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" + "--with-nl=${libnl.dev}" ]; postInstall = '' @@ -180,8 +185,5 @@ in stdenv.mkDerivation rec { description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ]; platforms = platforms.linux; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; }; } diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index bcdae83839fc..f4a4588dbe41 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -9,1292 +9,1349 @@ function fetchArtifact { curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" } -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar -fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar -fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar -fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom -fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 -fetchArtifact asm/asm/3.2/asm-3.2.pom -fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar -fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom -fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom -fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom -fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom -fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom -fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar -fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom -fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom -fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom -fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom -fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom -fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 -fetchArtifact com/google/google/1/google-1.pom -fetchArtifact com/google/google/1/google-1.pom.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom -fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom -fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom -fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom -fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom -fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom -fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom -fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom -fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom -fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom -fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom -fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom -fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom -fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom -fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom -fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom -fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom -fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom -fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom -fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom -fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom -fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom -fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom -fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom -fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom -fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom -fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom -fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom -fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom -fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom -fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom -fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom -fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom -fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom -fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom -fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar -fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom -fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom -fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 -fetchArtifact junit/junit/4.10/junit-4.10.pom -fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom -fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom -fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom -fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 -fetchArtifact org/apache/apache/10/apache-10.pom -fetchArtifact org/apache/apache/10/apache-10.pom.sha1 fetchArtifact org/apache/apache/11/apache-11.pom fetchArtifact org/apache/apache/11/apache-11.pom.sha1 +fetchArtifact org/apache/apache/10/apache-10.pom +fetchArtifact org/apache/apache/10/apache-10.pom.sha1 +fetchArtifact org/apache/apache/7/apache-7.pom +fetchArtifact org/apache/apache/7/apache-7.pom.sha1 +fetchArtifact org/apache/apache/9/apache-9.pom +fetchArtifact org/apache/apache/9/apache-9.pom.sha1 fetchArtifact org/apache/apache/13/apache-13.pom fetchArtifact org/apache/apache/13/apache-13.pom.sha1 -fetchArtifact org/apache/apache/2/apache-2.pom -fetchArtifact org/apache/apache/2/apache-2.pom.sha1 fetchArtifact org/apache/apache/3/apache-3.pom fetchArtifact org/apache/apache/3/apache-3.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom +fetchArtifact org/apache/apache/6/apache-6.pom.sha1 fetchArtifact org/apache/apache/4/apache-4.pom fetchArtifact org/apache/apache/4/apache-4.pom.sha1 +fetchArtifact org/apache/apache/2/apache-2.pom +fetchArtifact org/apache/apache/2/apache-2.pom.sha1 fetchArtifact org/apache/apache/5/apache-5.pom fetchArtifact org/apache/apache/5/apache-5.pom.sha1 -fetchArtifact org/apache/apache/6/apache-6.pom -fetchArtifact org/apache/apache/6/apache-6.pom.sha1 -fetchArtifact org/apache/apache/7/apache-7.pom -fetchArtifact org/apache/apache/7/apache-7.pom.sha1 -fetchArtifact org/apache/apache/9/apache-9.pom -fetchArtifact org/apache/apache/9/apache-9.pom.sha1 -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar -fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom -fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom -fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom -fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom -fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom -fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom -fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom -fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom -fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom -fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom -fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom -fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom -fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom -fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom -fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom -fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom -fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom -fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom -fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom -fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom -fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom -fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom -fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom -fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom -fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom -fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom -fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom -fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom -fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom -fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom -fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom -fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom -fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom -fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom -fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom -fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom -fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom -fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom -fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom -fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom -fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom -fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom -fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom -fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom -fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom -fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom -fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom -fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1 fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom -fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom -fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom -fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom -fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar.sha1 fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom -fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom -fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar.sha1 fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom -fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1 fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom -fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom -fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar -fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom -fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom -fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom -fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom -fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom -fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom -fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom -fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom -fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom -fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom -fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom -fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom -fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom -fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom -fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar -fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom -fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar -fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar.sha1 fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar -fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom -fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom -fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom -fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar -fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar -fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom -fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom -fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar -fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom -fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom -fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom -fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1 -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar -fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1 -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar -fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar.sha1 +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom -fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar -fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar -fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom -fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom -fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom -fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom -fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom -fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom -fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom -fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom -fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar -fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1 +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom -fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom -fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar -fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom -fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom -fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom -fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom -fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom -fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar -fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom -fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar -fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom -fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom -fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom -fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom -fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom -fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom -fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom -fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom -fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom -fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom -fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom -fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom -fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom -fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom -fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom -fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom -fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom -fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom -fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom -fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom -fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom -fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar -fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom -fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar -fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar.sha1 fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom -fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom -fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom -fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom -fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom -fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom -fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar -fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar -fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar +fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1 +fetchArtifact com/google/google/1/google-1.pom +fetchArtifact com/google/google/1/google-1.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 +fetchArtifact junit/junit/4.10/junit-4.10.pom +fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom -fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar -fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 fetchArtifact velocity/velocity/1.5/velocity-1.5.pom fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar -fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar -fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 +fetchArtifact asm/asm/3.2/asm-3.2.pom +fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 stopNest diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index b6fcbaafbb10..1edb4a755d89 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12c6z5yvp60v57f6nijifp14i56bb5614hac1qg528s9liaf8vml"; + outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11"; buildInputs = [ curl ]; diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch new file mode 100644 index 000000000000..032357e452db --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/nixos.patch @@ -0,0 +1,463 @@ +diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp +index a29967d..290b98b 100644 +--- a/3rdparty/stout/include/stout/os/posix/fork.hpp ++++ b/3rdparty/stout/include/stout/os/posix/fork.hpp +@@ -369,7 +369,7 @@ private: + if (exec.isSome()) { + // Execute the command (via '/bin/sh -c command'). + const char* command = exec.get().command.c_str(); +- execlp("sh", "sh", "-c", command, (char*) nullptr); ++ execlp("@sh@", "sh", "-c", command, (char*) nullptr); + EXIT(EXIT_FAILURE) + << "Failed to execute '" << command << "': " << os::strerror(errno); + } else if (wait.isSome()) { +diff --git a/3rdparty/stout/include/stout/os/posix/shell.hpp b/3rdparty/stout/include/stout/os/posix/shell.hpp +index 1d73ae5..9bf89b5 100644 +--- a/3rdparty/stout/include/stout/os/posix/shell.hpp ++++ b/3rdparty/stout/include/stout/os/posix/shell.hpp +@@ -37,7 +37,7 @@ namespace Shell { + // received by the callee, usually the command name and `arg1` is the + // second command argument received by the callee. + +-constexpr const char* name = "sh"; ++constexpr const char* name = "@sh@"; + constexpr const char* arg0 = "sh"; + constexpr const char* arg1 = "-c"; + +diff --git a/src/Makefile.am b/src/Makefile.am +index 28dd151..36fc6ec 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1528,7 +1528,8 @@ if HAS_JAVA + + $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom + @echo "Building mesos-$(PACKAGE_VERSION).jar ..." +- @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package ++ @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package ++ + + # Convenience library for JNI bindings. + # TODO(Charles Reiss): We really should be building the Java library +diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp +index a71ab07..feed8c4 100755 +--- a/src/cli/mesos-scp ++++ b/src/cli/mesos-scp +@@ -19,7 +19,7 @@ if sys.version_info < (2,6,0): + + + def scp(host, src, dst): +- cmd = 'scp -pr %s %s' % (src, host + ':' + dst) ++ cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst) + try: + process = subprocess.Popen( + cmd, +diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp +index 4456c28..e22c8fc 100644 +--- a/src/launcher/fetcher.cpp ++++ b/src/launcher/fetcher.cpp +@@ -68,13 +68,13 @@ static Try<bool> extract( + strings::endsWith(sourcePath, ".tar.bz2") || + strings::endsWith(sourcePath, ".txz") || + strings::endsWith(sourcePath, ".tar.xz")) { +- command = "tar -C '" + destinationDirectory + "' -xf"; ++ command = "@tar@ -C '" + destinationDirectory + "' -xf"; + } else if (strings::endsWith(sourcePath, ".gz")) { + string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3); + string filename = Path(pathWithoutExtension).basename(); +- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <"; ++ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <"; + } else if (strings::endsWith(sourcePath, ".zip")) { +- command = "unzip -o -d '" + destinationDirectory + "'"; ++ command = "@unzip@ -o -d '" + destinationDirectory + "'"; + } else { + return false; + } +@@ -162,7 +162,7 @@ static Try<string> copyFile( + const string& sourcePath, + const string& destinationPath) + { +- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'"; ++ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'"; + + LOG(INFO) << "Copying resource with command:" << command; + +diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp +index ea823b3..170f54d 100644 +--- a/src/linux/perf.cpp ++++ b/src/linux/perf.cpp +@@ -125,7 +125,7 @@ private: + // NOTE: The watchdog process places perf in its own process group + // and will kill the perf process when the parent dies. + Try<Subprocess> _perf = subprocess( +- "perf", ++ "@perf@", + argv, + Subprocess::PIPE(), + Subprocess::PIPE(), +@@ -319,7 +319,7 @@ bool valid(const set<string>& events) + ostringstream command; + + // Log everything to stderr which is then redirected to /dev/null. +- command << "perf stat --log-fd 2"; ++ command << "@perf@ stat --log-fd 2"; + foreach (const string& event, events) { + command << " --event " << event; + } +diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp +index 619aa27..c1cbfe4 100644 +--- a/src/linux/systemd.cpp ++++ b/src/linux/systemd.cpp +@@ -196,12 +196,19 @@ bool exists() + // This is static as the init system should not change while we are running. + static const bool exists = []() -> bool { + // (1) Test whether `/sbin/init` links to systemd. +- const Result<string> realpath = os::realpath("/sbin/init"); +- if (realpath.isError() || realpath.isNone()) { +- LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " +- << realpath.error(); +- +- return false; ++ // cstrahan: first assume we're on NixOS, then try non-NixOS ++ Result<string> realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd"); ++ Result<string> realpathNixOS = realpath; ++ if (realpathNixOS.isError() || realpathNixOS.isNone()) { ++ Result<string> realpathNonNixOS = realpath = os::realpath("/sbin/init"); ++ if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) { ++ LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: " ++ << realpathNixOS.error(); ++ LOG(WARNING) << "Failed to test /sbin/init for systemd environment: " ++ << realpathNonNixOS.error(); ++ ++ return false; ++ } + } + + CHECK_SOME(realpath); +diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py +index f342992..354abf4 100644 +--- a/src/python/cli/src/mesos/cli.py ++++ b/src/python/cli/src/mesos/cli.py +@@ -40,7 +40,7 @@ def resolve(master): + import subprocess + + process = subprocess.Popen( +- ['mesos-resolve', master], ++ ['@mesos-resolve@', master], + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +index 51d1518..783adb5 100644 +--- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp ++++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp +@@ -204,7 +204,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare( + } + + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n --bind " + hostPath + " " + volume.container_path()); ++ "@mount@ -n --bind " + hostPath + " " + volume.container_path()); + } + + return launchInfo; +diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +index b41e266..e07c163 100644 +--- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp ++++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp +@@ -163,7 +163,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare( + // containers cannot see the namespace bind mount of other + // containers. + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + ++ "@mount@ -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) + + " " + string(PID_NS_BIND_MOUNT_ROOT)); + + // Mount /proc for the container's pid namespace to show the +@@ -176,9 +176,9 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare( + // -n flag so the mount is not added to the mtab where it will not + // be correctly removed with the namespace terminates. + launchInfo.add_pre_exec_commands()->set_value( +- "mount none /proc --make-private -o rec"); ++ "@mount@ none /proc --make-private -o rec"); + launchInfo.add_pre_exec_commands()->set_value( +- "mount -n -t proc proc /proc -o nosuid,noexec,nodev"); ++ "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev"); + + return launchInfo; + } +diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +index 79ee960..d55a353 100644 +--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp ++++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp +@@ -1392,19 +1392,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) + // Check the availability of a few Linux commands that we will use. + // We use the blocking os::shell here because 'create' will only be + // invoked during initialization. +- Try<string> checkCommandTc = os::shell("tc filter show"); ++ Try<string> checkCommandTc = os::shell("@tc@ filter show"); + if (checkCommandTc.isError()) { + return Error("Check command 'tc' failed: " + checkCommandTc.error()); + } + + // NOTE: loopback device always exists. +- Try<string> checkCommandEthtool = os::shell("ethtool -k lo"); ++ Try<string> checkCommandEthtool = os::shell("@ethtool@ -k lo"); + if (checkCommandEthtool.isError()) { + return Error("Check command 'ethtool' failed: " + + checkCommandEthtool.error()); + } + +- Try<string> checkCommandIp = os::shell("ip link show"); ++ Try<string> checkCommandIp = os::shell("@ip@ link show"); + if (checkCommandIp.isError()) { + return Error("Check command 'ip' failed: " + checkCommandIp.error()); + } +@@ -1924,9 +1924,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) + // visible. It's OK to use the blocking os::shell here because + // 'create' will only be invoked during initialization. + Try<string> mount = os::shell( +- "mount --bind %s %s && " +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --bind %s %s && " ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str(), + bindMountRoot->c_str(), +@@ -1943,8 +1943,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) + // shared mount yet (possibly due to slave crash while preparing + // the work directory mount). It's safe to re-do the following. + Try<string> mount = os::shell( +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str()); + +@@ -1963,8 +1963,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) + // so that they are in different peer groups. + if (entry.shared() == bindMountEntry->shared()) { + Try<string> mount = os::shell( +- "mount --make-slave %s && " +- "mount --make-shared %s", ++ "@mount@ --make-slave %s && " ++ "@mount@ --make-shared %s", + bindMountRoot->c_str(), + bindMountRoot->c_str()); + +@@ -3916,13 +3916,13 @@ string PortMappingIsolatorProcess::scripts(Info* info) + { + ostringstream script; + +- script << "#!/bin/sh\n"; ++ script << "#!@sh@\n"; + script << "set -xe\n"; + + // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave + // mount so that changes in the container will not be propagated to + // the host. +- script << "mount --make-rslave " << bindMountRoot << "\n"; ++ script << "@mount@ --make-rslave " << bindMountRoot << "\n"; + + // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be + // forwarded anyway. +@@ -3930,7 +3930,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n"; + + // Configure lo and eth0. +- script << "ip link set " << lo << " address " << hostMAC ++ script << "@ip@ link set " << lo << " address " << hostMAC + << " mtu " << hostEth0MTU << " up\n"; + + // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel +@@ -3939,12 +3939,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // when we receive a packet with a bad checksum. Disabling rx + // checksum offloading ensures the TCP layer will checksum and drop + // it. +- script << "ethtool -K " << eth0 << " rx off\n"; +- script << "ip link set " << eth0 << " address " << hostMAC << " up\n"; +- script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n"; ++ script << "@ethtool@ -K " << eth0 << " rx off\n"; ++ script << "@ip@ link set " << eth0 << " address " << hostMAC << " up\n"; ++ script << "@ip@ addr add " << hostIPNetwork << " dev " << eth0 << "\n"; + + // Set up the default gateway to match that of eth0. +- script << "ip route add default via " << hostDefaultGateway << "\n"; ++ script << "@ip@ route add default via " << hostDefaultGateway << "\n"; + + // Restrict the ephemeral ports that can be used by the container. + script << "echo " << info->ephemeralPorts.lower() << " " +@@ -3973,19 +3973,19 @@ string PortMappingIsolatorProcess::scripts(Info* info) + } + + // Set up filters on lo and eth0. +- script << "tc qdisc add dev " << lo << " ingress\n"; +- script << "tc qdisc add dev " << eth0 << " ingress\n"; ++ script << "@tc@ qdisc add dev " << lo << " ingress\n"; ++ script << "@tc@ qdisc add dev " << eth0 << " ingress\n"; + + // Allow talking between containers and from container to host. + // TODO(chzhcn): Consider merging the following two filters. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" + << " match ip dst " << hostIPNetwork.address() + << " action mirred egress redirect dev " << eth0 << "\n"; + +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -3996,7 +3996,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + foreach (const PortRange& range, + getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) { + // Local traffic inside a container will not be redirected to eth0. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32" + << " flowid ffff:0" +@@ -4005,7 +4005,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) + + // Traffic going to host loopback IP and ports assigned to this + // container will be redirected to lo. +- script << "tc filter add dev " << eth0 << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << eth0 << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -4017,14 +4017,14 @@ string PortMappingIsolatorProcess::scripts(Info* info) + } + + // Do not forward the ICMP packet if the destination IP is self. +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" + << " match ip protocol 1 0xff" + << " match ip dst " << hostIPNetwork.address() << "\n"; + +- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE ++ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE + << " protocol ip" + << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32" + << " flowid ffff:0" +@@ -4033,9 +4033,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) + << net::IPNetwork::LOOPBACK_V4().address() << "\n"; + + // Display the filters created on eth0 and lo. +- script << "tc filter show dev " << eth0 ++ script << "@tc@ filter show dev " << eth0 + << " parent " << ingress::HANDLE << "\n"; +- script << "tc filter show dev " << lo ++ script << "@tc@ filter show dev " << lo + << " parent " << ingress::HANDLE << "\n"; + + // If throughput limit for container egress traffic exists, use HTB +@@ -4047,9 +4047,9 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // throughput. TBF requires other parameters such as 'burst' that + // HTB already has default values for. + if (egressRateLimitPerContainer.isSome()) { +- script << "tc qdisc add dev " << eth0 << " root handle " ++ script << "@tc@ qdisc add dev " << eth0 << " root handle " + << CONTAINER_TX_HTB_HANDLE << " htb default 1\n"; +- script << "tc class add dev " << eth0 << " parent " ++ script << "@tc@ class add dev " << eth0 << " parent " + << CONTAINER_TX_HTB_HANDLE << " classid " + << CONTAINER_TX_HTB_CLASS_ID << " htb rate " + << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n"; +@@ -4060,12 +4060,12 @@ string PortMappingIsolatorProcess::scripts(Info* info) + // fq_codel, which has a larger buffer and better control on + // buffer bloat. + // TODO(cwang): Verity that fq_codel qdisc is available. +- script << "tc qdisc add dev " << eth0 ++ script << "@tC@ qdisc add dev " << eth0 + << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n"; + + // Display the htb qdisc and class created on eth0. +- script << "tc qdisc show dev " << eth0 << "\n"; +- script << "tc class show dev " << eth0 << "\n"; ++ script << "@tc@ qdisc show dev " << eth0 << "\n"; ++ script << "@tc@ class show dev " << eth0 << "\n"; + } + + return script.str(); +diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp +index 3dfe7ad..4288666 100644 +--- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp ++++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp +@@ -492,7 +492,7 @@ private: + // NOTE: The monitor watchdog will watch the parent process and kill + // the 'du' process in case that the parent die. + Try<Subprocess> s = subprocess( +- "du", ++ "@du@", + command, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +index b9f6d7a..0fcf455 100644 +--- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp ++++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +@@ -141,7 +141,7 @@ Future<Nothing> CopyBackendProcess::_provision( + #endif // __APPLE__ || __FreeBSD__ + + Try<Subprocess> s = subprocess( +- "cp", ++ "@cp@", + args, + Subprocess::PATH("/dev/null"), + Subprocess::PATH("/dev/null"), +diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp +index f095ad6..ee0c2a7 100644 +--- a/src/uri/fetchers/copy.cpp ++++ b/src/uri/fetchers/copy.cpp +@@ -88,7 +88,7 @@ Future<Nothing> CopyFetcherPlugin::fetch( + const vector<string> argv = {"cp", "-a", uri.path(), directory}; + + Try<Subprocess> s = subprocess( +- "cp", ++ "@cp@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp +index cc3f9ee..691d2d9 100644 +--- a/src/uri/fetchers/curl.cpp ++++ b/src/uri/fetchers/curl.cpp +@@ -98,7 +98,7 @@ Future<Nothing> CurlFetcherPlugin::fetch( + }; + + Try<Subprocess> s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp +index 211be6f..d7e3771 100644 +--- a/src/uri/fetchers/docker.cpp ++++ b/src/uri/fetchers/docker.cpp +@@ -113,7 +113,7 @@ static Future<http::Response> curl( + + // TODO(jieyu): Kill the process if discard is called. + Try<Subprocess> s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), +@@ -212,7 +212,7 @@ static Future<int> download( + + // TODO(jieyu): Kill the process if discard is called. + Try<Subprocess> s = subprocess( +- "curl", ++ "@curl@", + argv, + Subprocess::PATH("/dev/null"), + Subprocess::PIPE(), diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch index abcd6d065dbc..68ef866161fe 100644 --- a/pkgs/applications/networking/cluster/mesos/rb51324.patch +++ b/pkgs/applications/networking/cluster/mesos/rb51324.patch @@ -1,17 +1,16 @@ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44cf882d27 100644 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp -@@ -18,6 +18,8 @@ +diff --git a/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/stout/include/stout/os/ls.hpp +index f8da9ef..6d549d3 100644 +--- a/3rdparty/stout/include/stout/os/ls.hpp ++++ b/3rdparty/stout/include/stout/os/ls.hpp +@@ -18,6 +18,7 @@ #else #include <dirent.h> #endif // __WINDOWS__ + -+#include <errno.h> #include <stdlib.h> #include <list> -@@ -26,8 +28,6 @@ +@@ -26,8 +27,6 @@ #include <stout/error.hpp> #include <stout/try.hpp> @@ -20,17 +19,17 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44 namespace os { -@@ -36,36 +36,32 @@ inline Try<std::list<std::string>> ls(const std::string& directory) +@@ -36,36 +35,32 @@ inline Try<std::list<std::string>> ls(const std::string& directory) DIR* dir = opendir(directory.c_str()); - if (dir == NULL) { + if (dir == nullptr) { - // Preserve `opendir` error. return ErrnoError("Failed to opendir '" + directory + "'"); } - dirent* temp = (dirent*) malloc(os::dirent_size(dir)); - -- if (temp == NULL) { +- if (temp == nullptr) { - // Preserve `malloc` error. - ErrnoError error("Failed to allocate directory entries"); - closedir(dir); @@ -41,7 +40,7 @@ index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44 struct dirent* entry; - int error; -- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != NULL) { +- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != nullptr) { + // Zero `errno` before starting to call `readdir`. This is necessary + // to allow us to determine when `readdir` returns an error. + errno = 0; diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch index 9c6eb7bebbea..5c5ce00730bb 100644 --- a/pkgs/applications/networking/cluster/mesos/rb51325.patch +++ b/pkgs/applications/networking/cluster/mesos/rb51325.patch @@ -1,34 +1,35 @@ -diff -Naur a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am ---- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:20:04.834457344 +0200 -+++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:21:00.190983981 +0200 -@@ -62,7 +62,6 @@ - stout/os/chroot.hpp \ - stout/os/close.hpp \ - stout/os/constants.hpp \ -- stout/os/direntsize.hpp \ - stout/os/environment.hpp \ - stout/os/exists.hpp \ - stout/os/fcntl.hpp \ -@@ -101,7 +100,6 @@ - stout/os/posix/bootid.hpp \ - stout/os/posix/chown.hpp \ - stout/os/posix/chroot.hpp \ -- stout/os/posix/direntsize.hpp \ - stout/os/posix/exists.hpp \ - stout/os/posix/fcntl.hpp \ - stout/os/posix/fork.hpp \ -@@ -118,7 +116,6 @@ - stout/os/raw/environment.hpp \ - stout/os/windows/bootid.hpp \ - stout/os/windows/chroot.hpp \ -- stout/os/windows/direntsize.hpp \ - stout/os/windows/exists.hpp \ - stout/os/windows/fcntl.hpp \ - stout/os/windows/fork.hpp \ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp +diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am +index 1f2ee85..b0b08d8 100644 +--- a/3rdparty/stout/include/Makefile.am ++++ b/3rdparty/stout/include/Makefile.am +@@ -64,7 +64,6 @@ nobase_include_HEADERS = \ + stout/os/chroot.hpp \ + stout/os/close.hpp \ + stout/os/constants.hpp \ +- stout/os/direntsize.hpp \ + stout/os/environment.hpp \ + stout/os/exists.hpp \ + stout/os/fcntl.hpp \ +@@ -108,7 +107,6 @@ nobase_include_HEADERS = \ + stout/os/posix/chown.hpp \ + stout/os/posix/chroot.hpp \ + stout/os/posix/close.hpp \ +- stout/os/posix/direntsize.hpp \ + stout/os/posix/exists.hpp \ + stout/os/posix/fcntl.hpp \ + stout/os/posix/fork.hpp \ +@@ -134,7 +132,6 @@ nobase_include_HEADERS = \ + stout/os/windows/bootid.hpp \ + stout/os/windows/chroot.hpp \ + stout/os/windows/close.hpp \ +- stout/os/windows/direntsize.hpp \ + stout/os/windows/exists.hpp \ + stout/os/windows/fcntl.hpp \ + stout/os/windows/fork.hpp \ +diff --git a/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/stout/include/stout/os/direntsize.hpp deleted file mode 100644 -index 819f99a89862491e99873bdedc603317b91266b0..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp +index 819f99a..0000000 +--- a/3rdparty/stout/include/stout/os/direntsize.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); @@ -57,10 +58,10 @@ index 819f99a89862491e99873bdedc603317b91266b0..00000000000000000000000000000000 - - -#endif // __STOUT_OS_DIRENTSIZE_HPP__ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp +diff --git a/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/stout/include/stout/os/posix/direntsize.hpp deleted file mode 100644 -index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp +index 9d8f72e..0000000 +--- a/3rdparty/stout/include/stout/os/posix/direntsize.hpp +++ /dev/null @@ -1,42 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); @@ -105,10 +106,10 @@ index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..00000000000000000000000000000000 -} // namespace os { - -#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__ -diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp +diff --git a/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/stout/include/stout/os/windows/direntsize.hpp deleted file mode 100644 -index 7c8c7a06f478b3a80341a874494cff21f71fc397..0000000000000000000000000000000000000000 ---- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp +index 7c8c7a0..0000000 +--- a/3rdparty/stout/include/stout/os/windows/direntsize.hpp +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6d5c04e601ef..1c481adcf1ea 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.9"; + version = "0.7.11"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0fqd6k88zhhq0ncnpr3y3k55wrxpd75fizs54cjgjd873b90sm8h"; + sha256 = "0rmzhf2rwxci57ll5nv2vvmic9cn64dbbg1fb5g78njljzpsc5qw"; }; postInstall = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d10e787b6ff5..3c1ae4b2bbde 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "13.4.21"; + version = "14.4.19"; sha256 = { - "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4"; - "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5"; + "x86_64-linux" = "06ln88dx6k1d2b2wwj66gj1gyy0s3xvs7m50v8i2ycdw3d9kimkw"; + "i686-linux" = "0mil1h86r8fmzxb6d7ycwz9yqkmj66k37zxxb2x8mw15l9qndrwf"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 12a85f5e1db7..d49eaad4d33d 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.22.1"; in +let version = "3.22.2.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0pr8wj2dk5s5xxrsl0pb8y1bna0k1s3c18dh056c6qp02gba1a1f"; + sha256 = "1h02k13x88f04gkf433cxx1xvbr7kkl2aygb4i6581gzhzjifwdv"; }; configureFlags = [ "--disable-manualupdatecheck" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite pugixml libfilezilla nettle ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 10cf9874ff1e..946d0dedba0c 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl -, geoip, gperftools }: +, geoip, gperftools, python }: stdenv.mkDerivation rec { - name = "bro-2.4.1"; + name = "bro-2.5"; src = fetchurl { - url = "http://www.bro.org/downloads/release/${name}.tar.gz"; - sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq"; + url = "http://www.bro.org/downloads/${name}.tar.gz"; + sha256 = "10603lwhwsmh08m5rgknbspbhd4lis71qv7z8ixacgv6sf8a40hm"; }; - buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ]; + buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools python ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 8d7b16337f28..ef84f6402b52 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; }; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "postFixup" ]; deps = with xorg; [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus @@ -53,6 +53,10 @@ in stdenv.mkDerivation rec { ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps ''; + postFixup = '' + paxmark m $out/share/franz/Franz + ''; + meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = http://meetfranz.com; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix new file mode 100644 index 000000000000..bbeb6c4aa4a3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchFromGitHub, ocamlPackages, opam}: + +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; + +stdenv.mkDerivation rec { + version = "2016-11-18"; + name = "jackline-${version}"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "jackline"; + rev = "cab34acab004023911997ec9aee8b00a976af7e4"; + sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7"; + }; + + buildInputs = with ocamlPackages; [ + ocaml ocamlbuild findlib topkg ppx_sexp_conv + erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring + ptime notty sexplib_p4 hex uutf opam + ]; + + buildPhase = with ocamlPackages; + "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true"; + + installPhase = "opam-installer --prefix=$out --script | sh"; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/jackline; + description = "Terminal-based XMPP client in OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a53513061ae..d4dba663e6da 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/pidgin-latex/; + homepage = "http://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 533c0ba48ba7..f68b8306fc84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; rev = "${version}"; - sha256 = "0qmqf1r9kc7r6rgzz0byyq7yf5spsl2iima0cvxafs43gn4hnc2z"; + sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; }; sourceRoot = "skype4pidgin-${version}-src/skypeweb"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 1a036c3083b2..4b68d603f211 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ + cp bin/*.so $out/lib/pidgin/ #*/ cp tg-server.tglpub $out/lib/pidgin/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48 ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/majn/telegram-purple; description = "Telegram for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; - maintainers = stdenv.lib.maintainers.jagajaga; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e1cfb2fceddb..e0b86dfc6331 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,7 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.4.4"; + version = "0.4.5"; myIcon = fetchurl { url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; sha256 = if bits == "x64" then - "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else - "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2"; + "0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else + "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki"; }; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "postFixup" ]; deps = with xorg; [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus @@ -53,6 +53,10 @@ in stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + postFixup = '' + paxmark m $out/share/rambox/Rambox + ''; + meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = http://rambox.pro; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index f95d3f0490aa..73e8ab83f725 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.0.12.4"; + version = "3.0.13.5"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "1n8vgbgnfbllfvsl82ai6smv6hl32a3nd071j2dp79agjz4fic3b" - else "19vkcgb0h71amixry8r72qqwaxwplzyz9nrxg5bdjjg8r2mkh4bc"; + then "bd5933dd17d17f93d56f69332927cd1ce6f34439ec464a0ce2ca73102d85080c" + else "848e1a44af3c2b00840a280ba558a13407f4844432ddfd262ee8a7800365386b"; }; buildInputs = [ makeWrapper ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { description = "TeamSpeak voice communication server"; - homepage = http://teamspeak.com/; + homepage = https://teamspeak.com/; license = stdenv.lib.licenses.unfreeRedistributable; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.arobyn ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 130fe644143e..c07258a78371 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,60 +1,59 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats +{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake +, qtbase, qtimageformats, qtwayland , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libwebp, libunity, dee, libdbusmenu-glib, libva +, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland +, xcbutilrenderutil, icu, libSM, libICE, libproxy -, pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms -, libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 -, xproto, libX11, inputproto, sqlite, dbus +, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon +, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 +, inputproto, sqlite, dbus }: let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - packagedQt = "5.6.0"; + packagedQt = "5.6.2"; # Hacky: split "1.2.3-4" into "1.2.3" and "4" systemQt = (builtins.parseDrvName qtbase.version).name; + qtLibs = [ qtbase qtimageformats qtwayland ]; in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "0.10.1"; + version = "0.10.19"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "08isxwif6zllglkpd9i7ypxm2s4bibzqris48607bafr88ylksdk"; + sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "9ce7be9efed501f988bb099956fa63729f2c25ea"; - sha256 = "1wp6lqscpm2byizchm0bj48dg9bga02r9r69ns10zxk0gk0qvvdn"; + rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3"; + sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82"; }; buildInputs = [ breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva + dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy + libSM libICE # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp + inputproto sqlite dbus libwebp wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gyp cmake ]; - enableParallelBuilding = true; + patches = [ "${tgaur}/aur-fixes.diff" ]; - qmakeFlags = [ - "CONFIG+=release" - "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE" - "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" - "INCLUDEPATH+=${breakpad}/include/breakpad" - "QT_TDESKTOP_VERSION=${systemQt}" - ]; + enableParallelBuilding = true; - qtSrcs = [ qtbase.src qtimageformats.src ]; + qtSrcs = builtins.map (x: x.src) qtLibs; + qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs); qtPatches = qtbase.patches; buildCommand = '' @@ -62,15 +61,23 @@ in stdenv.mkDerivation rec { cd "$sourceRoot" patchPhase - sed -i 'Telegram/Telegram.pro' \ - -e 's,CUSTOM_API_ID,,g' \ + + sed -i Telegram/gyp/Telegram.gyp \ + -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g' + + sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ - -e 's, -flto,,g' \ - -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ - -e 's, -static-libstdc++,,g' \ - -e '/LIBS += .*libxkbcommon.a/d' + -e 's,-flto,,g' - export qmakeFlags="$qmakeFlags QT_TDESKTOP_PATH=$PWD/../qt" + sed -i Telegram/gyp/qt.gypi \ + -e 's,${packagedQt},${systemQt},g' + + gypFlagsArray=( + "-Dlinux_path_qt=$PWD/../qt" + "-Dlinux_lib_ssl=-lssl" + "-Dlinux_lib_crypto=-lcrypto" + "-Dlinux_lib_icu=-licuuc -licutu -licui18n" + ) export QMAKE=$PWD/../qt/bin/qmake ( mkdir -p ../Libraries @@ -79,7 +86,7 @@ in stdenv.mkDerivation rec { tar -xaf $i done cd qtbase-* - # This patch is outdated but the fixes doesn't feel very important + # This patch is often outdated but the fixes doesn't feel very important patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true for i in $qtPatches; do patch -p1 < $i @@ -89,8 +96,8 @@ in stdenv.mkDerivation rec { export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ - -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ - -openssl-linked -dbus-linked -system-sqlite -verbose -no-gtkstyle \ + -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \ + -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \ ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" export dontAddPrefix=1 @@ -101,39 +108,29 @@ in stdenv.mkDerivation rec { buildPhase make install ) - - ( cd qtimageformats-* - $QMAKE - buildPhase - make install - ) + for i in $qtNames; do + ( cd $i-* + $QMAKE + buildPhase + make install + ) + done ) - ( mkdir -p Linux/obj/codegen_style/Debug - cd Linux/obj/codegen_style/Debug - $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro - buildPhase - ) - ( mkdir -p Linux/obj/codegen_numbers/Debug - cd Linux/obj/codegen_numbers/Debug - $QMAKE $qmakeFlags ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro - buildPhase - ) - ( mkdir -p Linux/DebugIntermediateLang - cd Linux/DebugIntermediateLang - $QMAKE $qmakeFlags ../../Telegram/MetaLang.pro - buildPhase + ( cd Telegram/gyp + gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake ) - ( mkdir -p Linux/ReleaseIntermediate - cd Linux/ReleaseIntermediate - $QMAKE $qmakeFlags ../../Telegram/Telegram.pro - pattern="^PRE_TARGETDEPS +=" - grep "$pattern" "../../Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make + ( cd out/Release + export ASM=$(type -p gcc) + cmake . + # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry. + buildPhase || true + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h" buildPhase ) - install -Dm755 Linux/Release/Telegram $out/bin/telegram-desktop + install -Dm755 out/Release/Telegram $out/bin/telegram-desktop mkdir -p $out/share/applications $out/share/kde4/services sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index ffc29a52aa1f..b1880be6562b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxslt ]; + patches = [ + # Patch from Gentoo that helps telepathy-haze build with more + # recent versions of pidgin. + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch; + sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; + }) + ]; + meta = { description = "A Telepathy connection manager based on libpurple"; platforms = stdenv.lib.platforms.gnu; # Random choice diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 3b90bc9f0ac1..2cc4905e4351 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; }; - buildInputs = [ pkgconfig glib notmuch ]; installPhase = '' @@ -19,12 +18,10 @@ stdenv.mkDerivation rec { cp notmuch-addrlookup "$out/bin" ''; - - meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; homepage = https://github.com/aperezdc/notmuch-addrlookup-c; - maintainers = with maintainers; [ mog ]; + maintainers = with maintainers; [ mog garbas ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index bbf92ea0462a..83eace00b0a4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,11 +1,16 @@ -{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames -, gdb, glib, gmime, gnupg -, pkgconfig, talloc, xapian -, sphinx, python +{ fetchurl, stdenv, fixDarwinDylibNames, gdb +, pkgconfig, gnupg +, xapian, gmime, talloc, zlib +, doxygen, perl +, pythonPackages +, bash-completion +, emacs +, ruby +, which, dtach, openssl, bash }: stdenv.mkDerivation rec { - version = "0.22"; + version = "0.23.2"; name = "notmuch-${version}"; passthru = { @@ -15,17 +20,39 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "16mrrw6xpsgip4dy8rfx0zncij5h41fsg2aah6x6z83bjbpihhfn"; + sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd"; }; - buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ] + buildInputs = [ + pkgconfig gnupg # undefined dependencies + xapian gmime talloc zlib # dependencies described in INSTALL + doxygen perl # (optional) api docs + pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL + bash-completion # (optional) dependency to install bash completion + emacs # (optional) to byte compile emacs code + ruby # (optional) ruby bindings + which dtach openssl bash # test dependencies + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; + doCheck = !stdenv.isDarwin; + checkTarget = "test"; + patchPhase = '' + # XXX: disabling few tests since i have no idea how to make them pass for now + rm -f test/T010-help-test.sh \ + test/T350-crypto.sh \ + test/T355-smime.sh + find test -type f -exec \ sed -i \ - "1s_#!/usr/bin/env bash_#!${bash}/bin/bash_" \ + -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ + -e "s|gpg |${gnupg}/bin/gpg2 |" \ + -e "s| gpg| ${gnupg}/bin/gpg2|" \ + -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ + -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ + -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \ "{}" ";" for src in \ @@ -38,43 +65,36 @@ stdenv.mkDerivation rec { done ''; - postInstall = '' - make install-man - ''; - - preFixup = if stdenv.isDarwin then - '' - set -e + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + set -e - die() { - >&2 echo "$@" - exit 1 - } + die() { + >&2 echo "$@" + exit 1 + } - prg="$out/bin/notmuch" - lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')" + prg="$out/bin/notmuch" + lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')" - [[ -s "$prg" ]] || die "couldn't find notmuch binary" - [[ -s "$lib" ]] || die "couldn't find libnotmuch" + [[ -s "$prg" ]] || die "couldn't find notmuch binary" + [[ -s "$lib" ]] || die "couldn't find libnotmuch" - badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" - goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" - [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" - [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" + [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" + [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" - echo "fixing libtalloc link in $lib" - install_name_tool -change "$badname" "$goodname" "$lib" + echo "fixing libtalloc link in $lib" + install_name_tool -change "$badname" "$goodname" "$lib" - echo "fixing libtalloc link in $prg" - install_name_tool -change "$badname" "$goodname" "$prg" - '' - else - ""; + echo "fixing libtalloc link in $prg" + install_name_tool -change "$badname" "$goodname" "$prg" + ''; - # XXX: emacs tests broken - doCheck = false; - checkTarget = "test"; + postInstall = '' + make install-man + ''; meta = { description = "Mail indexer"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index f8509a46248d..967ae7914e91 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.4.0"; + version = "45.5.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "8db134f67ea813c12d97b0a44fb6169f42b45b8f9e7e151cb6389ee6628e301c95b5ca7492ec5c803cd44225b1929539e81c4df840bb533ef12740c4b9b82f28"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "b3da97b15b71aa536d0acdf08e9e980ddd1917113579db8c9058068bd104b3029c721bf1bac1c9ed56c39540bdb7fd667605259b1c2a8d910401259d2cb0e3e5"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "2e83efd53b191d7bee999fa45f09583c818377443b9bbf3203b7f11a31b67d371e34980267cc509c47a57b4a6540b1f7f4293252f02138b24869c29bfc64423d"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "9d9ef1a1bcbb32cf04e26ad499bf1f8122b3b1a964e6c4eb6726d2271fba28c78f0d7bc60641d8cc6c2a0e1153a25483a6f8eb12568128045f7d6cf5ed6746d3"; } - { locale = "be"; arch = "linux-i686"; sha512 = "21cf44b0eb90d3662ef690c56a393bd4453809631209c8953156a1b59b6011fce407c4b3d54d956e5c376f36dac663cd874b4c917f41b9132e445968fd7bc439"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "ce33a0750430a462aa07ad8995656dbf2689077746de8ee42ec361c544ccd53e182192f95f6ac755ee739035b5f2a2c8233ac1c37c0d156c4a2aabb39806039d"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "fe763ecd1a572ed6e3864aa9d934b821fae2f91f02d959e22e96314e26271a9f5695930a0388fadd6bd34e0f7ab6938a48bfd346901e139128e0e24483c36d90"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "935bc0f19a45314341f76cb53dc4c617a5104a0a17c56f60679974eaec9fc8d9ee609d543a5a310bf4d1e8db6cdc54b660db5b2b85af7838dc5711e10ecff77c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "d9bdc81c10d1ef370275d3f152669ca50a7fb2b126cdd396d63aa8b7c97a46d815b1fa77b8135887b0f6c825ba87617c81e1f3698e455d75b2bc9862e47fe761"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "0b420e4168df1a0b7ff8e4983892de9b08cf644a6e7b28c090477b3efe557a7a34a17ac90a722b497298759d98c1a3346ff84789598359e4052a35b44b3bbba2"; } - { locale = "br"; arch = "linux-i686"; sha512 = "5e0726512ff28ee00498a4a8493d4f00e8375950fe8489c3e5906b37bf057c76eca66ccea8aaf7e165ca56b02ed14041efcab8b75170ae4daa2b2df2bf2ddc8f"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "1240f62d8a0530ead4b19983a36bdd894b5f812c82b68c49a4f7d9a961e0ff2542244ef405e03bb281ec65f070e815246487347a99bec76dd3509ec4512c1d47"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "ce79eebfe0a93a9e15237317fa3dcca6fd6f20c90adf431366e5d30ce026da0f4af4e1be0745cfa6620b2a75838fbed93a85ed0695c486eb46b58cfb3cea3571"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "f290ac184b7086349a173b1597341731b6c696c8806b3b5adb8e7f0121f298ae9971f8f96981662bac72079f03d7d2ce17f0c385662d06657a1519d7bf32ef64"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "a06b8a0db00b35ba16541a72623fc764c87c45e15e69079b757449e9c67988764f65bf6ae214ac4a0c0c541549fb6fb48bd1dbb2efe02541e3bda12938e2d787"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "b96dca42026adb793ab5d37544d42ff8d5668adbff6a94f6c37a33ea63eb87622a7eeee8c02976b16c1d8c38b3348387aa46daa2bf5ccfd66f2a176ba4c113ff"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "dee0395f80b3e0db7b6cedf3d7e22b574f3f2734da518db684ab8ddfb502a127d2e0c75849819638ea61fd8604b84f8b1118c036d8ffd5f444ebd8adce19fa2e"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "8162ba8abda1906ce0fa78455faf823ce4bf6eaab9ecafa50b5669f2485861f59fe2be3820d75d7f168432ede5e9ced170928e883ebd06f8ab3145065f31e610"; } - { locale = "da"; arch = "linux-i686"; sha512 = "f5bee461d1e0ba0ffc1de1fee05d41d0aa9db904061a7e4947d2a22ce8e3eb9ab40e15ace81a9cb248f72b5c08b699b39b46031f5673045eefe2e3346e7ae18a"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "dab187762c44a7092136d5b12be43bb3675c37dbaa1ffb36171e9cc76ffd94fd0f80872008bd686515f0a84c3adc9c36d5eff9240e871dff457145bc21981777"; } - { locale = "de"; arch = "linux-i686"; sha512 = "35994979446f4bcf5a6b79875e84999188d8ee58143b741e583302b29c0619566b5d4d65e640156168974e4c59c7d454ffeac47a8aaf35c344bcf2ec44520334"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "ae7169f84c945cd7886ef0ee84a1e57cb3017ad89b991c0f8dfb36d5537c2d9253345e111916a234c228a99e153c9d8c2f5bbb61e3d4d5fcbe95f507d863b735"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "1b10d6c4da26452c89089c2938db3559cc46c098baf917ebbcfc1d107bd9591630749aeae87a5b9e8819ebb5e4ad2b7d5321531bbdc3045df604e3929d2d6d93"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "c6195bdf00e05921a19eb37a74c34794cb08d8b8cd43609eed9f64bbe89788d9c87a45df449cc400e6cee31b7ac6f02ce57083581c85885acd620931c657a833"; } - { locale = "el"; arch = "linux-i686"; sha512 = "e7d7f38fecea77d93bb99656a6dd566c6f396e108910152917cd1c908f09d1f276385ed771d5500feac572356e688e43ab3a91651d64bd7d522db9daaa4f32ef"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "bec617a64ce06f7aacfd936cb85f29684d1afc4246c05f1de6bf1e11819a44eec0e395a446e64676fe6453ce41f173f938a845fb50a625e3f5bb325098e09d11"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "c06fcb56eafbe894e15a0380f49ce5455c95b2b6c9520ef3b15f699778a575e5c643db5797e72441a68e063bce0bd4c0003cd0b58c78c7d1a744223598ab3549"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1b095d5e254c2eef894b9954f42031b6e7eedbf0c753ac3e9f7b51b152dfb9c21d90ace238fe5bd58c63292587e477d23121dd0f96f7489b7564ae1bca27eef7"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "c6d1fc35bb89ed23b5f4e3be2fa6c28c3e29a7e821be1ae79345bb26a6db1ecae67b27f7ac9d3bd5bd803b6c7613aba3f0ad35cb07b607c1030f84a365da2b2c"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3c95879782c17963e9f17dfde11a416502bb89d5c712ae445bd476e1bc1fb76bb0716764150b2b1f92ab8487d736c39f29ceb023f226b92f8c07bfb7da8e76e"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "3f8f3263650fd4722da121566cd9afe8e671005eafee26f550a940dd76b1ed02c3f34f32f886c2cb2e2b1ed029f9997f2686a2494f4b24b6f32a7bcb8226f6aa"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "587ca874ed5e035291099db107cf29f19562c0adb785c33ad92bab9d5eac2f2615143b5587bf7da7df61c071995eaf7894e5733d2fb311ffa14671c14aed54d3"; } - { locale = "et"; arch = "linux-i686"; sha512 = "a08b99a3e444135d538f3b53669a2f4e900f86406e74076a2ca986c7d9bf55661aac248fa564eda3b6bd491cd284690da9c61a56a43f2884167998a10b666785"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "97043053f1512e6ac7298208e219bd2cd8dd1abd403ecbae90e365aa69b098becdef3f6cec9998fc71b237d78e3b7693fa93cf9452317bf1f4793425f23c0b5d"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "2de3d5915801e62196339e6acaa7f601740212a59f4ec6c684cb40c830bc6fdab843b3497a168bc6b2889f80449900406c05cabb3ba656d7d6b0be5750a31aab"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "834f9e712183f14af927ccb719325dad1a7f778d7d3beeec87cbb559d039b8764efb9447b8a0e40eb0ad55c88b525e5bbc2e2f5729c11b173ef86f63e4f92974"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "b8b1c42b3ab0a365c9a478fea0e83ac49b709dd2d117c1d8ed6fd7946b5dd32a1d3907b653c5aa0fada4ba8cc365ee9fc723fbbed76219a7c5d4b70eb68dbf65"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "64b5bc313fa64abc56961b0c6abdcc6fa72cd321f422857fece9bfb3673747d5992d96dc9d98a76c71148b6261ea9a750147c94f171c548170c0681d597d8402"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "45e7a37ac6c18d31e834b88789d6039bed489bc1cb4601399b3cf76feef52c3c36249e297750d39e3e3071c2d90a1ff6f0bcfef8bec89997ac552cceff88e78f"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "02a31ae95b6a6dac76eabd8e1de27ff50f29725be221841a738f60e41306d39ea050b73f78105561344d042ed988955e1801b5379bcecadccc89481c3bfcc13e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "bc14d4d16f0b196eaf92d551df6b565bfdf56806dc97714e97db7fd201c6e4e80df0485f77ff4bc5218b8c2f96a01a39f87c6c3e156c5c0cd72a8b932248370e"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "025411d23fae36123a86b72818b486412aad0f532631e4c48da5dea9b41d7b2875aba463a4a721e422cc4b141c8cce155dab01fd7056dfbadd435cd3e3061f08"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56d20e9bd013dea41f8686f7ab4da48b1c96e0d93c7639e990daf174cf7c9313ab659eb9256f8ee52adc9659d6ce766921eab1a24a0f963a8a8dc1d614ed34e9"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "1bd36aababa4fa8e47bb62d9a49b2a5303b5b0404f5ea370fd4b6b152327766a42bc6c15a85c693aaf532b9c3aa8598911e313a861d3eb946bb4ac8d0642de6f"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "bc0f98937cb2c2ef98ebf6625179f77d36d12f6c95eb413cd570f4b3a9fbe733888b57ef946fcde2daf59183291a8bd1258e8c7f80b260e6af3138c8b83117f9"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "d2729fddbd4db455b1f2b738d9bbd6d155db664c01ba6617128728caffe8f96aada8b02d49fb1b90695c4bf37db6960f51d6c074b5df94ab4e74996370679d2a"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "6306be1026b9127e455a3b0c720f7de495811c3bfb578090ee33d8b4200bec3390c006767d45ce165b57325f1c41e98ce078cf78bdf0a2e9d0bf5fd704cf8374"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "cb977c4f60041ccba81ae9708b381d8e073c2041104549973f33695d6f08663d23fc9dccc112d6fd9e4c61847211ecd2b762b81d842853ff80a7b813955295c9"; } - { locale = "he"; arch = "linux-i686"; sha512 = "e39c70ed7711a4c7c5baf0594917e2727bf0d081f9d38d2f0d539e557fa9c20e639c3e98ef8926cdc9f57ffee2c4b8896b044bd1fe9aeca39e64af2b56e35dfd"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "86ad9d155916dbf7318fe054286b8808bd6072735b6264db61d51745abaa975311776d9a15da13b9f6c536e78714501f1855291bcf59b49cebc047da112fcc91"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "e82a125725373a5fcadb4ad010809fd307f5caea4bbdb428cce3c267da197bc73355f655397283fc6bf93838ce41896b7d6dd1174fc56526a04b61559babf42d"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "ba8928e57b1eeeaa2b1e1b95ef87908247695b09d3f7220113820cc13a07223088a1c0468e362488b303a60456e2d63c631150025715d3a4b66b6a6204e31c9b"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "276a97640f24aade9d0658529e13d4e50b70bd5e98d30c43d7af6e0cdb368d3a54ed9365aea9cc03bef6938bb3c7dc0649ca09543278538fea5dc24a15ab5072"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "ab527b02bc792b2fe2a939a82b5ef4797f7ae94144a5161e11722d46d38da75203139faa85655248e4aba12090d79a46a0db0310b32ec0db02c4e68e932f0d2f"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "34e1f7e790deb7d4594f2edcf6ba1641730bdb6ceb72fb08071daed02713de8ff6931e3986fb3125646ecb3d2f299e5bf5028fc0425ac9790d57d4aace9e81f0"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "e7df1f64c41110d56959237555ff3a066b8d503f28c6d504c7080f3af2548d5ee66a60771872065222db57624b40d1a647aa278f89c04fa3c520730147227c83"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "356ac76891199061fd4698c51903ddc7e92858252a6ca502543b0403790b9b80ba8799e847a00331f19b6ab56d2e3d02fac79ec7b5502ed8227c5abd82ad3fc3"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "410ca6dbd22d870ec4d74e0dc19b65009d860e93b905dc43ae0d5086f83ad1dbae81d2213b0f39afbd5e428287d0f35e5c7b923df594494e66fcf08d4663cf82"; } - { locale = "id"; arch = "linux-i686"; sha512 = "ddab3b64afba2862a18879845cea3945fd3a34295ab07e5c7f53435ef8af005fdaa3beb5fedbee27818917a320fa5e1d1cdc618ac1767db9ceb1bf3c912720b0"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "4b26928f579b56c965992b4425a9af6d85fd7a288d699942448ff8f331833e53625f0d48e62794356ed7056ce75d0efa3fcce3f3be9acee099060b4c5a20e281"; } - { locale = "is"; arch = "linux-i686"; sha512 = "8ad9065d628cddc34fad8afb5477edc2ecbac7add4162c87e6790bbee58e8d40e40b087f879fd09a44f180b30e3929bcfe2ed268fe5bd549c0d5c011be7d974a"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "f2a14977d98e0e7575dbe1f3f068472bb90d25a9c333ed191ee17fbf647b1c47143136ef7fc1871bcdbf3b55c2d414a05a119a7a2337b9cd05f039d74915c727"; } - { locale = "it"; arch = "linux-i686"; sha512 = "18a3951092f38dded053b25658da79188aff3a3dd6e008f269b0b4c32151f7d2d2483932145ccc50c6c9d199af94b43abde65b61e8b1093d9b4c52692382d8ca"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "f834a9ba6f6cc2745d4e54eb73ef174e913009e82e989d1386e8598f9f83c32fa65de6902de641b62ebbf183a25f0037d119bb61884f3548d8f425fa63c9f5d0"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "f91904e585e30ac18e4065046ec184607705bce423ea79aadbecf32fa0f9f598a439ae8f955e79389c411f0836dd6bcf9a74e1e78cb70471a3c523a807e43c41"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "3052946955110d0f1df66df9933079bbe0b0247f9eef0a07c02c43f6463055bcde33e27b7ec1beb511e70f3b524d55ab404a0be755599f9e15f1902b4eb457c4"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "e0f79d30960bff54ee064ae381dd89b877c2f5055424eaf017382f6b2d1d0b34544cf3d88fefce8f2e294e84477e5109a17fca83083b0c5602ea5d0eec7b9c0c"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "ce515c74e7d69394f79ff7adf6ffe2118b0dc76f49672f19cbc299b21705ba18a88c6780f88bf28bcbf208ad33914da13031617a20494160d771ec09c10a798d"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "f9d00ec17abd13d575d651caad02e1a46adef760ca6b706df31708375b7c721f3cfd1d99964cc2e16615f5fc422855dba8fa722d57b355782dba1541cf32e1e1"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "2572ee32695dd0abf10a486453a3ca9d7fc26e88993a374677fb5f96edb319a5ba2892d8f9a236195ecd8199a7936d3969830571411ea35a8dc1f229089595e2"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "26db6cf82400b4a1bff5747d4e301c46f3391b97e28b64716e2b2dcfb2ab2da583142b487f90fe0798bee3cdf49d5965b9d9b124e95f1d65b32c9f84c42a7ebc"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "9b83eed9b3e93a5ddf463aa631bb4905abb8e02574e1be8a4cc9fe5cea7f3aee743b0f570a748fba67adbf6096a8443378ddfeedaa9cb0aa8f072dadf906929d"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "ff00b25886df3a9ff0eb9c4c9a1b34be21edc69ac20f0d994b9dd9b0618037c92c15ead664b071d09766a0e764acb5e118185dc3f08c42f2cca62c4c70fc8ffe"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "6796f4f3d1525a3b617c99eacec76c1cdc5c8fcadc39120d1da052518cb663093c695060b37120ea6337e21b9fcc20c5a5119878ba1068553772f2d8ed89db32"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ab236204028e79bb98e78b2900b434f1237e407e864d346fae975d123fa87e727710e41e19625b6c69548497cd9d7716467dc01002e4ff6025301a141125c723"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "0544c952ae8fddf43b784bab00aa9d4fd05566e06b9df15990ea91cc65aace6066855a8bdc3f6e6eb01e2a7030a49df67962de4af8d9d84d003cb2553af71006"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "618d3e621bed807521f4b933a44e8e87b38b2843a5f85f59a83a60a3df6e13a96d1b3c250a9d77200b03be69116cbdeb33c7e2e2b4d02b8672ab90f0e303dfe3"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "226844283b3aa5dd4f224a85101529099c8fde81aed5d354b685953019b27d445ac3347f642ea93145be4dce328c4f1711e0bd21bd9f5a2b97e6b822130546cd"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "4ba51ed645292165343bd104dc36ba0126435fdc06764e587379ed4de6a89a9f7711890f5f12f6176851ffcfbcd267cc1927b6e8c2a710d505cb3bbc7120209c"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "2702db95f2e166dd5097ae7c2c83fea39f666a0a9e811e7876042e6b5ee0dcad6061fb6b6950a2f8fd8f97c434476155b8e2a306e1fee5cc54100e2d2ec7d619"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "ec7bb46f323030f180bb7e83b40e421a245ca4a1aec5f548a2bde1796db00fec415889cca836394b172b1923638e61eba4b71f56bf8aaa55b902deaa7f57842e"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "48406e53ba5276f3721cc5a9af825aa48215862134addefdb136ccc013dc63ca664baa820c2f34f4dd02e79e747bcd4ab73b59ab71773f05c5fede7bfc005745"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "27f8bfc56044d000c8c43c759c16c3eb891a0d3b6aa4d62a18477a3dd816f0b67e899a1ec375376ee83fa97d0d2d836fcb5b1eb3407b09b194600206072d6c49"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "7fa5298de1e5128b4895491d99ab5222f23c1e36e2f07582b6e970de95f45b6ae89a8e4a03b394d0910129ca16be593a47217124b1619ec567ec9d470fe78100"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "2e25f6ed8e9c92a888c9b2fc0105d5912a9b85fe438c8889728d5522aebf23e86655af2066046e9ed0ea232a59d19b4affe73fa14d4e15af7cb337fef4438b49"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "c2adc7519b2a6670e7c0e7190c6788a5c5c8882b86bbd58c3472de51e958a22126c575413b6a604eca737d120b1da1863f35702f65220bb0e7f81e4deaa21587"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "ac7c8df9f06cf03c4b91e22668697bc74fff7dfa2edbf6873786e98acd5bf79535d8ad9a913811ed3567cb7e4427a8b3751a7adb011bd0567e433064e712be43"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "f4f80a8b25410b2a48c95dad316fc98b9f5391f08d3df699628b4bf9e343d00ded9cd1ff71b0d5e441ffe6c6a2edae29790a93b5e2117d7343a537d6cbd0738b"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "73009743b635761c1ac5d588837084cfb7041f639fc81646d2b6ad7bd92be5d7f742562c8c5522248f20dbca7fd430826617ae706821f107911303d416cb5f4c"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "cd2dbc81d761077f4fcff759dcb2ff02ae0e61b0b91007e7514081926e9f3cb2bcd2e65fc3ca44ad5d07caa4e4bd9e450feb25bc184f8c136ea3aa6cc4d05968"; } - { locale = "si"; arch = "linux-i686"; sha512 = "d5a416aff2e5fd3b294d8028ee6008c9086b9c5fdb15b52b8810e9e623865b946d46e1b812849ecd7331923f7e7ba01711a909396c8676db917b2a36f7370504"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "8284411d705c804fb0e90f7358e79e0687ef892342ed06c2030803d07b1a901e7f1a6ac2acb375eac10566b1885826c4fa187d3517a2bea35222bd2604d3992a"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "c905adaeca4c3daa57cd54d9a7ce49762e4ab4d32594dffcbf5b9d581409a9f7a0eea1abb51ffa94c35433d20cfd0be3baa914d9821e8f754cdcdb80de7a82fc"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "2741ea21d5714836116595529f4e240accf95ae1e549ac4cb083669beb20d40e7fdeb7805a836ada5d4310e31d74c8bebb1cb5c8f48b3fa585edfd880109b2a1"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "b61cb4971cfd9701dc8aad80848e41bdd399a53fc3282d72e7a866b782cebce928bbc163d2557c24dd0fa3f51f2d2cc40e27fc578d39392d00c15ad08d0df3ad"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "47491dfb70268c3ef00d4599e487fc2af35277de2746a106f59eb1b0813a4201c1e3ff735b0d7b48ea23bf3aac18fa1bb8e0c7948651e421f2677b988633e3ca"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "7773088708cc1ca1c115acaafc2d1456b854a413daf9622c2d267dc33e8a4727b6836743c9cfaf8c5694c729241e317a53b8411e37b8d4f94b67bc02c2878e41"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "db776cedad7842e02a87347e2f97aa5e583e2d1e2859659032e338b5c855f24241a4a1950fdb3a13b6dec643a73a7cb5f7e527ecdf50deafa5138c9f273d3408"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "e9eb4827e12db0173643bab8ffca55d50238a1184a2e2ae3543248400f39685b999a068ddab523e429c2667f2966e4a0a09c432837f5e852065459cda67e96b4"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "a38c5f80c0e6a442d035f7b4c18a350421948e9246ac65389959978cfe51f317644c06ecc567bb09739bee0303e4e2b8920bc7903900eabe92ad244e20370345"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "d7692def00b3a47e86fc01ad192a610352a6c958e53d1b2e4ac6d27a017643e2c0e9887a173268278b9ee7d2e3116368a8dde4d2fce6ea9b56a2bb3963a31ba7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "4656a0d46d358476fcba3be275740a289d79159fa346f4903cac0830341f9a630f1eb0c007d8429cde47821c441d01e792634d32d6e7b94f1bb2c94f18a56563"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "d6ed8ef83f1d4af62a5c2f92c791822d1b711ed4a51d9656c0e73dbe20510efe017f615537c892b43e43a5503ace92652faa5fa5f2d9956349386fe784fe0dc5"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "7a994549f4f8c33b185d094e5d207942b62bdf983546aec357404b46e74ec0b790c9b83ffd3cf3687b5bf09457cdbc14593af30ea425718baeb5ecc5703ec15b"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "c5833f7c43919a842f7b840a35ec8752401c24c559d620cdbdc83e70d77e5fbb5a364e44ac3c5f1f1339d9752b9a9825ac0e00d314aa9025760800fc4fc3ce18"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "f1338235583f5888fb7bd30c4c66341bf7ebc4a771e76571e22a5ef445398c9d2ced0f2f93d99bb2f180fa73a4a1f3560616570c8711e54d40a9b931e5eeb4d1"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "a40710948603a427c098619be1f203f2e7182eeb697de2b1dfdf824e556353b133839f0e5ce929fa9e31e70b1f248053bddeeba394dfb74e6c747aaa537d1df0"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "5dc6979da2242e45c5ca8a4ca50dd2858c1781256e5b2a9b8bed84e1b2af9f98e5ddea285e49549b3afc1a98df2ab89d74c99a6082309f0150ff426c1d9449c0"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "fa795ede70edb6c6237502cde8acdb7d5573db1d995d5e96f274b83f8ea0b827c37a5bcfc74b4aa99f1e15bf8dd68e30d756a0bcecc9e5946c2c5e275dad29bd"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "de8a0e22cfc727ccbc460a26a0cb80985c1957da99b050f6f00e4b20b050ba605d815577d392504d0a5e53ba4e12045f3a9a36626ed21682c493259fe0400ecf"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "381d66fc71d3f03f979ccd76aef75fdcf8eb2e182b4a0fa81c08976d195bd696d0213482d40ab365f2dad594587ba8359df4db2cf8febd8d724d5c50f3ba72ed"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d988114967c4656a13fa3fd562166e7444811ce16c5fc2af06619a47b941b8e07de0993a5593f2e5bad22ff6e856e969dc4cedb9c8df0f532a807e4a30b0c2ef"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "097a53d990af79e54e445e05c35fc08c86c0d003a04c48daadebb8dc0bd13f57072a82da01c3ae293f4a6766b3e2082bebe12bbb2a8c2f1c7d8eab23eecc2262"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9d4dd9e429623009e21b41383776864804803affc9837068bbafd7507bbc5ed70362582da0adb5c811d21c068a96bb4725c4581bf81ac0acb3d57b19fdb4fff6"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "bd6c633bd3ac5fc26f98ba1183f51b4380826d40762b1a28aa2fb6cda2ae776e3dc7909024d7f66b771323d489510c5237977e1380f33e5ac6ece933336e75c5"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "bfe82d658ce9950bde473836f2cfcc1319d22939a5fad3804808258faee4e96b0cb208ba386c102e41633137c19d071da3868868ccda8155d2ee02d71c05b132"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "99870cc67812e321dd2338f68612b63a31803065021fcec02b205f45f9cf263ef535421c249ba4a6a7205979679436a746300902b5c716ec333de0b9769d4f47"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "911ea7a1852bd61695058f68ae2ad991fd10107d876cf95b95f7df4b42ffe45a787aeee9241e1824281dbd3b1e32d8d815369f674bcaa21ad9268fc2f104a646"; } + { locale = "be"; arch = "linux-i686"; sha512 = "3faa1393235b24a73e04be481601552acd28620807a64129061a4fee18d42022e7765a510b61d17193066feeb99a8f3ca2fac405056f66a401c35f23791c8f83"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "d2118deecf5ff12d6e9b2807ff3129bd33e3d8d24ef0db067b031894c266636c103efe8e1d0103f41eaf2e1ae6edfa51bbac11973c082a1ad2339c992e7fd856"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "2123fc69d26ed28c6f4a2a8e6ffa3294e594e87608f9c7da3f4a811e39e58e59e1a50af616a6df810f3c8e0872eabcfc4708c4590530d780a52a2200e4a321c3"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "bf11f9106525f5e02ee26b89560136a07e142aced7abb3b7d9d7578e413ce24abc20995afe054ce32d3d9b6e4fb68a254bbf6a268658c908b33e2da26efdec03"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "1823ada3babc79e5d38f1012723c3c7eab2f885a7159d3b6b9d54573fb8c8d849799aebf60a66914cb545095894402cae6acf4b49e99d77e3b1a49b5418c04c7"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "737d2557dade96501f4442001a803eafb5c872967850cc875b902acb17b1133fdf0d0248271ff225babb29b937d744ed3294e4e73e82fef96d07a63fab80ba92"; } + { locale = "br"; arch = "linux-i686"; sha512 = "8e4377c42db9535a708a18d0b4d251d0bc14da24bf8cbf5fcb318d77f4a90e26f535f46642c9b940b3ee8887fdfeb218aaa9f846dd3b9cf89ce9d4e6035518af"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "4720d43ca4bdb2d809b4ed36352c03f05c823485951aee8943c24952aa493ed570c4eaecd83920c6ebc112d71e6afddb7b2851ee5a72faf3b4536fd23b35678e"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "94132e06f04bdd7928090944d3ae65440e15d15ec1f690d157809d5c524b071ea3c0f3f12b6b6987becdbcb33324d7471fd23feffd3f4f136e9f485b5dfc964d"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "84e4e65bdab737a8f5663dbcc1116b55a8ef88d9401f30a6a8acbff156913aade12d7b0aa61d9678811032b2e3a905d50ecaf0c9a9653500034e2f90f8ccc510"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "a51b94013fe020edc5b3f75f950fd6bb626c8ad18c73e8884ced1d74feaa97d899482e213639bb26496cada97cfbf4024380c49a45547b9e65c033f8ec09c2f2"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "50214c46072d17c30f19f0ce8a15a68a20839b5f985ce3a4c995c9739fc1290ca2d40601b7349c2af2214aef3207fcfda2a9115dfcef9ee1b005523b23a22317"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "a528980e1ca863c47d8b8a8e5b5891916d3de78bd20c1236b9d1954d0f057fb2c247b303eeb8643b6be0fac46a1c665da487c9a5b57f974066a5e3007df92123"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "fb3b1f14d55d32afcd22f3fa57736fcd820dbf06e6a92b72b8b1ca2f33df9156a0ffd8d0ada11bc86e11359add9d5c225aa07f4b1321464486cd75ca276594dd"; } + { locale = "da"; arch = "linux-i686"; sha512 = "1519def46f7b154a517344fff1ec076b5288cde722aeffa683dc3f990434fab4558b63d8062306c5a68d1efd3e30c983f3deced50043fac24c256f7b58542498"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "c5c0e24a0359a0ab178c369d3fcc7bfdf15411088033646d4e699f6e2e3ca8bc8a4719f8c214442661dcdc34e5e1f577dddbda40363cb9824fc9e378ff2444e6"; } + { locale = "de"; arch = "linux-i686"; sha512 = "83f7bc92338a30ed183dc9ee67d94e02dd8c659b8a711adad023f79a6253530cb6f530a4f31ad90796cb78566f2e280cf4ee19060b59323c22ed9bc678bee85f"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "6163afd45c2730e8970eddd8f5c159d4a0b4c48684fd6900a0b61eff1ba683a320a6ead6cd0052f0b9cb04f7a54f8e6b633c2bf6a594ed9c94afd7fa742e9061"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "9772c7bbcb2ffd475aba6c00dd527defcc7d2618e6537029abb49a47038c0c16b32f1c35ca4acad2ec53a7e5265598b0a32bad615281cc96afec819eaac32d9c"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "99a29d265454eeeac1f80e91913fdf4c6ec850532dea4a3891d0c0ab0a68e5391b9fb42640269c95214131c63e37e4ff7a2b6ea93c609e7b1ea02a04cabb0749"; } + { locale = "el"; arch = "linux-i686"; sha512 = "b6878a4ef1b32ac0390feffe6da0dc2c5c88e0bb6c88505e653a630eaa47432be1bd2903d97bed855c41dbbd5f5babf7b0b747b8afdc0675ed670c6bf5a69649"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "a11f653ef20c76187c9a794b70d876f9b2244c5bf9a10a9f7b41969bf35d36b1d75b319bab6cb9b29616546d68be4b587c47e9f54e8cb93f861f1bbfb9c2c1bd"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "88f1754d40cabbd473dcd5a24a7a91f7bd625b83b91223eafe78271409720ac9d4cfcf32711f36f72cb8b3269275d950ec55d2f11377880b8fddedd2cb04348b"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b754899626a8bc0fa7e491e6d18b84e8900266cbd39ab619e8a9821825614a46c6bf42ea490e56a8d25b5467e5e9280936f5a5034e055bfe736140f4bb9c1ce3"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "a66a92dbc8c2093d7498934c5f8d5a0e68ec3649b74d60d98775e33832902796667f2c06b2001faf07a535de18b6a2cca6f61dac4f8e8173040cdc9eeebbac88"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "4d5c6ce9f3e2a6fa9c44d6b8bc2cc50a2c129037f9a16833cc767efa379c2c2db27b2576c7a8cf93e87646244839614577230161f1bc813755f8fc43ffbafc7b"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "317865e753dcf03cbb0acaf67e0a34843e6f3264322e2fe63a1eec916bec07678026e6be4f7ce49626bef945a6f34125f28077ab367f954d11ba6f082014b4e5"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfd16a5ec21a1ca13fb5e882a75a767da1387c5f4adbeb3a9f608f0035ba60003650e6d3be57b2af8efba2d0bb8ed94ac879ad5f5e2039fddc6d9228f8ae0336"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "7017c9da2dbeb468c2ff3ebba91c2e83a6a233940296fd5bb03b4d1e5531fae189240f630055ab2d6324a0dcece5d2e80d32d7d9ab17a81709985325d5fe505a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "920dd641893de2e7b7692af104402e9898c3b8e3311960b5f3072cba07e0f8f918932be591cec92ca3a3aa9be6f17d605c55be5d2445864cc8ae025cef83dac2"; } + { locale = "et"; arch = "linux-i686"; sha512 = "0a24d1680b27a1e79985b9f124bc3742f2d4ecaaf2d4742db9ee1f9841d1d4b7d08ba60e71baf50ec6c593bd1a8f51d768a22b364e681b8c8a3651e37735f5f5"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "5c56cff2cd868985800c95eecffce5fc8d18def49b2c553b5c26decb364ce087d74220b2db78bb4c88c18a06eee4c5d0f3e49f17e54b67bce81083da465b53f7"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "c903ccbcadb68d951442051e558ab657c337713207887c32383902cf82a32cfb04a60ce03a5cc02fc2cd9542ded108beb433eb32270fceb25e8dc29135d2f4ba"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "9b782390d45dea01944c1ae29350cf01ee4bbab6ee94d00549aea195e4731b0c410b96f5101c44013352e8323f0baf27bd076a017456f6cc7a221c505fc7883f"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "5b33f4d58604138ffc098e9f3e4284f11ec97e58d0586cfcfb89c0114c61b07c2e1ba0051c5751101838d3a1125fd0dd81ca818d59e967dcc7a6cb166c01b27e"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "41ffde0d385bb3f7d271b11e470614e63f3e25e718f5f0eaca383794543c45a067989f7e153c4d48ec59199d2209e1394f89a14f4b776a0a8d1dc58466f91a80"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "2c1e6151f256b4e7b934830c84edd0faa942ad49ee7ee29b767bb75182f296a6a24bc5cd00e9649c78ec649c879fc4c0030d1a73a68b215e72132d0149361b89"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "ba12fc325112ac1076a9dbb56db5c9b7c03ba67e196d90529cabc3499ea5f479c5ad4cf3360bc891dad8c76a9cf846e1bc99f775d7ad83c45215261731530e13"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "0588462a5b0777f77dfde87be365beb5864e4a89b11cb869b18b47d2a600fb25287ac01a9e0b74156c0d35cf9e05e14815b3395a9fcb19030300ec74c3697931"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "2333728d503d8d171009258f6b59f41c20175e3ffde9ab65da3199825901e1c10adbab7d83eed5485608203d8e985ba9fae392971a11070b9fa3ab8a257cc28c"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "f43b95950532e23d1ed3a45c309d1e6dd5d79b56ef4b06a44a02485a58aa306a810360349ff2dbb617709785c4633ec3c79ab930752d112e9f971ba2244882b6"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4fc095fe246ca02ddba8f005ab95dc77b41ed766fff1b0d947f78db1e3fb09a1454d1f3f83b3160127e985a3256d630176f7e6076b4eb936d2529b5f86d1018b"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "72e6c4b9e7afd114690f5416d4018eb72ccdd4f2e71e60328e4df92a4043c19bb1ef917661abb8476fe68068754b17b18f7b8178494ad7f7278568919123f495"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "dcd069d8c4b2d096a01b2f24dd4acd60dbedc1b8511d1fa4346be9342b99b81b6252032470733385e70dfadf9cc755c1f4878542d275a17740290a35dabf6285"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "f1e9d759fe8fe2d613bc640d519a73ce843776ab6f7511734522a8728bae07762705b1698a0526accdf9c0c3a9bd233649a01931af2a653d17ae368399df0a1a"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "16953e45d9c3618c394e4150c58ca7fca45d90beab9a2253ee6cfe58a85e66aa2c5788fc4988c38b1c70470dc3fb9bb96a09daa354c88160d53739ce95ea25c7"; } + { locale = "he"; arch = "linux-i686"; sha512 = "89a6e7a06694e55128fa584cb6fac0c459d21c6f795caf581532b7ce69e0ba1954029667d5d3afb5835ffad1bc0d7444ab0c59cff2873870aad6bb232ede542a"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "183ce0c71d7852490f1f78d8a6380c7909f4462d238ecb342e35a8fe5b369161b9399c704011a0741bf0694b67713f93ec187331c414a72e0d77202382a99c7f"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "03c6d917c230cb9075958a6317599efcdecba5d8623a2664342bdc3c450662be64d69c7136c4f7ee6c10b4c7cdad8ea5a19cff2862f1e8aed9e3df3687abe182"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "b26d084369b30bd33011b9761b16769795e529575174f5533174bf7fd71ac387708942cb3e709398bd401341c7ca59486e203865adea58e89743520f0557d94a"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "06dfe62b99b8a52d0d2835c83e9becdd3af3b278e1fc8f7985f2d3883c25ff2e65d55a841c1040816d64faf4115f867c1c18a771e6139ea40fe770cc4dc137f5"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e303bfc9ce30479d1d79611d29dc95cbdd3ea4a6abdd1df6961cc7e4d832c6b44f6010f5a7e74485b4648e781aae2cfd2da78bbae6ef09e0cac6e5b980abfdc4"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "f454805664f2aa7262449acb74d78fba411e5de175076a50758f149fc4c1b4f5c76f2a36b253acc18bcc809172db3fea17c6cba524918dd80f2b17bad97e237a"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "0e8a0a2eefacd575fc52e6a761be481b1a4fe29eab0aaf8d51e2aa624f4cf1f5fae2cc9dfa1f68af83b82813cb8cdb8da3e454711f611a621cc22b33acc44e98"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "3ed1482d68759f143f403c935af3412ab819b6801e13bcaf123ef910db0bbe2c7523b52f1dc5c4a93b1a087f3d78162f2b8c04930abe89abf9536abcea374dc8"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bb43898b0953dbde2837906da9edeb0924a65488715d8e3cf22698ddf665a8037ec758ed6df4ca04ff2f04df437eb8c71d98496147bd5f92b22246bf967be769"; } + { locale = "id"; arch = "linux-i686"; sha512 = "c2800b997e412cfabd39d7c8412c02817121383ae477cade3db1d75f7be47091b84179e54e3bd968ca79c41199fbc1f5ece63cb2b9eef038e9af6e4034326db0"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "b5cddfb6c6e8a6fccf6ef4ccd78734e766c081ae5fe3d2a3ad73852d453fdd71eda917eb29ec3bbd2398c7c810c0e61195680de1cded8f4394322a12ce84e0f7"; } + { locale = "is"; arch = "linux-i686"; sha512 = "9ab50f7d7ea5450bfd984ef180eeef8672e21e5d1610def3f3725589740ce57486985706713bb292a1a577dae1f9b6106c568fb2acc11f4bb92c1801af444c8f"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "39b6c5ae33b191334d0867d031b59b06a86311527f19b1fa8f0bbe0dfbf90f4f2cf952b8d6ed22851828b16aa3019a8208e6f7b603a6d94741ba66111af00955"; } + { locale = "it"; arch = "linux-i686"; sha512 = "13899d6940dd4840566def16ad5d36b6c992349d68bc4d9dbb9c9b73bf53310401e687bf9a4b9837205f5a527f3b7ba1270bb4e4ebb46c129496d49b0b19f2e5"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "c1434939ff690a4036271c013f926230c7e612a64e41aad6e0885109eb5767fa0639286fd44e370f24cae1d4e70a72be8bb04f5533c66c7fb52ac0d1986a767e"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "7b6464fd5fc2b0c0a54f760df62c9f08c94662d00e98d9d7a58844d189c765d780798a64079507aa84532e91b28a92e4d6f21c51bd9abf8263e8c4267ba2f9b2"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "3545594699f209bc78353b3f4b17df5b31f1283e826937cbbd83f34a32aee658c67dffe4cc77a7ea055f09e6d966768715deb7037372d29796a1fddab89383ca"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "df238479c6d58be8986a1ea581e63dd7e42a0c6d4a8fe2b3ef66ceeee34c68a4b02f689844e0a19d59d65abb175cbd95387a4e2d0041e7b126cf7728badaa0df"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "e05d44fc6a66c79ca50cc2bfd88d39112783ed636370ea2927cc2202c8b5829f05aa1e6fd9083c4c5a37c8bb873aadc5aa81d0522abed5742fe78ea3258f8e15"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "219d2030e11fdfe5f68f703e6141038177257025b5f1039776cc9093c35b9ac03d197488ceb960d1b2b5c9abc12ac2b4895990afbd430170499d3639476eff5d"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "6221204aad7b62fd540a5776ac67ca968c5f7f436d260664184c871f8ecdccac6542f306c2d34ba8b74c17b15caf549ad30852fd003b711572ea3eba0c2a32bc"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "54b3db811b3573cf0084cd5a5df45e33c6540b1d6df301023853b1fb023f786e70b9f6d2b827273504e70809096d392b0fb91ff89ad363c051ddbfbb6dcf8099"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8ccafab65ece0dbc9d7ea7067846d3a45df6b4a78d543d54f87a52f359a759dd4d3f0272ca3ce8c792feb643c5d3871ed411d0b8719527969acc1cde39577768"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "4ac1dddb4f65c05306738fdfff6b939e4678a59282519a053ae3b919e2c9d0cd4f72f93f6c5925efad101c64a32ec10187fce6734dbdb8002ed05bb1690d8cc0"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "58555fc9e43b9599486b25fdf8b0e4e27a0592f52db730123ea0513be255f026a35a2d9ac9be84be158e94c3f95fa5ce9dc531dc94bc839e36092ce6ad560b6e"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "102ff8f498c9acd7fec58973bde3807f2821723a223ac7646985faf1342eeba15b438b57a6c1e64005ebd86b97cd37555ab568ed96c228ca825651e9133c2696"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "eeda11d9e76e713a287130e1c0cfbc8507c0a148061dab878891af0c7751fb517a0f9d3d49c31ae69514e5caafb212c5e23b6254dc310b63c2f241741c8edf29"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "94dcd33d5a992ffd7a47114555d1a12d31e235eec60fa6792fe041154c27dd0d97bf55d0c8bff763502d07a9b458402322a54b0b1943ef7a55457d32360135f7"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e7a5fd70e80c34c12650fc85af282dffce6fdcaa95c177e18930212605510858d4f71fe0600bccde80aa59bd81f22b4425830fc4c0c689c636105512fb55b0fe"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "a056b9ddf6a2a04adf786bad7cecf4d4c02c0ddf8584ef602e390a2157073a654473f2262a4e418fb31ac0a198fd212ac67a2c9e9e52490b3d4236fc6c73edb6"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "081cbbc49b12223e9a9f860fc6072ceb855634419bbb4d1e2923342c7f4f0b634443a0c1f9f60bf8622b9176412c4216d555d7d075bdc120d0c4bd2d809201db"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "22b4194129af89e81e1fa7ab38c2905169ca73c8656c6a7b718cf4013dbc0bcc4336ef68303506894e871487092f8ae7b2a05f914242dd2ea61109e3f969476a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c6a5556ceb64c4559e1ce92019312a9b862efe6e5c93380859f8e2787b54cc5e12796446d7effd3bf8c47704e6fadfd80da9261d30c1ab666ebb7a34ac15c525"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "46c292e1daa7755332f29e2e6e785013badb3bd869d497cd8fd85c107e9412bfac9ffe1e14f99addaac3d413e9ac7dcb2ee4ba4dc5dddaeee0fefddf0256e281"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8c1e72eea7b4d30ffc6e5915d51289abce564674231f80ac0e5e03a45cc971683232ba08893672e424fa1bca75ebcc2847d18f044e2762c16f0d955f56895140"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "0b3305f2c7d2626d2fe57484c694e5400f6d60dcfb62e65ca925501dc1c1ba3a9ab3f71f2d5584a5d6b49567aedd7188582967f0ad6e7a461034e50cfb577d32"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "6c875b6806dda0ef2b140ae3a3bb47ae6f5b93a0b6d7b9b2d0e2182b6f3f356c85cbe60c9c79bac51f46a2c1adb59f240f7d1c45be203b38a25832be178cc0a9"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "6043a890614495cf28a1271716e6add0229f8d5ed911fe04152503a20a26e7b4da03475e4a1c08b93cf512bde19916ca1a53d41094ffa8a2d48e4cbc71fcbc33"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "9a5a81fd713ffde8e38aa9ed7557a9a8b6b902e8ba316e5bcd5c4af2f73a1fe67a226a9401ddabdf76086af6c8432d00d02cbafc250f03190878deca1bd69588"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "aa205e2f3bc4a4e22520a41c9ba516f6360e062da74a180221b5236cf10d0a30e1ce3b5eec1081a8a9b4de3331fa3f289dfccc0b6785363b3411f77d8832f7c0"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "7c8d7402949f34cbf9ba3eb32fe1fa1c225296bd179854a199968f012c64fa3a016dcaa922d0dc0abbe1fb0bae438030f7096aaf79be2c7822df2f529e1fa46a"; } + { locale = "si"; arch = "linux-i686"; sha512 = "841897e3a07a0a6dbb4e912e424ea52b17631549176995e3c8ab1581bbc4e565be084ffd686ae6a4596224a642213477d40a5b2aa702ac6679e1ae71bdd88516"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "618b49c54e2057c10e3ea5441e2e960e4581589fc2685ca2f42cb1cfb5defd9f26e60d3f7af603757aaf73021133a0bab94ddf3c0cded1442523a55661395720"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "e00c42e2adf10e9d19d434bf67be2ff75f47ba11fb2a5d00d62f9946c3c274795fe2fa83b718cf21cc4ac396f10212ab459c81fa7d866ff6a9af8754b0663db0"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "48a0277c6082e84dc51df64c9e726843d1361edee39e27e625f09cecd56c7b82e31d31e121799f34da4e85177506af680dc893b8f305d24ae7f6276146842120"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "585fbe3e399d857ff21307a0ed53c5ea9aabb68232da44febd3c52297e7f9636f6aab6c8f698e2714a83632c48b4b60933568d6dcead5a614fbdc4b90be416c6"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "e84ff51b3feb54408e6abaddaf23bddab85d6a3cf78286dcc13da43e743306addcd2dd6fd58419d2e5dfe2e5d63c0ba51810fdd9ec080427d26ab8ec7535eba6"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "9ca817ada82c6f2199b0c357164fc28b98351c69a8cbfd98048eee407ddc05dc90714e7dfca4059a55ce2bcbc133ae22c8f26a8bd632d60b7bb561221d4fcc81"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "707088e8fd72c8bf598108f57d684369ff5b1c996e39c88a002f724324b111b2d7c00cfb649eddedbd70dd0df22d10f2f83f9114a71031f33e9adc250a193402"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "243baec5e5daca6cc7410bc3079db3e5201b49f7ea1b76bfdc84fcdfc50c3327e886ce7e008c9350c7bf5128f61c34ae543200bc11ae0d3cfa9166a3000b243d"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "212ce66af4689db19b234b463b0f29b01c7ceebf1d4c67a10351f06f2e71b32d050e5232fe0e61e15fa30a852107ca7a1fd80475fac7d2b877074de3b40e6bdc"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "31637fef31f0e1d08ea528bd7b917c6d67ab047c3d1856fd60b8a1de20afec567aed093e27c938aee4c8b1b4269cda5f43a127cc3284deb3db4f0d98a8d23a8a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "81b745a763fcf3b60b84ddae56cf59e363269986734f26275ad3e32320b8d5ac1a4a714a03861ccd0fdae499767a93b53f5717ca78074c79ca2c9b303406a5ec"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "c35956a5aacdbb2eec20feb41fac23349c621624ccc792c9f6e711935c45afaced43e8c75d00c4c59d0279d62d5092798c3200d25730a1fa15ad03682b5f0d86"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "5bfeaf3ec0ad5ae56b540337b72795e11fe66846df72ec849b51db32091df8ea8a9ba4b2e6c46f2cca2f672419c6ca6fe23de8c7668edce53c38c5587b83c075"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "b617860d43de6c1f191ec0a021b86e49217310fb8aaf1ce5d8be11eb27e77f6cf7338f8e675dd25a53c298b4fc7e5228c289aff86b23b81c8176ac55953ddc03"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "f421c0889af9229e7081bb9f4f5a6cced6647bb230b7dd5d14f46bc5a0ba4c36f7a711e9b9df446ee69e165953d1405c1b11c9912447194518bf9c9b58a5da53"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "f33c519ea5fb12e5f98cab4d3de4bc23e8277db9534b765820f8cbe1c24d6d33a033b0ec357f8b13d9d16915f6d677b5b206cdceac86b9f8a09aa1d9e016a510"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "1964f6597ba11f10010275f7ff256f8fb86bcafc426c81c4f2d55f5202b0d19bc978a1be24e2b204612bf19097afb0709f00de263fc34dbd43eb6b331f85b9ef"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "4ca3d166fdfa02bdf8581bbe29b1d067011d4922b5308af369407da7e7a00239b75da739f4be88a158e29b939516095101cc03602545900f87d91455ad716c0e"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "5e335a87ee0d5ec63e45c2570f628d0ca1cd5577b39f7469aef2367632c10df16525bfffe2a4f80f473d7faacf9e96986130e6548978d9b4f606de3a25a12cc0"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "de86ee26774483a31e74a9f89e144d5bb4eb5493f27cb1b5a21902b8e8cdc0322f15d38498b8d6005b59296715b9d9125676b26661433e280a2f1807fedc3df3"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "291074caef4a1a1162d0c3f90e630985978ddd731fde7d9d1d576c065ee8b89af5cd10196c4b05c537996ab99d00d78119af00bd1cd77e85b567303c38d1e792"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "6873ff342439247d5bda3e3065998b33bdf03f1d80d15a2f733a79eb7ede188a71e628ec3af6a67354f9adab9f67d79a86310060b20de09c623c342e3b894f2b"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c60f4ef8b1dd22db617e8d6381f2e0ebd37fd8503c363548b5affda704d483432369138943f84ca07c89a15dcf72b9a081f8db6f1c202558050ec997b9389ecd"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index d44c749a55ad..8e2e5a1be448 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.4.0"; in +let version = "45.5.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5"; + sha512 = "719469c4f66a9e4b09c360056c63ef2e1803334901dd4a23f12e455fe8ae4d0aba0a6273b3cf2796c925dc93f0add3df011ffe40148ef0b3f226d0b1a1c37b6a"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix new file mode 100644 index 000000000000..7e47838c4f98 --- /dev/null +++ b/pkgs/applications/networking/p2p/ktorrent/5.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake +, ecm, qtbase, qtscript +, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support +, libktorrent, boost, taglib +}: + +stdenv.mkDerivation rec { + name = pname + "-" + version; + + pname = "ktorrent"; + version = "5.0.1"; + + src = fetchurl { + url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz; + sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh"; + }; + + patches = + [ (fetchurl { + url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc; + sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v"; + }) + ]; + + nativeBuildInputs = [ kdoctools ecm ]; + + buildInputs = + [ cmake qtbase qtscript + ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support + libktorrent taglib + ]; + + enableParallelBuilding = true; + + meta = { + description = "KDE integrated BtTorrent client"; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99df01afa6a4..e2806b3d342f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,6 +3,7 @@ , zlib , withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null +, ApplicationServices, SystemConfiguration, gmp }: assert withGtk -> !withQt && gtk2 != null; @@ -11,7 +12,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "2.2.0"; + version = "2.2.2"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -20,14 +21,16 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "010i7wpsv2231pwb1xdqs0xfwywi3514siidv6wnrfpw3rs7x156"; + sha256 = "1csm035ayfzn1xzzsmzcjk2ixx39d70aykr4nh0a88chk9gfzb7r"; }; buildInputs = [ bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls - geoip libnl c-ares python libcap glib zlib + geoip c-ares python glib zlib ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); + ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]) + ++ optionals stdenv.isLinux [ libcap libnl ] + ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; @@ -68,7 +71,7 @@ stdenv.mkDerivation { experts. It runs on UNIX, OS X and Windows. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix new file mode 100644 index 000000000000..bb767da94d06 --- /dev/null +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, fuse +, appdirs, colorama, dateutil, requests2, requests_toolbelt +, fusepy, sqlalchemy }: + +buildPythonApplication rec { + name = pname + "-" + version; + pname = "acd_cli"; + version = "0.3.2"; + + doCheck = false; + + src = fetchFromGitHub { + owner = "yadayada"; + repo = pname; + rev = version; + sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; + }; + + propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2 + requests_toolbelt sqlalchemy ]; + + makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; + + postFixup = '' + function lnOverBin() { + rm -f $out/bin/{$2,.$2-wrapped} + ln -s $out/bin/$1 $out/bin/$2 + } + lnOverBin acd_cli.py acd-cli + lnOverBin acd_cli.py acd_cli + lnOverBin acd_cli.py acdcli + ''; + + meta = with stdenv.lib; { + description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; + homepage = https://github.com/yadayada/acd_cli; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index d7918b3b9120..d46120e00888 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: stdenv.mkDerivation rec { - version = "0.14.8"; + version = "0.14.12"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l"; + sha256 = "09w0i9rmdi9fjsphib2x6gs6yn5d1a41nh1pm4k9ks31am9zdwsm"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 553719a1c60a..52b81595e434 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "2"; - patch = "2"; - tweak = "2"; + patch = "3"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1q6rv935g633ngg10hzi23sg0wqfq2apyffagk7mj1kan2hflljr"; + sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8a69ca8eeb3b..cbe159857eb6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0nxwf3b63gzb04svb6z1hi3qf95i90pwda5gpmlrfrq6250n3bpi"; + sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1gm23i0snhcm4svciypm0qiviiqv9zpiyplkh22baccs7li3kih1"; + sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4"; }; }; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix new file mode 100644 index 000000000000..eb4d2714a127 --- /dev/null +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: + +stdenv.mkDerivation rec { + name = "plink-ng-${version}"; + version = "1.90b3"; + + src = fetchFromGitHub { + owner = "chrchang"; + repo = "plink-ng"; + rev = "v${version}"; + sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; + }; + + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + + buildPhase = '' + sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h + ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + ''; + + installPhase = '' + mkdir -p $out/bin + cp plink $out/bin + ''; + + meta = { + description = "A comprehensive update to the PLINK association analysis toolset"; + homepage = "https://www.cog-genomics.org/plink2"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 45d7686b3e52..d1106a758473 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) ./sw_vers.patch + + # this prevents thisroot.sh from setting $p, which interferes with stdenv setup + ./thisroot.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 197dc78c3c2c..fc2b697d8a82 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -6,4 +6,4 @@ thisroot () { source @out@/bin/thisroot.sh } -envHooks+=(thisroot) +postHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch new file mode 100644 index 000000000000..57cd5838e64a --- /dev/null +++ b/pkgs/applications/science/misc/root/thisroot.patch @@ -0,0 +1,15 @@ +diff --git a/config/thisroot.sh b/config/thisroot.sh +index 85dee20..532cb28 100644 +--- a/config/thisroot.sh ++++ b/config/thisroot.sh +@@ -15,8 +15,8 @@ drop_from_path() + return 1 + fi + +- p=$1 +- drop=$2 ++ local p=$1 ++ local drop=$2 + + newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ + -e "s;:${drop};;g" \ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 3aace6b7e021..74a2267043cb 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./getcwd-chroot.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "fortify" "format" ]; preConfigure = '' # Apply the Debian patches. diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8aad853ca10e..994dcb38f805 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -45,6 +45,8 @@ rec { git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; + git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; + # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix new file mode 100644 index 000000000000..d1996b72154d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, rclone, makeWrapper }: + +stdenv.mkDerivation rec { + name = "git-annex-remote-rclone-${version}"; + version = "0.4"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "DanielDent"; + repo = "git-annex-remote-rclone"; + sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp git-annex-remote-rclone $out/bin + wrapProgram "$out/bin/git-annex-remote-rclone" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/DanielDent/git-annex-remote-rclone; + description = "Use rclone supported cloud storage providers with git-annex"; + license = licenses.gpl3; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 2ee34d3c6e3f..ba2b71138067 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchgit, docutils }: +{ stdenv, fetchFromGitHub, docutils, makeWrapper, gnupg1compat, curl, rsync }: -stdenv.mkDerivation { - name = "git-remote-gcrypt-20140715"; +stdenv.mkDerivation rec { + name = "git-remote-gcrypt-${version}"; + version = "1.0.0"; + rev = version; - # Use joeyh's branch that works better with git-annex - src = fetchgit { - url = "https://github.com/joeyh/git-remote-gcrypt.git"; - rev = "5dcc77f507d497fe4023e94a47b6a7a1f1146bce"; - sha256 = "d509efde143cfec4898872b5bb423d52d5d1c940b6a1e21b8444c904bdb250c2"; + src = fetchFromGitHub { + inherit rev; + owner = "spwhitton"; + repo = "git-remote-gcrypt"; + sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379"; }; - # Required for rst2man.py - buildInputs = [ docutils ]; + outputs = [ "out" "man" ]; + + buildInputs = [ docutils makeWrapper ]; # The install.sh script expects rst2man, but here it's named rst2man.py patchPhase = '' @@ -20,13 +23,15 @@ stdenv.mkDerivation { installPhase = '' prefix="$out" ./install.sh + wrapProgram "$out/bin/git-remote-gcrypt" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync ]}" ''; - meta = { - homepage = "https://github.com/joeyh/git-remote-gcrypt"; - description = "GNU Privacy Guard-encrypted git remote"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ellis ]; - platforms = with stdenv.lib.platforms; unix; + meta = with stdenv.lib; { + homepage = https://spwhitton.name/tech/code/git-remote-gcrypt; + description = "A git remote helper for GPG-encrypted remotes"; + license = licenses.gpl3; + maintainers = with maintainers; [ ellis montag451 ]; + platforms = platforms.unix; }; } 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 e432543df452..cd737cdf4e6b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.1"; + version = "2.10.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; hardeningDisable = [ "format" ]; @@ -93,6 +93,7 @@ stdenv.mkDerivation { # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ + ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/ mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 503ae4e90b9c..d13457ef927a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook +{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: @@ -6,7 +6,7 @@ let minor = "3.16"; version = "${minor}.2"; - inherit (pythonPackages) python buildPythonApplication pycairo pygobject3; + inherit (python2Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 96017a7ba19c..01687b588677 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -14,11 +14,11 @@ }: let - version = "2.6.12"; + version = "2.6.15"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn"; + sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh"; }; common = { @@ -43,7 +43,7 @@ let ; meta = { - homepage = http://fixounet.free.fr/avidemux/; + homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/applications/video/avidemux/dynamic_install_dir.patch index f2f963e51694..803cde02ec2e 100644 --- a/pkgs/applications/video/avidemux/dynamic_install_dir.patch +++ b/pkgs/applications/video/avidemux/dynamic_install_dir.patch @@ -1,12 +1,12 @@ -diff -ru3 avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp ---- avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300 -+++ avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300 -@@ -393,7 +393,7 @@ - - return ADM_getRelativePath(buffer, base1, base2, base3); - #else -- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); -+ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); - #endif - } - +diff -ru3 avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +--- avidemux_2.6.15-old/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:13:41.406566362 +0300 ++++ avidemux_2.6.15/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2016-11-23 02:14:33.433566147 +0300 +@@ -92,7 +92,7 @@ + + char *ADM_getInstallRelativePath(const char *base1, const char *base2, const char *base3) + { +- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); ++ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); + } + const std::string ADM_getI8NDir(const std::string &flavor) + { diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3ed58017fe2f..dd9c67b952f5 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -79,13 +79,13 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "1v1qfppysi0qn40q9z7cx9gs7pcrz2hn1g44iynygvgj29h1gify"; + sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6"; }; patchPhase = '' @@ -160,6 +160,11 @@ in stdenv.mkDerivation rec { --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + '' + '' + + cp TOOLS/umpv $out/bin + wrapProgram $out/bin/umpv \ + --set MPV "$out/bin/mpv" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 8dc2fc037e6d..9e36f790c782 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; - maintainers = lib.maintainers.profpatsch; + maintainers = [ lib.maintainers.profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 3fa426d9f6f9..26e0d9479541 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}: +{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { name = "libquvi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; + buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix new file mode 100644 index 000000000000..59ba63b32eeb --- /dev/null +++ b/pkgs/applications/video/w_scan/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "w_scan-${version}"; + version = "20161022"; + + src = fetchurl { + url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2"; + sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0"; + }; + + meta = { + description = "Small CLI utility to scan DVB and ATSC transmissions"; + homepage = http://wirbel.htpc-forum.de/w_scan/index_en.html; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ] ; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f81781987ccc..b37a52f6313b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex -, bison, lzo, snappy, libaio, gnutls, nettle +, bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman vde2 texinfo libuuid flex bison makeWrapper lzo snappy - gnutls nettle + gnutls nettle curl ] ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] ++ optionals seccompSupport [ libseccomp ] @@ -113,6 +113,21 @@ stdenv.mkDerivation rec { url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9"; sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z"; }) + (fetchpatch { + name = "qemu-CVE-2016-7994.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=cb3a0522b694cc5bb6424497b3f828ccd28fd1dd"; + sha256 = "1zhmbqlj0hc69ia4s6h59pi1z3nmijkryxwmf4bzp9gahx8x4xm3"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8668.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723"; + sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik"; + }) + (fetchpatch { + name = "qemu-CVE-2016-7907.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a"; + sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm"; + }) # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix new file mode 100644 index 000000000000..e318a0b64d7b --- /dev/null +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "singularity-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "singularityware"; + repo = "singularity"; + rev = version; + sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = http://singularity.lbl.gov/; + description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment"; + license = "BSD license with 2 modifications"; + platforms = platforms.linux; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 04223d9a9e9d..75f90c234e83 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }: +{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; }; - pythonPath = with pythonPackages; + pythonPath = with python2Packages; [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted distutils_extra simplejson glanceclient cheetah lockfile httplib2 @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pythonPackages.python - pythonPackages.wrapPython - pythonPackages.mox + [ python2Packages.python + python2Packages.wrapPython + python2Packages.mox intltool ] ++ pythonPath; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 64275448651c..14a87151e97e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,7 +4,7 @@ , which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null -, pythonBindings ? false, python ? null +, pythonBindings ? false, python2 ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false @@ -15,6 +15,7 @@ with stdenv.lib; let + python = python2; buildType = "release"; inherit (importJSON ./upstream-info.json) version extpackRev extpack main; @@ -48,10 +49,10 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL - libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu libpng patchelfUnstable ] + libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl + pkgconfig which libXmu libpng patchelfUnstable python ] ++ optional javaBindings jdk - ++ optional pythonBindings python + ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr ] ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b641a571b249..e9f5d9bdbf26 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -5,14 +5,15 @@ , libstartup_notification, libpthreadstubs, libxcb, intltool , ORBit2, libXau, libICE, libSM , dbus, dbus_glib, librsvg, mesa -, libXdmcp, libnotify, pythonPackages +, libXdmcp, libnotify, python2Packages , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf , xdg_utils , gettext, boost, pyrex , makeWrapper }: let - inherit (pythonPackages) python dbus-python pygtk; + # FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper + inherit (python2Packages) python dbus-python pygtk; s = # Generated upstream information rec { diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 61b356311785..159468f79047 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainers = maintainers.ertes; + maintainers = [ maintainers.ertes ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index f27e7a953dd2..b09dfebfd127 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch ]; meta = with stdenv.lib; { - homepage = http://github.com/alexkay/xmonad-log-applet; + homepage = "http://github.com/alexkay/xmonad-log-applet"; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 21e0d2b5128a..27575053954f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -247,7 +247,7 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -a $item/ layer/ + rsync -ak $item/ layer/ done else echo "No contents to add to layer." @@ -310,7 +310,7 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -a $item/ layer/ + rsync -ak $item/ layer/ done ''; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 59e06c95ebba..982229cf8a5f 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -26,7 +26,7 @@ in Cloning branches will make the hash check fail when there is an update. But not all patches we want can be accessed by tags. - The workaround is getting the last n commits so that it's likly that they + The workaround is getting the last n commits so that it's likely that they still contain the hash we want. for now : increase depth iteratively (TODO) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix new file mode 100644 index 000000000000..3c27b9fc1ad9 --- /dev/null +++ b/pkgs/build-support/singularity-tools/default.nix @@ -0,0 +1,100 @@ +{ runCommand +, stdenv +, storeDir ? builtins.storeDir +, writeScript +, singularity +, writeReferencesToFile +, bash +, vmTools +, gawk +, utillinux +, e2fsprogs +, squashfsTools }: + +rec { + shellScript = name: text: + writeScript name '' + #!${stdenv.shell} + set -e + ${text} + ''; + + mkLayer = { + name, + contents ? [], + }: + runCommand "singularity-layer-${name}" { + inherit contents; + } '' + mkdir $out + for f in $contents ; do + cp -ra $f $out/ + done + ''; + + buildImage = { + name, + contents ? [], + diskSize ? 1024, + runScript ? "#!${stdenv.shell}\nexec /bin/sh", + runAsRoot ? null, + extraSpace ? 0 + }: + let layer = mkLayer { + inherit name; + contents = contents ++ [ bash runScriptFile ]; + }; + runAsRootFile = shellScript "run-as-root.sh" runAsRoot; + runScriptFile = shellScript "run-script.sh" runScript; + result = vmTools.runInLinuxVM ( + runCommand "singularity-image-${name}.img" { + buildInputs = [ singularity e2fsprogs utillinux gawk ]; + layerClosure = writeReferencesToFile layer; + preVM = vmTools.createEmptyImage { + size = diskSize; + fullName = "singularity-run-disk"; + }; + } + '' + rm -rf $out + mkdir disk + mkfs -t ext3 -b 4096 /dev/${vmTools.hd} + mount /dev/${vmTools.hd} disk + cd disk + + # Run root script + ${stdenv.lib.optionalString (runAsRoot != null) '' + mkdir -p ./${storeDir} + mount --rbind ${storeDir} ./${storeDir} + unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} + umount -R ./${storeDir} + ''} + + # Build /bin and copy across closure + mkdir -p bin nix/store + for f in $(cat $layerClosure) ; do + cp -ar $f ./$f + for f in $f/bin/* ; do + if [ ! -e bin/$(basename $f) ] ; then + ln -s $f bin/ + fi + done + done + + # Create runScript + ln -s ${runScriptFile} singularity + + # Size calculation + cd .. + umount disk + size=$(resize2fs -P /dev/${vmTools.hd} | awk '{print $NF}') + mount /dev/${vmTools.hd} disk + cd disk + + export PATH=$PATH:${e2fsprogs}/bin/ + singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + tar -c . | singularity import $out + ''); + + in result; +} diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix new file mode 100644 index 000000000000..df96241542de --- /dev/null +++ b/pkgs/data/fonts/go-font/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "go-font-${version}"; + version = "2016-11-17"; + + src = fetchgit { + url = "https://go.googlesource.com/image"; + rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f"; + sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/go-font + cp font/gofont/ttfs/* $out/share/fonts/truetype + mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE + ''; + + meta = with stdenv.lib; { + homepage = https://blog.golang.org/go-fonts; + description = "The Go font family"; + license = licenses.bsd3; + maintainers = with maintainers; [ sternenseemann ]; + platforms = stdenv.lib.platforms.all; + hydraPlatforms = []; + }; +} diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index ee637f880adf..fd3425e3c7c3 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ofl/mrbedford \ ofl/siamreap \ ofl/terminaldosislight + + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then + echo "error: duplicate font names" + exit 1 + fi ''; installPhase = '' diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index c8f7717103bc..7650c13961ee 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pecita-${version}"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8"; + sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; }; phases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 773aa74ce390..12f8c1c741e9 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, python2Packages, fontforge }: stdenv.mkDerivation rec { name = "xits-math-${version}"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg"; }; - phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); + + postPatch = '' + rm *.otf + ''; installPhase = '' mkdir -p $out/share/fonts/opentype @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/khaledhosny/xits-math; + homepage = "https://github.com/khaledhosny/xits-math"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix index 23cdf41d5c0b..3df800f402d4 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index e935552b9f5f..4facdbfd3e3c 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -307,7 +307,7 @@ let #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - anjuta = callPackage ./devtools/anjuta { }; + anjuta = callPackage ./devtools/anjuta { python=pkgs.python2; }; devhelp = callPackage ./devtools/devhelp { }; 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 1927585fd321..a827831c801c 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -1,6 +1,7 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 -, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: +, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup +, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy_idle ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg libxml2 ]; + telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; @@ -18,5 +19,6 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix index e1b81339e91e..0a177fbab31c 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 942bd5eb9779..91f43545b310 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -67,6 +67,8 @@ let # External packages kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {}; + ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { }; + libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { }; }; in packages diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index 666acf1a8cb4..845548c4f5bc 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' ) +WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index a8c984ad6457..f6f13a2f2e5e 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2067 +3,2067 @@ { akonadi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz"; - sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6"; - name = "akonadi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-16.08.3.tar.xz"; + sha256 = "1k967l551r4kzj2hyfikr7ky8n77rhcniscw7f8a42vmdxnr5jvy"; + name = "akonadi-16.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz"; - sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw"; - name = "akonadi-calendar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-calendar-16.08.3.tar.xz"; + sha256 = "1wh69vns5aw2av1hfcrz0gymqv8884xl0ss0yvcg9s478l550yj9"; + name = "akonadi-calendar-16.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz"; - sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l"; - name = "akonadi-contacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-contacts-16.08.3.tar.xz"; + sha256 = "12cdqkx7i7wahqf5zb4dxmbvzidvxw77imsjqaw0qw7jd5hnybmd"; + name = "akonadi-contacts-16.08.3.tar.xz"; }; }; akonadi-mime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz"; - sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld"; - name = "akonadi-mime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-mime-16.08.3.tar.xz"; + sha256 = "1jlsqlfyr1rl1ny2nyccwiqzs72fi2qzim3qg4j6749y3imi8rvx"; + name = "akonadi-mime-16.08.3.tar.xz"; }; }; akonadi-notes = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz"; - sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4"; - name = "akonadi-notes-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-notes-16.08.3.tar.xz"; + sha256 = "1fmpsqywpv4p65kdlisy5z57zba34h70djcdh3ch5rmmsxz75c0s"; + name = "akonadi-notes-16.08.3.tar.xz"; }; }; akonadi-search = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz"; - sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r"; - name = "akonadi-search-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-search-16.08.3.tar.xz"; + sha256 = "1whj5vzg33nlh756n5jcw2fj6yqf7wmq4lpvsj8k7hs9gnw7vqzd"; + name = "akonadi-search-16.08.3.tar.xz"; }; }; analitza = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz"; - sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h"; - name = "analitza-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/analitza-16.08.3.tar.xz"; + sha256 = "0q9336z6468qsw1rqlifagwppwanrnpr23srqqgifwi4wh25ky7q"; + name = "analitza-16.08.3.tar.xz"; }; }; ark = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz"; - sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8"; - name = "ark-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ark-16.08.3.tar.xz"; + sha256 = "021cjgw25zryjwmbslbnm5vg5ddgl5knxvqldrwjjhkqw2pzc4y7"; + name = "ark-16.08.3.tar.xz"; }; }; artikulate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz"; - sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h"; - name = "artikulate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/artikulate-16.08.3.tar.xz"; + sha256 = "0g5ya2cyjpnrzsccdqja1z6x5hh49a9r9m6c8408hv8bssigyvd1"; + name = "artikulate-16.08.3.tar.xz"; }; }; audiocd-kio = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz"; - sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv"; - name = "audiocd-kio-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/audiocd-kio-16.08.3.tar.xz"; + sha256 = "1d7qxp6v1g9rpjfh457hzi7h67d9550wa3fm4d4xja227zqqx63q"; + name = "audiocd-kio-16.08.3.tar.xz"; }; }; baloo-widgets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz"; - sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2"; - name = "baloo-widgets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/baloo-widgets-16.08.3.tar.xz"; + sha256 = "04zm0jfpvnq821kcjylac7g0zlwldkvxadmrvj9qy28vh4k8wi3m"; + name = "baloo-widgets-16.08.3.tar.xz"; }; }; blinken = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz"; - sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm"; - name = "blinken-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/blinken-16.08.3.tar.xz"; + sha256 = "0r71s877dhf3ib3hwhfl3k3ldz671dw6ym3jjnavp2pl6h0wc6hv"; + name = "blinken-16.08.3.tar.xz"; }; }; bomber = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz"; - sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9"; - name = "bomber-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bomber-16.08.3.tar.xz"; + sha256 = "1cqdv36s1y92hk9ghvm3ha67b1j7h7srv6cig6m5rvyaxpy2gw4f"; + name = "bomber-16.08.3.tar.xz"; }; }; bovo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz"; - sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7"; - name = "bovo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bovo-16.08.3.tar.xz"; + sha256 = "0z6ij7p0vckni0aa412ap8agcqrid98qif3c655m69hmw3arf6k9"; + name = "bovo-16.08.3.tar.xz"; }; }; calendarsupport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz"; - sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6"; - name = "calendarsupport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/calendarsupport-16.08.3.tar.xz"; + sha256 = "1r8v1sydragkf9gcvkc9rjlm9h7mah01ayw5pg8pjaxhbfsva8ad"; + name = "calendarsupport-16.08.3.tar.xz"; }; }; cantor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz"; - sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc"; - name = "cantor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cantor-16.08.3.tar.xz"; + sha256 = "0i2sd4vp7dvqjh41rr4wv9ij1jriyj9kn69z9i0iig389gwza0n7"; + name = "cantor-16.08.3.tar.xz"; }; }; cervisia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz"; - sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd"; - name = "cervisia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cervisia-16.08.3.tar.xz"; + sha256 = "14p6j8nzdjn2s4v0h5yj8r3yl89sq93z7naq2bifg7nxalazbz27"; + name = "cervisia-16.08.3.tar.xz"; }; }; dolphin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz"; - sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls"; - name = "dolphin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-16.08.3.tar.xz"; + sha256 = "0zqv75d06s7c59yx2w4dkr37mhafhwys4fqp44mpbf1x8yw1ijgx"; + name = "dolphin-16.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz"; - sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d"; - name = "dolphin-plugins-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-plugins-16.08.3.tar.xz"; + sha256 = "05rdq5zgp8px9gii4wnnf3qpwnv4h5i621q72ain0mpvapzb3q4v"; + name = "dolphin-plugins-16.08.3.tar.xz"; }; }; dragon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz"; - sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8"; - name = "dragon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dragon-16.08.3.tar.xz"; + sha256 = "0s94vnr9hz5gzgs555phwl9y9m9jw0ysimv56mh8n56f6ar9za5m"; + name = "dragon-16.08.3.tar.xz"; }; }; eventviews = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz"; - sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00"; - name = "eventviews-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/eventviews-16.08.3.tar.xz"; + sha256 = "1qsjmym821b7v81rxb9af30idny4zw3czzkqx3370wa6hbsma9b2"; + name = "eventviews-16.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz"; - sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0"; - name = "ffmpegthumbs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ffmpegthumbs-16.08.3.tar.xz"; + sha256 = "0j9c65kl6gh3j5g5jvjjx3hb3s5hcyzy6hz1fswp2v9sihaf7jrc"; + name = "ffmpegthumbs-16.08.3.tar.xz"; }; }; filelight = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz"; - sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins"; - name = "filelight-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/filelight-16.08.3.tar.xz"; + sha256 = "07hc63cabv237nq38x8dnjqnfpicw6czliar0yc66k37vhdxvkjh"; + name = "filelight-16.08.3.tar.xz"; }; }; gpgmepp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz"; - sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a"; - name = "gpgmepp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gpgmepp-16.08.3.tar.xz"; + sha256 = "0sda2ib5ymyzsji2v7aqdgfy6mhhfs6s3wyngb2k3q8hshv4xi5z"; + name = "gpgmepp-16.08.3.tar.xz"; }; }; granatier = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz"; - sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag"; - name = "granatier-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/granatier-16.08.3.tar.xz"; + sha256 = "07lhy7zbykhcnfyiymw6xhdpg8ng6xn0k3fca6afi16a0zk1hpnl"; + name = "granatier-16.08.3.tar.xz"; }; }; grantleetheme = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz"; - sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i"; - name = "grantleetheme-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/grantleetheme-16.08.3.tar.xz"; + sha256 = "1s2rz8ahm0dxij8v9czb1qcasp1igr20ipb4hc34y5ds9vmwrc7i"; + name = "grantleetheme-16.08.3.tar.xz"; }; }; gwenview = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz"; - sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2"; - name = "gwenview-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gwenview-16.08.3.tar.xz"; + sha256 = "122nd5chwf6mcj3d7wz0jwz9wrzw1dk5c29nb7k8kbapsrhs27x3"; + name = "gwenview-16.08.3.tar.xz"; }; }; incidenceeditor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz"; - sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym"; - name = "incidenceeditor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/incidenceeditor-16.08.3.tar.xz"; + sha256 = "03kfjkxmjjwb974gplqhwvjiw6cgvxziqzrn4jmk3di3nl954mxj"; + name = "incidenceeditor-16.08.3.tar.xz"; }; }; jovie = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz"; - sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s"; - name = "jovie-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/jovie-16.08.3.tar.xz"; + sha256 = "1lb3qnhdc2prrbi07gwvgx0bca2w4w5zwllp547h4lgjjc69s1mv"; + name = "jovie-16.08.3.tar.xz"; }; }; juk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz"; - sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw"; - name = "juk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/juk-16.08.3.tar.xz"; + sha256 = "1c83nm0rr6d67666pd1fynxgsxkhlfz1y3dkfm8mvxd7hx7164x3"; + name = "juk-16.08.3.tar.xz"; }; }; kaccessible = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz"; - sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg"; - name = "kaccessible-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccessible-16.08.3.tar.xz"; + sha256 = "0p2w862dkzngmryfj46xnam50gcv516igdgs8skcj9jw19gr828q"; + name = "kaccessible-16.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz"; - sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr"; - name = "kaccounts-integration-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-integration-16.08.3.tar.xz"; + sha256 = "03cf9nb2bxzx5kq0a94y1b1jj7ypidnpkcfbixdmkwfwwybrfm0w"; + name = "kaccounts-integration-16.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz"; - sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz"; - name = "kaccounts-providers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-providers-16.08.3.tar.xz"; + sha256 = "06ccw3ncliyhjwv2mv8yxmhxl161q51k740yilbgf3lz1qywn3bz"; + name = "kaccounts-providers-16.08.3.tar.xz"; }; }; kajongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz"; - sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73"; - name = "kajongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kajongg-16.08.3.tar.xz"; + sha256 = "0hkc50rd8yag9dlc27fp633fn1zf0g81d605d29n96kxj03shdah"; + name = "kajongg-16.08.3.tar.xz"; }; }; kalarmcal = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz"; - sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x"; - name = "kalarmcal-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalarmcal-16.08.3.tar.xz"; + sha256 = "06arrlsws3a3arsixd33dna2ghq4wywka3dmvgdl8g0cjrcm5c18"; + name = "kalarmcal-16.08.3.tar.xz"; }; }; kalgebra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz"; - sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg"; - name = "kalgebra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalgebra-16.08.3.tar.xz"; + sha256 = "0g5xqwbxmrhhxmhsi1d2sllnr9sg64pa3wrlhpwcag9l4rggl902"; + name = "kalgebra-16.08.3.tar.xz"; }; }; kalzium = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz"; - sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh"; - name = "kalzium-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalzium-16.08.3.tar.xz"; + sha256 = "1ywhn0rmqyl9cvzg4jybhl4bvllgbaj2j0cm2pd93ssnp2ispvnp"; + name = "kalzium-16.08.3.tar.xz"; }; }; kamera = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz"; - sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc"; - name = "kamera-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kamera-16.08.3.tar.xz"; + sha256 = "0lx0yqj0xd5878pb3nqfj0ibs3m78s1c3hx2hayny8i00nq2vm33"; + name = "kamera-16.08.3.tar.xz"; }; }; kanagram = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz"; - sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6"; - name = "kanagram-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kanagram-16.08.3.tar.xz"; + sha256 = "0bci8h83jww94yqv1i6xxznhi2r755fs29qxb85wmgcnff0bfmlj"; + name = "kanagram-16.08.3.tar.xz"; }; }; kapman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz"; - sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82"; - name = "kapman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapman-16.08.3.tar.xz"; + sha256 = "0fb6czdgpm19hgf3dpvj1hj7hh1zq226i00hi4qdakfwxpngxrav"; + name = "kapman-16.08.3.tar.xz"; }; }; kapptemplate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz"; - sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h"; - name = "kapptemplate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapptemplate-16.08.3.tar.xz"; + sha256 = "1f3zy1ffhhd3gn9pfmjf2igcka1xlik4vwmpxgb56gq5kw7y8glj"; + name = "kapptemplate-16.08.3.tar.xz"; }; }; kate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz"; - sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214"; - name = "kate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kate-16.08.3.tar.xz"; + sha256 = "0xsfak6bb7nzik6dk840xv37ys4pz58908zx76z7i4vl6yqyyjxy"; + name = "kate-16.08.3.tar.xz"; }; }; katomic = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz"; - sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6"; - name = "katomic-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/katomic-16.08.3.tar.xz"; + sha256 = "17q5gwd40vxamwbdrayfhayh2qbrm4i2y9hawx63dqdvc20ijj0z"; + name = "katomic-16.08.3.tar.xz"; }; }; kblackbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz"; - sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y"; - name = "kblackbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblackbox-16.08.3.tar.xz"; + sha256 = "0vpyclqzxafjnvlkkvg9czimqr9l610vnhlw11ia032haffq4qrf"; + name = "kblackbox-16.08.3.tar.xz"; }; }; kblocks = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz"; - sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v"; - name = "kblocks-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblocks-16.08.3.tar.xz"; + sha256 = "1bvhs8bmz7wsc4nz4bxns7i50b2r09kbwrqfn685c39l2zv60gp0"; + name = "kblocks-16.08.3.tar.xz"; }; }; kblog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz"; - sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9"; - name = "kblog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblog-16.08.3.tar.xz"; + sha256 = "19mh29xirx2rb6db5wxjd6am8wjx5mz0s0qszysrm7s9njsp2sqi"; + name = "kblog-16.08.3.tar.xz"; }; }; kbounce = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz"; - sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7"; - name = "kbounce-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbounce-16.08.3.tar.xz"; + sha256 = "0f2m8x2mi89y15hvlk9xzd2prgv4fwhal02avjz0b6swggrs8shg"; + name = "kbounce-16.08.3.tar.xz"; }; }; kbreakout = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz"; - sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h"; - name = "kbreakout-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbreakout-16.08.3.tar.xz"; + sha256 = "1rbyracpvvi4l9hn09k1w67cjkcnnnaqwr3maqj77mzh8wbsj1d3"; + name = "kbreakout-16.08.3.tar.xz"; }; }; kbruch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz"; - sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk"; - name = "kbruch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbruch-16.08.3.tar.xz"; + sha256 = "14yvildw0aji3lrb2xfafncqkwls3jjfvcbj1hi15gp3xxxr6s4z"; + name = "kbruch-16.08.3.tar.xz"; }; }; kcachegrind = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz"; - sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4"; - name = "kcachegrind-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcachegrind-16.08.3.tar.xz"; + sha256 = "1rjipi3x2yl9yplyksw66hrnrnscld0fsb8zsmf692x7gprb9wjd"; + name = "kcachegrind-16.08.3.tar.xz"; }; }; kcalc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz"; - sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm"; - name = "kcalc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalc-16.08.3.tar.xz"; + sha256 = "05ky1kvfk6n2qhqdwg9mlm0q5096776p8gvkh2nhzlajr4klzqdz"; + name = "kcalc-16.08.3.tar.xz"; }; }; kcalcore = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz"; - sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3"; - name = "kcalcore-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalcore-16.08.3.tar.xz"; + sha256 = "024n78zj10wlr2a50gh3fshlsb1maqbix5f4i66f26j3z2d2z7gc"; + name = "kcalcore-16.08.3.tar.xz"; }; }; kcalutils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz"; - sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7"; - name = "kcalutils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalutils-16.08.3.tar.xz"; + sha256 = "1wyq6hx1hilpk480h4c9j1hgj41s21nwcmm9b178143173p2pp5z"; + name = "kcalutils-16.08.3.tar.xz"; }; }; kcharselect = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz"; - sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy"; - name = "kcharselect-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcharselect-16.08.3.tar.xz"; + sha256 = "0wjwpqjck9k27xq1avz3l9ndi28kmcb05zvvf17jhsq9zmqr2lj8"; + name = "kcharselect-16.08.3.tar.xz"; }; }; kcolorchooser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz"; - sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i"; - name = "kcolorchooser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcolorchooser-16.08.3.tar.xz"; + sha256 = "0dk0f2xq4s85n0v3hfhiy0b3pkjvq4wz7pwc6h91kg50mm0mgjy0"; + name = "kcolorchooser-16.08.3.tar.xz"; }; }; kcontacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz"; - sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3"; - name = "kcontacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcontacts-16.08.3.tar.xz"; + sha256 = "01hip3p0f6br42lx89zcxmvrsqfclp0v8j7nzvrrzbdnn9x58b6w"; + name = "kcontacts-16.08.3.tar.xz"; }; }; kcron = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz"; - sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk"; - name = "kcron-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcron-16.08.3.tar.xz"; + sha256 = "16dbfil36b0kfdga118gbd1j6x7xd1x3hcc0ikhgysz8wzliaqs2"; + name = "kcron-16.08.3.tar.xz"; }; }; kde-baseapps = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz"; - sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10"; - name = "kde-baseapps-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz"; + sha256 = "18a2r2g5cz4s923p3369aam4qr00gsngk6nn4lk3k5a4qqavpsa7"; + name = "kde-baseapps-16.08.3.tar.xz"; }; }; kdebugsettings = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz"; - sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z"; - name = "kdebugsettings-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdebugsettings-16.08.3.tar.xz"; + sha256 = "0jc4kciaq69wiankz5krfsj4lf0r88msnqcr10k1byjm50b4qnpb"; + name = "kdebugsettings-16.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz"; - sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv"; - name = "kde-dev-scripts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-scripts-16.08.3.tar.xz"; + sha256 = "1g3c1wlv4rr9hxx1f6xiryswqprq1wq4lrlwx3gw3dmnpxwbnzld"; + name = "kde-dev-scripts-16.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz"; - sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1"; - name = "kde-dev-utils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-utils-16.08.3.tar.xz"; + sha256 = "1zzph1la4hgjqaryhm4dggsyv4gxwd0zgg5sw23v9qvp0z0hhzqf"; + name = "kde-dev-utils-16.08.3.tar.xz"; }; }; kdeedu-data = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz"; - sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b"; - name = "kdeedu-data-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdeedu-data-16.08.3.tar.xz"; + sha256 = "1c7svm52j05xxha4kb5zi81z5rgbj08cahpqwr8g7dszp5m8xals"; + name = "kdeedu-data-16.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz"; - sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy"; - name = "kdegraphics-mobipocket-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-mobipocket-16.08.3.tar.xz"; + sha256 = "0rbinw4r0bcxmkai2hb2p8zys654jybwgxigj4337s991l5zlrvd"; + name = "kdegraphics-mobipocket-16.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz"; - sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz"; - name = "kdegraphics-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-thumbnailers-16.08.3.tar.xz"; + sha256 = "1ygyhv20pyzfagkf25f6wshcvhyhamxxnrw075m11dg0hg3qlh9z"; + name = "kdegraphics-thumbnailers-16.08.3.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz"; - sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr"; - name = "kde-l10n-ar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ar-16.08.3.tar.xz"; + sha256 = "1ka2vq86g112gvfd4j2jl8dm8hvxjrn5cd2ddcagp3fg2rxm2si7"; + name = "kde-l10n-ar-16.08.3.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz"; - sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4"; - name = "kde-l10n-ast-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ast-16.08.3.tar.xz"; + sha256 = "02h7laxf4fsanb4scqgfrw815sj3dhvz4n17cdj8nvg4x7pydkys"; + name = "kde-l10n-ast-16.08.3.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz"; - sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy"; - name = "kde-l10n-bg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bg-16.08.3.tar.xz"; + sha256 = "0crhf9i43l8p0ds9v3k8ghgxrjc4c8gxwrs7afm6lmqh3lb3miz2"; + name = "kde-l10n-bg-16.08.3.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz"; - sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha"; - name = "kde-l10n-bs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bs-16.08.3.tar.xz"; + sha256 = "1ny1pcdl0xbm40c2jlzgvlkcmy1p2l9p14n827zipbj67by8dlh0"; + name = "kde-l10n-bs-16.08.3.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz"; - sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa"; - name = "kde-l10n-ca-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca-16.08.3.tar.xz"; + sha256 = "044l2z3n5vn4zbj7nby22f7pg5qcv16yzbgikck6jfdahn56c0d0"; + name = "kde-l10n-ca-16.08.3.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.2"; + version = "ca_valencia-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz"; - sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv"; - name = "kde-l10n-ca_valencia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca@valencia-16.08.3.tar.xz"; + sha256 = "1agmp003bdkhc8jx5124cs8yw73ga6b12gppaqwxl8c9cgd09yai"; + name = "kde-l10n-ca_valencia-16.08.3.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz"; - sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk"; - name = "kde-l10n-cs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-cs-16.08.3.tar.xz"; + sha256 = "0li4rnpns7wvxgrg9lxzimx7lxk2cl2w0zqk9g0c8zwqrrl64d23"; + name = "kde-l10n-cs-16.08.3.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz"; - sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q"; - name = "kde-l10n-da-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-da-16.08.3.tar.xz"; + sha256 = "14cpwl8p2n0bfj2hbbm9fv1i8r20xfrp16iy9kdym5x4k80c5lzc"; + name = "kde-l10n-da-16.08.3.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz"; - sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil"; - name = "kde-l10n-de-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-de-16.08.3.tar.xz"; + sha256 = "09sq6sbli9gjfkwqmcqjscbakxbnn2czb4d3pyni3v0i7x4xgmgl"; + name = "kde-l10n-de-16.08.3.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz"; - sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155"; - name = "kde-l10n-el-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-el-16.08.3.tar.xz"; + sha256 = "11vv237skajqc50dpcz0abn7xcly8a161yp56fn6zn1zdlcw4p02"; + name = "kde-l10n-el-16.08.3.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.2"; + version = "en_GB-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz"; - sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c"; - name = "kde-l10n-en_GB-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-en_GB-16.08.3.tar.xz"; + sha256 = "10anibggfqdp90d9jsv2n8aqk4wrgdq1pjxz60784f9bm1lq9xbx"; + name = "kde-l10n-en_GB-16.08.3.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz"; - sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0"; - name = "kde-l10n-eo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eo-16.08.3.tar.xz"; + sha256 = "15dhramx79rh6v7891fa878dikh74cx4knisrmg50ih5fgyr8rrm"; + name = "kde-l10n-eo-16.08.3.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz"; - sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b"; - name = "kde-l10n-es-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-es-16.08.3.tar.xz"; + sha256 = "0zshw10drqgsdcdlzci7ghpcmww69dr5nc8i9fakg9jj4pfblkv5"; + name = "kde-l10n-es-16.08.3.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz"; - sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv"; - name = "kde-l10n-et-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-et-16.08.3.tar.xz"; + sha256 = "04g4wvpmxrcma6dhw6py8xbhpxs4rsls69y98ljigd7y518ss6qa"; + name = "kde-l10n-et-16.08.3.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz"; - sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf"; - name = "kde-l10n-eu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eu-16.08.3.tar.xz"; + sha256 = "1gvgmlvc2qphy16y5m9xl0v6530909jzlvxfglamdwcchcc5rhj6"; + name = "kde-l10n-eu-16.08.3.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz"; - sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2"; - name = "kde-l10n-fa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fa-16.08.3.tar.xz"; + sha256 = "0ph0ssqjxi6g93kzg8p888s8258zdzpyaq712zcfhjcr7zx8ld32"; + name = "kde-l10n-fa-16.08.3.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz"; - sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x"; - name = "kde-l10n-fi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fi-16.08.3.tar.xz"; + sha256 = "0b7psgnc5mv38cx4iynacpq5q8nbvfm4fn6q9lwfj6x5h57xzd59"; + name = "kde-l10n-fi-16.08.3.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz"; - sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3"; - name = "kde-l10n-fr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fr-16.08.3.tar.xz"; + sha256 = "0q65wjjq4j1hg4bakbms2qamqqhqlchcbmy9fqc1aghbi3b871h8"; + name = "kde-l10n-fr-16.08.3.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz"; - sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn"; - name = "kde-l10n-ga-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ga-16.08.3.tar.xz"; + sha256 = "0drq7jxgdr01z75ybbalaxmr0r860f82i5ny1limnsqvmfh92p6b"; + name = "kde-l10n-ga-16.08.3.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz"; - sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl"; - name = "kde-l10n-gl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-gl-16.08.3.tar.xz"; + sha256 = "0y6vj77nkinii1bfw975lyhbjzvmd7r23pn29cz3l0p3bfd3yzkd"; + name = "kde-l10n-gl-16.08.3.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz"; - sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c"; - name = "kde-l10n-he-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-he-16.08.3.tar.xz"; + sha256 = "1q6q5rqvww1f29qfr3prd7fkxzvx7inf5wnzmla9kdnax7p9z3rs"; + name = "kde-l10n-he-16.08.3.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz"; - sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n"; - name = "kde-l10n-hi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hi-16.08.3.tar.xz"; + sha256 = "1qnncfg7vfw4ikcm23j1l6cmycg2m168d76h1fnznx4bdyfybblq"; + name = "kde-l10n-hi-16.08.3.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz"; - sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq"; - name = "kde-l10n-hr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hr-16.08.3.tar.xz"; + sha256 = "1kzl6fycifrmb2lil9vifas0jcczsw0aqpr2r6fjlvbw7p2zc42n"; + name = "kde-l10n-hr-16.08.3.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz"; - sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8"; - name = "kde-l10n-hu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hu-16.08.3.tar.xz"; + sha256 = "0kj5ivz7xw0a79rcprjp4bra90s12421ppbipvgnllc2rcixgkki"; + name = "kde-l10n-hu-16.08.3.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz"; - sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg"; - name = "kde-l10n-ia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ia-16.08.3.tar.xz"; + sha256 = "0cmv9jwbabaynx0wa1nhn9pgib60kg7b71ilcqhxnm5lqvws88pi"; + name = "kde-l10n-ia-16.08.3.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz"; - sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66"; - name = "kde-l10n-id-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-id-16.08.3.tar.xz"; + sha256 = "1zz3237l26fz7ca33l9dvq1b8kkdi4gdzqxqslkb10q36z2gsni1"; + name = "kde-l10n-id-16.08.3.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz"; - sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld"; - name = "kde-l10n-is-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-is-16.08.3.tar.xz"; + sha256 = "1mcwg8v08dv524ahhkv3wmnmac9pf534i45za9y0wl1kkcgp8949"; + name = "kde-l10n-is-16.08.3.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz"; - sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam"; - name = "kde-l10n-it-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-it-16.08.3.tar.xz"; + sha256 = "15k52l0mq7qclb4adwvcz4bngisbj476vlphqnjhnav9nj5cm84f"; + name = "kde-l10n-it-16.08.3.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz"; - sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp"; - name = "kde-l10n-ja-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ja-16.08.3.tar.xz"; + sha256 = "0p6nd7hlv6yvxi5y808wzjbidk1gpa2fj50i66lxzq3xl7rajli3"; + name = "kde-l10n-ja-16.08.3.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz"; - sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z"; - name = "kde-l10n-kk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-kk-16.08.3.tar.xz"; + sha256 = "0ffnlmq2qnmcqk9h4yvl0z00x2f5yyicg1qf1jlxk9fvhbg5xpmv"; + name = "kde-l10n-kk-16.08.3.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz"; - sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa"; - name = "kde-l10n-km-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-km-16.08.3.tar.xz"; + sha256 = "1ln9dc278sv9r99psy27m1qhbyaw6dzg3kwr11pbp517253ggj7j"; + name = "kde-l10n-km-16.08.3.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz"; - sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k"; - name = "kde-l10n-ko-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ko-16.08.3.tar.xz"; + sha256 = "07lbblm4aqj7jp25clz7sil9ficrbvwpd9pvpfrz530q8y74hsjf"; + name = "kde-l10n-ko-16.08.3.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz"; - sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b"; - name = "kde-l10n-lt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lt-16.08.3.tar.xz"; + sha256 = "1cssd4z8dxlld61kakb6vnb5hksswl1dkr1bsxv5q622hjrp037c"; + name = "kde-l10n-lt-16.08.3.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz"; - sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw"; - name = "kde-l10n-lv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lv-16.08.3.tar.xz"; + sha256 = "0wnrcfgm5l3ifnywz67k186g5vh0648dhmymfcz6fmqf3ipfl4h4"; + name = "kde-l10n-lv-16.08.3.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz"; - sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj"; - name = "kde-l10n-mr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-mr-16.08.3.tar.xz"; + sha256 = "0kkwpn12z1f8rs91yqh8x155nbrkwgj1z5fx4kcs1nc7xyvfpbff"; + name = "kde-l10n-mr-16.08.3.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz"; - sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j"; - name = "kde-l10n-nb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nb-16.08.3.tar.xz"; + sha256 = "0070dgr1apn345a8bwgbxiz2a0andmfx54vd5pv3hgj6n9jrmq07"; + name = "kde-l10n-nb-16.08.3.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz"; - sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap"; - name = "kde-l10n-nds-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nds-16.08.3.tar.xz"; + sha256 = "103wfwl18fmz8h184c3qcwfyh784pfzsd2dgd000xs28pcc5kc22"; + name = "kde-l10n-nds-16.08.3.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz"; - sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4"; - name = "kde-l10n-nl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nl-16.08.3.tar.xz"; + sha256 = "1zjnzcpivcs26qp5h153jd1qr98dnr1f8347cb9iz79q41zjn21z"; + name = "kde-l10n-nl-16.08.3.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz"; - sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj"; - name = "kde-l10n-nn-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nn-16.08.3.tar.xz"; + sha256 = "1lm701iml2sfzp2dz5nlh6kflp3lfbcsdlipk9wwsqnjs3zr436y"; + name = "kde-l10n-nn-16.08.3.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz"; - sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z"; - name = "kde-l10n-pa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pa-16.08.3.tar.xz"; + sha256 = "0j6dyfg8vw1dj226ngxd4yb2qfnj4g7c36cfmmmlfr9d8ds8xw0p"; + name = "kde-l10n-pa-16.08.3.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz"; - sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x"; - name = "kde-l10n-pl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pl-16.08.3.tar.xz"; + sha256 = "0nr7vxw4d0z8g51zls46r3kbm0dfbry09cpmahdpk6zlgcvlg5zz"; + name = "kde-l10n-pl-16.08.3.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz"; - sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq"; - name = "kde-l10n-pt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt-16.08.3.tar.xz"; + sha256 = "0il1gwr9jl8z2lp9j7zb18x7kbzcv6p37kbww5l6xr3gc744fiaf"; + name = "kde-l10n-pt-16.08.3.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.2"; + version = "pt_BR-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz"; - sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s"; - name = "kde-l10n-pt_BR-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt_BR-16.08.3.tar.xz"; + sha256 = "0b5m5p19n6a9mclvhh5p2s6k0vjwspnal223ddc0xk34060f4ch7"; + name = "kde-l10n-pt_BR-16.08.3.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz"; - sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw"; - name = "kde-l10n-ro-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ro-16.08.3.tar.xz"; + sha256 = "08nanwr2s37215kkik8issn9va65dxlam55lfabybvybw6b0s7x5"; + name = "kde-l10n-ro-16.08.3.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz"; - sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba"; - name = "kde-l10n-ru-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ru-16.08.3.tar.xz"; + sha256 = "1xbssbm3za3y0fh02j62s94vkz1nfdl37g458h1qagyawm04vwdq"; + name = "kde-l10n-ru-16.08.3.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz"; - sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs"; - name = "kde-l10n-sk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sk-16.08.3.tar.xz"; + sha256 = "0ixqh1xj3nqwq7nsxhk4c7d5w8n77plld4ap4brd4r188pfswvdr"; + name = "kde-l10n-sk-16.08.3.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz"; - sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm"; - name = "kde-l10n-sl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sl-16.08.3.tar.xz"; + sha256 = "0d4n5sp82jfap0cq167ybqsvyp06vla8y3clma25cyyksk9r355w"; + name = "kde-l10n-sl-16.08.3.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz"; - sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30"; - name = "kde-l10n-sr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sr-16.08.3.tar.xz"; + sha256 = "1bb2dbkb80q2y7s9nka8x4q8cc6lqx7ddry83rp97sia1fckgn6g"; + name = "kde-l10n-sr-16.08.3.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz"; - sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld"; - name = "kde-l10n-sv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sv-16.08.3.tar.xz"; + sha256 = "1n7dj3alqf59b4n9ckhk35pw5qvlkbw70bw48b2mzsh6rm9l6njs"; + name = "kde-l10n-sv-16.08.3.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz"; - sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54"; - name = "kde-l10n-tr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-tr-16.08.3.tar.xz"; + sha256 = "0k1lwngg5v4wzc8imx33q68cdva4f61jqfibjrza4sf6la69vr6p"; + name = "kde-l10n-tr-16.08.3.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz"; - sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv"; - name = "kde-l10n-ug-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ug-16.08.3.tar.xz"; + sha256 = "1xi90k2ghgz9fh3lb1l7pbnmz17bi5mvyvg7dwwm3ni7q4k696lf"; + name = "kde-l10n-ug-16.08.3.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz"; - sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm"; - name = "kde-l10n-uk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-uk-16.08.3.tar.xz"; + sha256 = "114snhzp2v6fp7glvwbjd97byzfisp94zr2ia5np5xcpfkpww9g7"; + name = "kde-l10n-uk-16.08.3.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz"; - sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63"; - name = "kde-l10n-wa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-wa-16.08.3.tar.xz"; + sha256 = "1qimv935j50sb7n7x4ga10x4zkasn9yddh1drs0k5i7r02sq8nzv"; + name = "kde-l10n-wa-16.08.3.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.2"; + version = "zh_CN-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz"; - sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7"; - name = "kde-l10n-zh_CN-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_CN-16.08.3.tar.xz"; + sha256 = "024y7lvjkx8djwd9qmjkj3q9ri3fbnlsxcyjr5jy5yi10ccwf9v6"; + name = "kde-l10n-zh_CN-16.08.3.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.2"; + version = "zh_TW-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz"; - sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj"; - name = "kde-l10n-zh_TW-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_TW-16.08.3.tar.xz"; + sha256 = "1m5npa3jrsc0kn3mqkp3pagix95ialpk4fikbiq44laxn7xph5yi"; + name = "kde-l10n-zh_TW-16.08.3.tar.xz"; }; }; kdelibs = { - version = "4.14.25"; + version = "4.14.26"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz"; - sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds"; - name = "kdelibs-4.14.25.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdelibs-4.14.26.tar.xz"; + sha256 = "043asa5i30s3j1knpshhxw1a5a1alh1b5b719gdzpm1hxgn3f79r"; + name = "kdelibs-4.14.26.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz"; - sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9"; - name = "kdenetwork-filesharing-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenetwork-filesharing-16.08.3.tar.xz"; + sha256 = "0zfswqxh0ng5w44hzfpsjhmnv7nf1jc3qfmfvmmlb0h1ynfdbqmy"; + name = "kdenetwork-filesharing-16.08.3.tar.xz"; }; }; kdenlive = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz"; - sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l"; - name = "kdenlive-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenlive-16.08.3.tar.xz"; + sha256 = "0s5bdb5xxjaqb7zmvm119mc7zacagglv21dd4v6sahg0mf1qvfin"; + name = "kdenlive-16.08.3.tar.xz"; }; }; kdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz"; - sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2"; - name = "kdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz"; + sha256 = "1l0rvi33i9hzr9c3nqzbr3cnz046ccf7s3v54mdmxfdk5x0ynkms"; + name = "kdepim-16.08.3.tar.xz"; }; }; kdepim-addons = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz"; - sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx"; - name = "kdepim-addons-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-addons-16.08.3.tar.xz"; + sha256 = "0ddhya9f6hbdakdna4hnbwiwvc1ar95jgxhr36hf6s37bxh7755l"; + name = "kdepim-addons-16.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz"; - sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82"; - name = "kdepim-apps-libs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-apps-libs-16.08.3.tar.xz"; + sha256 = "1ygdmv30pzrgv3f222nv52mvc83ags9dvwl2ma4l8frb13xb1r15"; + name = "kdepim-apps-libs-16.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz"; - sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb"; - name = "kdepim-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-runtime-16.08.3.tar.xz"; + sha256 = "1q7d2c1rjli5dl162zibzhmg2q4hxxlqjp7r78amq90vhv975kc6"; + name = "kdepim-runtime-16.08.3.tar.xz"; }; }; kde-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz"; - sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205"; - name = "kde-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-runtime-16.08.3.tar.xz"; + sha256 = "1g5ni75byraf9268p0n74i81zb46agp9ac243m8jfzh8vdm2q5kk"; + name = "kde-runtime-16.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz"; - sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2"; - name = "kdesdk-kioslaves-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-kioslaves-16.08.3.tar.xz"; + sha256 = "12q015nm9qfcscsvqrkibj1cfh651890k982sbqqdn0dm5932lnj"; + name = "kdesdk-kioslaves-16.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz"; - sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l"; - name = "kdesdk-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-thumbnailers-16.08.3.tar.xz"; + sha256 = "1dy4566pdx890n60sn5v7hms2prjh674pm6gbxg1il4i4qcpfv4z"; + name = "kdesdk-thumbnailers-16.08.3.tar.xz"; }; }; kdewebdev = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz"; - sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy"; - name = "kdewebdev-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz"; + sha256 = "0r9qsm3idfhm7aglik7whzcwjjn572gwmlcgxy2cvpn15nqa344l"; + name = "kdewebdev-16.08.3.tar.xz"; }; }; kdf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz"; - sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7"; - name = "kdf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdf-16.08.3.tar.xz"; + sha256 = "1fkjmdwp5pnlvz2mac4zq93wnb6jj4ymj4448qbhxypncrh6sym3"; + name = "kdf-16.08.3.tar.xz"; }; }; kdgantt2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz"; - sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp"; - name = "kdgantt2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdgantt2-16.08.3.tar.xz"; + sha256 = "01p3cqqhghvx42mrmxkrsm7cp23972gi86sagjw070scw71fpv0c"; + name = "kdgantt2-16.08.3.tar.xz"; }; }; kdiamond = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz"; - sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq"; - name = "kdiamond-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdiamond-16.08.3.tar.xz"; + sha256 = "035m2911zbkvhydihaqbgwl7vs8z03hcsq8ph7wvnsdvd1f895ib"; + name = "kdiamond-16.08.3.tar.xz"; }; }; kfloppy = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz"; - sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb"; - name = "kfloppy-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfloppy-16.08.3.tar.xz"; + sha256 = "14y9a8nq2cdaj5r6xdqwfm6fa8w3wbx80hrps2bkxyx696hc1lkl"; + name = "kfloppy-16.08.3.tar.xz"; }; }; kfourinline = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz"; - sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b"; - name = "kfourinline-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfourinline-16.08.3.tar.xz"; + sha256 = "04wpswi9c7c79g4sz6cr7jrdmdfwwqr2p8kd0zs2snygcr4h3fcq"; + name = "kfourinline-16.08.3.tar.xz"; }; }; kgeography = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz"; - sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki"; - name = "kgeography-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgeography-16.08.3.tar.xz"; + sha256 = "09hsihvvdzbr1dz8zlwy7nyjk87pl7f714k3k3b0b0wpx9swxkq0"; + name = "kgeography-16.08.3.tar.xz"; }; }; kget = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz"; - sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6"; - name = "kget-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kget-16.08.3.tar.xz"; + sha256 = "1709if0yqp0axy88v56zrchirkcjgl8q38qf0zbfng0bbbszik61"; + name = "kget-16.08.3.tar.xz"; }; }; kgoldrunner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz"; - sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c"; - name = "kgoldrunner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgoldrunner-16.08.3.tar.xz"; + sha256 = "03g3j1zrq3513jijnl3ih61xkpxl4mqy6mjmilq5cs745bmzkad4"; + name = "kgoldrunner-16.08.3.tar.xz"; }; }; kgpg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz"; - sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll"; - name = "kgpg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgpg-16.08.3.tar.xz"; + sha256 = "17kr13lvicv4lrl4ls4l66xh35xz60nrszwagb0qk34wcgzc090p"; + name = "kgpg-16.08.3.tar.xz"; }; }; khangman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz"; - sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk"; - name = "khangman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khangman-16.08.3.tar.xz"; + sha256 = "1ipkp003pp6z783qb7fzhky3kn4ccmlqijxysk7ccbsr9myfvdyk"; + name = "khangman-16.08.3.tar.xz"; }; }; khelpcenter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz"; - sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr"; - name = "khelpcenter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khelpcenter-16.08.3.tar.xz"; + sha256 = "13vzqjaqqzi46c9gmijhbq1i3fmk3pbkkg26mn3745m2xc6j2cvi"; + name = "khelpcenter-16.08.3.tar.xz"; }; }; kholidays = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz"; - sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6"; - name = "kholidays-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kholidays-16.08.3.tar.xz"; + sha256 = "0hxb2c526vw8rvfp14snvwihsqvr1l30vnzhxznl3dhm44lmvdn9"; + name = "kholidays-16.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz"; - sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny"; - name = "kidentitymanagement-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kidentitymanagement-16.08.3.tar.xz"; + sha256 = "0vv1y0mwxlb4g5a01jgi1nizw530w0fhy0kab6syxzgmnibj6vsf"; + name = "kidentitymanagement-16.08.3.tar.xz"; }; }; kig = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz"; - sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn"; - name = "kig-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kig-16.08.3.tar.xz"; + sha256 = "1ln2i322ara79f90rwrcv5xfa0cnkksyhj25h2xn9x7d5ig4by96"; + name = "kig-16.08.3.tar.xz"; }; }; kigo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz"; - sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i"; - name = "kigo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kigo-16.08.3.tar.xz"; + sha256 = "0vz7329i8pfax9nxb7xc0yws4f3mn4ms93358wvhyblbma4zaf4l"; + name = "kigo-16.08.3.tar.xz"; }; }; killbots = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz"; - sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks"; - name = "killbots-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/killbots-16.08.3.tar.xz"; + sha256 = "08f9gvvy3sx7ibikgxzjawfzzznfig8dfmgmfczj56fys7rvh2y5"; + name = "killbots-16.08.3.tar.xz"; }; }; kimap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz"; - sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g"; - name = "kimap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kimap-16.08.3.tar.xz"; + sha256 = "03nl3q8cv92jpdgdg8pfhwzwlkqpcpz13p6p4q47vvmgglp63qnw"; + name = "kimap-16.08.3.tar.xz"; }; }; kio-extras = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz"; - sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q"; - name = "kio-extras-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kio-extras-16.08.3.tar.xz"; + sha256 = "1rd5ks73vqf6x4rs0qjsy0ipl6lgxgwqbwmcxar5m50b5jksl4xk"; + name = "kio-extras-16.08.3.tar.xz"; }; }; kiriki = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz"; - sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a"; - name = "kiriki-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiriki-16.08.3.tar.xz"; + sha256 = "0n37mmkq1jmdh3jlrjzmb88cnbnwzcjbp2dy6mz4f5iliv9ws54v"; + name = "kiriki-16.08.3.tar.xz"; }; }; kiten = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz"; - sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd"; - name = "kiten-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiten-16.08.3.tar.xz"; + sha256 = "0qds7c62jsgf5lyx2sjhw5xxxq7qh35ccpvpc7l004g4blwb7mna"; + name = "kiten-16.08.3.tar.xz"; }; }; kjumpingcube = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz"; - sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r"; - name = "kjumpingcube-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kjumpingcube-16.08.3.tar.xz"; + sha256 = "1lv6irlvfpbpbhk3vazv07frwz3y7084y3hirdjb2xih8gbsljrm"; + name = "kjumpingcube-16.08.3.tar.xz"; }; }; kldap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz"; - sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4"; - name = "kldap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kldap-16.08.3.tar.xz"; + sha256 = "1h4czdxw0p4lakx0j0pf2v13ny5lnc56jhhjjb9ddm44b50fg4vg"; + name = "kldap-16.08.3.tar.xz"; }; }; kleopatra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz"; - sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb"; - name = "kleopatra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kleopatra-16.08.3.tar.xz"; + sha256 = "0ncr4sc6qs50n1w85gf350iq9l28665is53jzbm288151zanp4dd"; + name = "kleopatra-16.08.3.tar.xz"; }; }; klettres = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz"; - sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi"; - name = "klettres-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klettres-16.08.3.tar.xz"; + sha256 = "14m1k0y1lbkqrpwnjx8020d23fmpgq0jg97hr4q8fzs4h71lpyr7"; + name = "klettres-16.08.3.tar.xz"; }; }; klickety = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz"; - sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5"; - name = "klickety-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klickety-16.08.3.tar.xz"; + sha256 = "0izkwi0h2mc204wsmyg5hspnnc3xa8ypdzbw1rwgsd8nxv3sphbv"; + name = "klickety-16.08.3.tar.xz"; }; }; klines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz"; - sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds"; - name = "klines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klines-16.08.3.tar.xz"; + sha256 = "0p1pbljqp01g9ssih5aplsi97aszc68smkpilbazxfvwc4q3x1ag"; + name = "klines-16.08.3.tar.xz"; }; }; kmag = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz"; - sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq"; - name = "kmag-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmag-16.08.3.tar.xz"; + sha256 = "0ph7zf1awj47wzvp5dq80rvx0himrk6s8qhmnjvgpm0nqyfv7xh0"; + name = "kmag-16.08.3.tar.xz"; }; }; kmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz"; - sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13"; - name = "kmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmahjongg-16.08.3.tar.xz"; + sha256 = "0fxkbq1p174lppklvi5lzmgi3g7411nhi33fsmdmwyxbngrm4yih"; + name = "kmahjongg-16.08.3.tar.xz"; }; }; kmailtransport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz"; - sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90"; - name = "kmailtransport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmailtransport-16.08.3.tar.xz"; + sha256 = "08xi04xr7mjg8m2bnp42ymvn9ynv4q8y3dnql1v4225pjzmp6bkg"; + name = "kmailtransport-16.08.3.tar.xz"; }; }; kmbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz"; - sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62"; - name = "kmbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmbox-16.08.3.tar.xz"; + sha256 = "0iaqq4mrfj4qqaj76i7crjriyjsk3h6rf3cisygvkkfyyb69nz17"; + name = "kmbox-16.08.3.tar.xz"; }; }; kmime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz"; - sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch"; - name = "kmime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmime-16.08.3.tar.xz"; + sha256 = "0j9nfsmfl1sw9hz3al9smxri1hr58ygmyxawlr91iyglzswxaakb"; + name = "kmime-16.08.3.tar.xz"; }; }; kmines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz"; - sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965"; - name = "kmines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmines-16.08.3.tar.xz"; + sha256 = "0rnjdds4skxj9pxajfnybki4ikq99k5myaw80qk5dc08gnrmw4fz"; + name = "kmines-16.08.3.tar.xz"; }; }; kmix = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz"; - sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290"; - name = "kmix-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmix-16.08.3.tar.xz"; + sha256 = "1p3gcll4ywwxwphygrwqrp1565va52q8nnccyxisd3h833lqfk3k"; + name = "kmix-16.08.3.tar.xz"; }; }; kmousetool = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz"; - sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh"; - name = "kmousetool-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmousetool-16.08.3.tar.xz"; + sha256 = "1iihk8jcysz49q3a5nnn0s468yca1x7chwqpvqqr694fn3wizkfg"; + name = "kmousetool-16.08.3.tar.xz"; }; }; kmouth = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz"; - sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8"; - name = "kmouth-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmouth-16.08.3.tar.xz"; + sha256 = "1km072jnp5cc3ib4ja0lxd29pspi9wyhbp8bgcph5m33kw2n3cbq"; + name = "kmouth-16.08.3.tar.xz"; }; }; kmplot = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz"; - sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf"; - name = "kmplot-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmplot-16.08.3.tar.xz"; + sha256 = "0lv2jfg6klm3z9mpp298g1d7vxff5hdaj332pzblvp2m51sbhrdv"; + name = "kmplot-16.08.3.tar.xz"; }; }; knavalbattle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz"; - sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269"; - name = "knavalbattle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knavalbattle-16.08.3.tar.xz"; + sha256 = "1kjndhwc4l4rspygaxdr8dj9s9rj8ayq1k0z7r8v5qz2355farc8"; + name = "knavalbattle-16.08.3.tar.xz"; }; }; knetwalk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz"; - sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3"; - name = "knetwalk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knetwalk-16.08.3.tar.xz"; + sha256 = "18l80ffcavy9q7sj396qj4xw1yghljl24762ygd9q0kmmanw4h8y"; + name = "knetwalk-16.08.3.tar.xz"; }; }; kolf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz"; - sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg"; - name = "kolf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolf-16.08.3.tar.xz"; + sha256 = "15gggr983pcz44q44m1yvkbyp5kwbmpyx3ijb2yxx1bvn4d5bp85"; + name = "kolf-16.08.3.tar.xz"; }; }; kollision = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz"; - sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216"; - name = "kollision-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kollision-16.08.3.tar.xz"; + sha256 = "18kvvl87ykkrhjikq53rgj53ap73x2wld6b4aryd4jrwmj5wby39"; + name = "kollision-16.08.3.tar.xz"; }; }; kolourpaint = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz"; - sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9"; - name = "kolourpaint-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolourpaint-16.08.3.tar.xz"; + sha256 = "0igv18nrhwhylvm7nr4mfvyp2bpcgn6c3r8r61rrsl908qmv4byv"; + name = "kolourpaint-16.08.3.tar.xz"; }; }; kompare = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz"; - sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw"; - name = "kompare-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kompare-16.08.3.tar.xz"; + sha256 = "1ji33dhbak38w0b9dlrv1v4kh5lyp5pm2v77v0lka71l75cvc7g7"; + name = "kompare-16.08.3.tar.xz"; }; }; konquest = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz"; - sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m"; - name = "konquest-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konquest-16.08.3.tar.xz"; + sha256 = "1b8fx5k6fncw82d6i8kc07qk2k4y4fwdvwlqn2pxdixp3fk1fj12"; + name = "konquest-16.08.3.tar.xz"; }; }; konsole = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz"; - sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85"; - name = "konsole-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konsole-16.08.3.tar.xz"; + sha256 = "09s8y3w2mrifpl9pfjrzf0q5fgfcdph0s8x85y7262mikwvqfx36"; + name = "konsole-16.08.3.tar.xz"; }; }; kontactinterface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz"; - sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw"; - name = "kontactinterface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kontactinterface-16.08.3.tar.xz"; + sha256 = "1kw04ixc6blmygi3wyyk8a3qnyd0a9d85r2jql3mzhz5gczik7b8"; + name = "kontactinterface-16.08.3.tar.xz"; }; }; kopete = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz"; - sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c"; - name = "kopete-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kopete-16.08.3.tar.xz"; + sha256 = "0ia43yqmb802nqjlklgpyqy5pnkp9mlr7hhic0lmgvr0jyid43pz"; + name = "kopete-16.08.3.tar.xz"; }; }; kpat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz"; - sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2"; - name = "kpat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpat-16.08.3.tar.xz"; + sha256 = "1jb7a5ii8qvaqvivbd0hn2vxn9l9s83ahrx8idnlhqj1yriyhyqa"; + name = "kpat-16.08.3.tar.xz"; }; }; kpimtextedit = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz"; - sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv"; - name = "kpimtextedit-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpimtextedit-16.08.3.tar.xz"; + sha256 = "0bkf43i7wdyign63gwz2215dr66zfpy43f8pszif5jqzlnc84kba"; + name = "kpimtextedit-16.08.3.tar.xz"; }; }; kppp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz"; - sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv"; - name = "kppp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kppp-16.08.3.tar.xz"; + sha256 = "04pszpig2dyvrprfkalxhfad3d9v5sl8sjb3r403wmvd701xbknh"; + name = "kppp-16.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz"; - sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6"; - name = "kqtquickcharts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kqtquickcharts-16.08.3.tar.xz"; + sha256 = "1kdd0n6a8v4paya9xw8si8c60k448mrgwz163qa3w54ylxmh2xqb"; + name = "kqtquickcharts-16.08.3.tar.xz"; }; }; krdc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz"; - sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn"; - name = "krdc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krdc-16.08.3.tar.xz"; + sha256 = "00kvijidg387wp1wv8brhdbhc3daa06n2k2vn0cfyh18s815mwbs"; + name = "krdc-16.08.3.tar.xz"; }; }; kremotecontrol = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz"; - sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg"; - name = "kremotecontrol-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kremotecontrol-16.08.3.tar.xz"; + sha256 = "0h2cjc10s876clsap93blmgbv75vxkjlpkns7n14420mz45j7aga"; + name = "kremotecontrol-16.08.3.tar.xz"; }; }; kreversi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz"; - sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7"; - name = "kreversi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kreversi-16.08.3.tar.xz"; + sha256 = "0dpk6jnn6sqqn8xagy3dsvf6c4irir0l8pfp3xjr3s6hx3jbgqn9"; + name = "kreversi-16.08.3.tar.xz"; }; }; krfb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz"; - sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9"; - name = "krfb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krfb-16.08.3.tar.xz"; + sha256 = "0kgm1wpxnjr79w2mqq6q5mg2ajzlim9c83030jdzqd5dr1y8gvdl"; + name = "krfb-16.08.3.tar.xz"; }; }; kross-interpreters = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz"; - sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj"; - name = "kross-interpreters-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kross-interpreters-16.08.3.tar.xz"; + sha256 = "1629b9ihg3g5d0p5a0f7igfsmwn45jlsy7gqbdmrwzlbynrbq0jv"; + name = "kross-interpreters-16.08.3.tar.xz"; }; }; kruler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz"; - sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l"; - name = "kruler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kruler-16.08.3.tar.xz"; + sha256 = "0awhsaysqsgnvmflrz4svd2vbnmhykb6cfn2331mphv4ycyi0zyf"; + name = "kruler-16.08.3.tar.xz"; }; }; ksaneplugin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz"; - sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g"; - name = "ksaneplugin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksaneplugin-16.08.3.tar.xz"; + sha256 = "0hg1xw45x6xk8q893hm72skhhm4p1v1afbvdxqasaggl6l8765xh"; + name = "ksaneplugin-16.08.3.tar.xz"; }; }; kscd = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz"; - sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq"; - name = "kscd-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kscd-16.08.3.tar.xz"; + sha256 = "1dyh79x5zgc20f18hysvmnfpg7f2wxjssracyihg2b8cyhzz2g70"; + name = "kscd-16.08.3.tar.xz"; }; }; kshisen = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz"; - sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp"; - name = "kshisen-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kshisen-16.08.3.tar.xz"; + sha256 = "0xmjk6pij18sf3mq8hp3fmcvhqdx6l44hvk6nmp6v4y7fxw3fry4"; + name = "kshisen-16.08.3.tar.xz"; }; }; ksirk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz"; - sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx"; - name = "ksirk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksirk-16.08.3.tar.xz"; + sha256 = "0bwnlfa162n6a5kxzbbxwgxj7rgpi5zqaj0arqwlq075b1kyfniq"; + name = "ksirk-16.08.3.tar.xz"; }; }; ksnakeduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz"; - sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5"; - name = "ksnakeduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksnakeduel-16.08.3.tar.xz"; + sha256 = "1g26ip287fnlv95vmk69ji76mr8lpnjrgj855rdi64p16wxwirjp"; + name = "ksnakeduel-16.08.3.tar.xz"; }; }; kspaceduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz"; - sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8"; - name = "kspaceduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kspaceduel-16.08.3.tar.xz"; + sha256 = "0ycfw4mr25apr21ffxv0pdxbrda09k4him19hck3yjkkhgwzq7a0"; + name = "kspaceduel-16.08.3.tar.xz"; }; }; ksquares = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz"; - sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil"; - name = "ksquares-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksquares-16.08.3.tar.xz"; + sha256 = "1x7gj4bxq2aza2cis3br2y20nbljx4n988f70wark9ywz8hydg5z"; + name = "ksquares-16.08.3.tar.xz"; }; }; kstars = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz"; - sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x"; - name = "kstars-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kstars-16.08.3.tar.xz"; + sha256 = "1a86zqbwp9vwbf1xd7j5a90krcyn2gps38g57hi8dvblx8qlfv4m"; + name = "kstars-16.08.3.tar.xz"; }; }; ksudoku = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz"; - sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd"; - name = "ksudoku-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksudoku-16.08.3.tar.xz"; + sha256 = "0fjlw7krvi3z1aaiivzkbl2hya2fv2gwfahckfbs05vs0br288iy"; + name = "ksudoku-16.08.3.tar.xz"; }; }; ksystemlog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz"; - sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb"; - name = "ksystemlog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksystemlog-16.08.3.tar.xz"; + sha256 = "1c5xb9m4k5hwz5fv6hvigp12cykgcrkc95axaxhfvas0g9z226hq"; + name = "ksystemlog-16.08.3.tar.xz"; }; }; kteatime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz"; - sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd"; - name = "kteatime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kteatime-16.08.3.tar.xz"; + sha256 = "0af9dvwihq3dj5zps8d9ahx6zvp9ifwhiswk6v0w887vyf5nym36"; + name = "kteatime-16.08.3.tar.xz"; }; }; ktimer = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz"; - sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8"; - name = "ktimer-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktimer-16.08.3.tar.xz"; + sha256 = "0yyc6hykfz3smznskldn192zpjli3dfjkkqp3h5akwaag2fkzds9"; + name = "ktimer-16.08.3.tar.xz"; }; }; ktnef = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz"; - sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39"; - name = "ktnef-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktnef-16.08.3.tar.xz"; + sha256 = "0c1zzn18gxyd6wxvwxw36jbas1hccyfyk44nxpqjfs7g1wpzzg3q"; + name = "ktnef-16.08.3.tar.xz"; }; }; ktouch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz"; - sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2"; - name = "ktouch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktouch-16.08.3.tar.xz"; + sha256 = "0pjdj9idqizvnw3ld3kp27cx92s033kp9mv8wrf0f9rvzp4q8iny"; + name = "ktouch-16.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz"; - sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm"; - name = "ktp-accounts-kcm-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-accounts-kcm-16.08.3.tar.xz"; + sha256 = "0g3l2s3kmy4k7gkx5gvdcfvx9szr33cxj3g21qzyy0kga381gxzm"; + name = "ktp-accounts-kcm-16.08.3.tar.xz"; }; }; ktp-approver = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz"; - sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9"; - name = "ktp-approver-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-approver-16.08.3.tar.xz"; + sha256 = "1k4g6vidi0xxl3gijc502lzmrnk7aqvjc0gdzy0f21avbk8j7hq2"; + name = "ktp-approver-16.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz"; - sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx"; - name = "ktp-auth-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-auth-handler-16.08.3.tar.xz"; + sha256 = "1hda8xgi60avy65x8pwh76xa4h2li2awrwjnndk45zca8ysr1rnw"; + name = "ktp-auth-handler-16.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz"; - sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1"; - name = "ktp-call-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-call-ui-16.08.3.tar.xz"; + sha256 = "1ywklfiqpq1826hhl00h45cslzbfqark4l7lb86lk9m0pibzj6sd"; + name = "ktp-call-ui-16.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz"; - sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70"; - name = "ktp-common-internals-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-common-internals-16.08.3.tar.xz"; + sha256 = "07h6v78b70ri1g6a9axpldfq6h4r890nbr63nsd7fxp2gf2m4byp"; + name = "ktp-common-internals-16.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz"; - sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25"; - name = "ktp-contact-list-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-list-16.08.3.tar.xz"; + sha256 = "0xk822sr3aizlbh307vdxacalwil2ll4376wdc1dw1d8pdf1sbq2"; + name = "ktp-contact-list-16.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz"; - sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn"; - name = "ktp-contact-runner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-runner-16.08.3.tar.xz"; + sha256 = "0pzf7d6v8kd6vwn4ir3b5k3l819cpb6w68q6n3p97gsmgwj1q9vg"; + name = "ktp-contact-runner-16.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz"; - sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv"; - name = "ktp-desktop-applets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-desktop-applets-16.08.3.tar.xz"; + sha256 = "0pdr9zm4ryr176anir4v57b1qnjb3my3lp43bjs61ggrmi0164zn"; + name = "ktp-desktop-applets-16.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz"; - sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb"; - name = "ktp-filetransfer-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-filetransfer-handler-16.08.3.tar.xz"; + sha256 = "1873gy2s250micc0d85g478ashzfqfs9z5qdz2fnmn7mdsmq0l7x"; + name = "ktp-filetransfer-handler-16.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz"; - sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg"; - name = "ktp-kded-module-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-kded-module-16.08.3.tar.xz"; + sha256 = "0ly7apbq7amzdpmhcpa1cy2v7r73pzqv02aa8w0hv8mg9akwr0rk"; + name = "ktp-kded-module-16.08.3.tar.xz"; }; }; ktp-send-file = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz"; - sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz"; - name = "ktp-send-file-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-send-file-16.08.3.tar.xz"; + sha256 = "1ql78n63m39rr5hylkyqxh1f1w7w9sf9jkj484p5nmkni3k7i6h6"; + name = "ktp-send-file-16.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz"; - sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5"; - name = "ktp-text-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-text-ui-16.08.3.tar.xz"; + sha256 = "0p4pzcrmw2vwv1dna33ar5d3jm2lwmra9v46m2nm2wqy38q7k0b8"; + name = "ktp-text-ui-16.08.3.tar.xz"; }; }; ktuberling = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz"; - sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67"; - name = "ktuberling-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktuberling-16.08.3.tar.xz"; + sha256 = "11xdh4pzcy71b697agc9biwyx8h1ana1ayahqw36cckkcrs1c4mm"; + name = "ktuberling-16.08.3.tar.xz"; }; }; kturtle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz"; - sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36"; - name = "kturtle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kturtle-16.08.3.tar.xz"; + sha256 = "0g0c28wdmx89cgl0bf60c4gvp31xih4anabbk2cjd7ikf7ifcv47"; + name = "kturtle-16.08.3.tar.xz"; }; }; kubrick = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz"; - sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl"; - name = "kubrick-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kubrick-16.08.3.tar.xz"; + sha256 = "127p0c023gcv3rhgraah7qg05mjqcwk519qzym1afj0rm9w40g13"; + name = "kubrick-16.08.3.tar.xz"; }; }; kuser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz"; - sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc"; - name = "kuser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kuser-16.08.3.tar.xz"; + sha256 = "0yhwlcq24hyn00mfjc8qqr05gy3p2h8j1ls24jdka7h5l6kwvcpq"; + name = "kuser-16.08.3.tar.xz"; }; }; kwalletmanager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz"; - sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf"; - name = "kwalletmanager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwalletmanager-16.08.3.tar.xz"; + sha256 = "0rii58dqw9dcs809zc70cb2vwgp7g2154sq55r67v3v0hcq2paq8"; + name = "kwalletmanager-16.08.3.tar.xz"; }; }; kwordquiz = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz"; - sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333"; - name = "kwordquiz-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwordquiz-16.08.3.tar.xz"; + sha256 = "13jqclk45niqi6m9wjj4hdl11ybzcs3k2hilcf2rzx88karfkvwf"; + name = "kwordquiz-16.08.3.tar.xz"; }; }; libgravatar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz"; - sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw"; - name = "libgravatar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libgravatar-16.08.3.tar.xz"; + sha256 = "047ipm4hsv2kmsi873rciqyfnszzz4p1f0i237zadx2bxr96fikw"; + name = "libgravatar-16.08.3.tar.xz"; }; }; libkcddb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz"; - sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2"; - name = "libkcddb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcddb-16.08.3.tar.xz"; + sha256 = "1jm0wzq1bknvfn1sqwwd95szjz6lpnyrxcnccmgscnl5rss1rsin"; + name = "libkcddb-16.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz"; - sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w"; - name = "libkcompactdisc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcompactdisc-16.08.3.tar.xz"; + sha256 = "091jg5f8v4j8a5iam2ljycizvgncwn188lym9s757p6xap9j73f4"; + name = "libkcompactdisc-16.08.3.tar.xz"; }; }; libkdcraw = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz"; - sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa"; - name = "libkdcraw-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdcraw-16.08.3.tar.xz"; + sha256 = "0svfi7cdasrx1xkmyhkzh5ynj29qn7ry3ryyylayjj1p9yrlqr2s"; + name = "libkdcraw-16.08.3.tar.xz"; }; }; libkdegames = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz"; - sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig"; - name = "libkdegames-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdegames-16.08.3.tar.xz"; + sha256 = "0mbp69clwk6qcv79gxadjl8ka7kbhlgavp3wlpbknxldr74zrqml"; + name = "libkdegames-16.08.3.tar.xz"; }; }; libkdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz"; - sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg"; - name = "libkdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdepim-16.08.3.tar.xz"; + sha256 = "1id6vhv6dlzyvw141kc2sawpjdqpdfq15dbnbj8hwr2g9jslyd6r"; + name = "libkdepim-16.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz"; - sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x"; - name = "libkeduvocdocument-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkeduvocdocument-16.08.3.tar.xz"; + sha256 = "0y74gyyxxjysacr4klia7kwm7wphj82ygdxljidbmvp5bmxc8iw9"; + name = "libkeduvocdocument-16.08.3.tar.xz"; }; }; libkexiv2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz"; - sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261"; - name = "libkexiv2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkexiv2-16.08.3.tar.xz"; + sha256 = "0wlh2zxh4yzn5g1dl9ffkim5v8wi888mrfnfxw2y4yrzw65bk9yi"; + name = "libkexiv2-16.08.3.tar.xz"; }; }; libkface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz"; - sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6"; - name = "libkface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkface-16.08.3.tar.xz"; + sha256 = "0xln9pz4v4gihz8pg1ijmp6ifmr0b5bp5fn6mkii8cwz1x12qvg7"; + name = "libkface-16.08.3.tar.xz"; }; }; libkgeomap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz"; - sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig"; - name = "libkgeomap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkgeomap-16.08.3.tar.xz"; + sha256 = "0rqscfd6jb1pypr8mdlc5jfn5wn4z5x553gp4nkpq37dwsgzsxm4"; + name = "libkgeomap-16.08.3.tar.xz"; }; }; libkipi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz"; - sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad"; - name = "libkipi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkipi-16.08.3.tar.xz"; + sha256 = "09pfsb7498bwzz1nxrmmddi7wj8a516xknzza08ls7pd6zm1y096"; + name = "libkipi-16.08.3.tar.xz"; }; }; libkleo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz"; - sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g"; - name = "libkleo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkleo-16.08.3.tar.xz"; + sha256 = "0jhhzvpgpn77qisxw0bv1zjcfwcrc7kwdffvqdnnc8hgjmvrb5c4"; + name = "libkleo-16.08.3.tar.xz"; }; }; libkmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz"; - sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij"; - name = "libkmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkmahjongg-16.08.3.tar.xz"; + sha256 = "0ymzxl37dscqn90dm90y7fxgqlrjqdx2djhqgc6nfk5g50rzlwry"; + name = "libkmahjongg-16.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz"; - sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35"; - name = "libkomparediff2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkomparediff2-16.08.3.tar.xz"; + sha256 = "019ibb277nqxygmky254p95n91kza92sb26xqrqz1mi8wvaqmi75"; + name = "libkomparediff2-16.08.3.tar.xz"; }; }; libksane = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz"; - sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a"; - name = "libksane-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksane-16.08.3.tar.xz"; + sha256 = "1wbvdffibifhdd7cdly7rf6kg25322xapnabylcyaz31r5qczq10"; + name = "libksane-16.08.3.tar.xz"; }; }; libksieve = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz"; - sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw"; - name = "libksieve-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksieve-16.08.3.tar.xz"; + sha256 = "0yi7x90k923v350bvsan7k40xrlz0w506j2ffw5xmr97zqnhhq47"; + name = "libksieve-16.08.3.tar.xz"; }; }; lokalize = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz"; - sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c"; - name = "lokalize-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lokalize-16.08.3.tar.xz"; + sha256 = "0vk3rpzm0bjfh6sr1dgqpsf81rg8vvynwqm68646pfj38k54yf8m"; + name = "lokalize-16.08.3.tar.xz"; }; }; lskat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz"; - sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v"; - name = "lskat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lskat-16.08.3.tar.xz"; + sha256 = "19g2c0by67wnh8k8wg2wq45bablhzqaml04pvmy5zbf4vnvmcbyy"; + name = "lskat-16.08.3.tar.xz"; }; }; mailcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz"; - sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw"; - name = "mailcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailcommon-16.08.3.tar.xz"; + sha256 = "080wf6ly7wrrj8ic9nz2cs7qcj6qvmfm8nfvlwymkzn4yyshf9rv"; + name = "mailcommon-16.08.3.tar.xz"; }; }; mailimporter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz"; - sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia"; - name = "mailimporter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailimporter-16.08.3.tar.xz"; + sha256 = "13cpfvbyr2i3ny3k0dd02353r693cn948cjakzw9jrfb7ha0rab8"; + name = "mailimporter-16.08.3.tar.xz"; }; }; marble = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz"; - sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77"; - name = "marble-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/marble-16.08.3.tar.xz"; + sha256 = "0lxax24p3l04qcy2hmyb6c69s7cayjcq6m03nw8nbpjwlmik4b8w"; + name = "marble-16.08.3.tar.xz"; }; }; messagelib = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz"; - sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb"; - name = "messagelib-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/messagelib-16.08.3.tar.xz"; + sha256 = "11qk72h45adgf4vmqb6vy8far8j9yr3s3ndj415iw3s07wkinhqa"; + name = "messagelib-16.08.3.tar.xz"; }; }; minuet = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz"; - sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s"; - name = "minuet-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/minuet-16.08.3.tar.xz"; + sha256 = "0p3x1f4nsamhrdnmvpmnv9swi96823sb2sh6r0lfgyzamkkj5mhm"; + name = "minuet-16.08.3.tar.xz"; }; }; okteta = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz"; - sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0"; - name = "okteta-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okteta-16.08.3.tar.xz"; + sha256 = "01pl32wzv46xxq3mgb0vpw35vwmmdrkc4qfsm750ay58x99wm5hq"; + name = "okteta-16.08.3.tar.xz"; }; }; okular = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz"; - sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k"; - name = "okular-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okular-16.08.3.tar.xz"; + sha256 = "1wz4pmzi4wv5zc92lr8qrqfqmg2lymzfqhh6b33iqr39jkv504xx"; + name = "okular-16.08.3.tar.xz"; }; }; palapeli = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz"; - sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh"; - name = "palapeli-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/palapeli-16.08.3.tar.xz"; + sha256 = "13pcwpks5bg9bw43lb4k2is22a7mzhkwl0sclp7lb9wn8qc831ns"; + name = "palapeli-16.08.3.tar.xz"; }; }; parley = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz"; - sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr"; - name = "parley-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/parley-16.08.3.tar.xz"; + sha256 = "1s3h4ywc84bnhm217jcffiwb3654j8nikl0zzzi1sigr9vhc9xmz"; + name = "parley-16.08.3.tar.xz"; }; }; picmi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz"; - sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740"; - name = "picmi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/picmi-16.08.3.tar.xz"; + sha256 = "0qywy9n1ifyc5srqx3b0xzhmsv7h54llsxv0m9yxngrbnc7jc3bw"; + name = "picmi-16.08.3.tar.xz"; }; }; pimcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz"; - sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1"; - name = "pimcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/pimcommon-16.08.3.tar.xz"; + sha256 = "06v8ak03rc7zmxmasqq12xi4misg73jag0vjy67a5izbqn613pry"; + name = "pimcommon-16.08.3.tar.xz"; }; }; poxml = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz"; - sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5"; - name = "poxml-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/poxml-16.08.3.tar.xz"; + sha256 = "0zp0lrlha5npagb4d04c2ga4kpxgi96si29xncff59nvw8l5p1cf"; + name = "poxml-16.08.3.tar.xz"; }; }; print-manager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz"; - sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v"; - name = "print-manager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/print-manager-16.08.3.tar.xz"; + sha256 = "07bd7jyz2iwfw7vf63jkvhjk6la1gkjwz8nva3ms78b48byd96bx"; + name = "print-manager-16.08.3.tar.xz"; }; }; rocs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz"; - sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w"; - name = "rocs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/rocs-16.08.3.tar.xz"; + sha256 = "1z4l75gr5ixfzyk2198asbm8i6nv03wg0srxgf62pxx5ycvmkygw"; + name = "rocs-16.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz"; - sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf"; - name = "signon-kwallet-extension-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/signon-kwallet-extension-16.08.3.tar.xz"; + sha256 = "11n1ychcl3piar7mk3lqxi70vjw6558nwzlqkjprlj8kqbcwphg0"; + name = "signon-kwallet-extension-16.08.3.tar.xz"; }; }; spectacle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz"; - sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h"; - name = "spectacle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/spectacle-16.08.3.tar.xz"; + sha256 = "1ma5q9c66mbnbdv2izgfx7jpzlph3mvi9dkq89vkyr2hi3nznp4b"; + name = "spectacle-16.08.3.tar.xz"; }; }; step = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz"; - sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h"; - name = "step-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/step-16.08.3.tar.xz"; + sha256 = "0lii1jydca6ksvk0qqy08acq354xwwvh5rjkj58x836fxrb39y9d"; + name = "step-16.08.3.tar.xz"; }; }; svgpart = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz"; - sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09"; - name = "svgpart-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/svgpart-16.08.3.tar.xz"; + sha256 = "0xriqcqffqdamxavby7gwjl4pxchslamci6xg0xwx7n0w9qa6vgv"; + name = "svgpart-16.08.3.tar.xz"; }; }; sweeper = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz"; - sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh"; - name = "sweeper-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/sweeper-16.08.3.tar.xz"; + sha256 = "01c89p54h497fk9pwj0hz86vyfqnx83iajmr3pskfsbh601xmipd"; + name = "sweeper-16.08.3.tar.xz"; }; }; syndication = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz"; - sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx"; - name = "syndication-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/syndication-16.08.3.tar.xz"; + sha256 = "0dqhrzw8xbh1zpxkj40sw72g6sfzhm0slsnvmx3p3ivas0slmqbf"; + name = "syndication-16.08.3.tar.xz"; }; }; umbrello = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz"; - sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h"; - name = "umbrello-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/umbrello-16.08.3.tar.xz"; + sha256 = "0r1cw17pyyiq4052bdms4vn1vwzwlcyymili0d9m1n0ib8q9dpsd"; + name = "umbrello-16.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz"; - sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6"; - name = "zeroconf-ioslave-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/zeroconf-ioslave-16.08.3.tar.xz"; + sha256 = "16hani3ajdysyrw5gy86360zki54kgmlzn65ishl6lzp8c8bp7q9"; + name = "zeroconf-ioslave-16.08.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index bb123fcdab44..36850824d63c 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -44,14 +44,6 @@ let inherit (srcs.breeze) src version; }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let - version = (builtins.parseDrvName breeze-qt5.name).version; - in - symlinkJoin { - name = "breeze-${version}"; - paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; - }; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 0809f2d66930..60928c3900d0 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 44a7575526f1..f880f2e3ab23 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,19 +1,20 @@ { - plasmaPackage, - ecm, makeQtWrapper, + plasmaPackage, kdeWrapper, + ecm, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ ecm makeQtWrapper ]; - propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; +let + unwrapped = plasmaPackage { + name = "oxygen"; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras + ]; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ]; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index 7e8823e2db96..8d4098ca31f2 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -38,4 +38,9 @@ plasmaPackage rec { "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" ]; + postInstall = '' + # Display ~/Desktop contents on the desktop by default. + sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ + -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' + ''; } diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 08daf740183d..75f44f47becf 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz"; - sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6"; - name = "bluedevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz"; + sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq"; + name = "bluedevil-5.8.4.tar.xz"; }; }; breeze = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz"; - sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp"; - name = "breeze-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz"; + sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw"; + name = "breeze-5.8.4.tar.xz"; }; }; breeze-grub = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz"; - sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k"; - name = "breeze-grub-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz"; + sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm"; + name = "breeze-grub-5.8.4.tar.xz"; }; }; breeze-gtk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz"; - sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g"; - name = "breeze-gtk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz"; + sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a"; + name = "breeze-gtk-5.8.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz"; - sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3"; - name = "breeze-plymouth-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz"; + sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj"; + name = "breeze-plymouth-5.8.4.tar.xz"; }; }; discover = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz"; - sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh"; - name = "discover-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz"; + sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx"; + name = "discover-5.8.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz"; - sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj"; - name = "kactivitymanagerd-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz"; + sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2"; + name = "kactivitymanagerd-5.8.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz"; - sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b"; - name = "kde-cli-tools-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz"; + sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14"; + name = "kde-cli-tools-5.8.4.tar.xz"; }; }; kdecoration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz"; - sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca"; - name = "kdecoration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz"; + sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4"; + name = "kdecoration-5.8.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz"; - sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d"; - name = "kde-gtk-config-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz"; + sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4"; + name = "kde-gtk-config-5.8.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz"; - sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3"; - name = "kdeplasma-addons-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz"; + sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4"; + name = "kdeplasma-addons-5.8.4.tar.xz"; }; }; kgamma5 = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz"; - sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065"; - name = "kgamma5-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz"; + sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1"; + name = "kgamma5-5.8.4.tar.xz"; }; }; khotkeys = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz"; - sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9"; - name = "khotkeys-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz"; + sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3"; + name = "khotkeys-5.8.4.tar.xz"; }; }; kinfocenter = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz"; - sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv"; - name = "kinfocenter-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz"; + sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd"; + name = "kinfocenter-5.8.4.tar.xz"; }; }; kmenuedit = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz"; - sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7"; - name = "kmenuedit-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz"; + sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h"; + name = "kmenuedit-5.8.4.tar.xz"; }; }; kscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz"; - sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny"; - name = "kscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz"; + sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl"; + name = "kscreen-5.8.4.tar.xz"; }; }; kscreenlocker = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz"; - sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv"; - name = "kscreenlocker-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz"; + sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv"; + name = "kscreenlocker-5.8.4.tar.xz"; }; }; ksshaskpass = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz"; - sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj"; - name = "ksshaskpass-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz"; + sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc"; + name = "ksshaskpass-5.8.4.tar.xz"; }; }; ksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz"; - sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd"; - name = "ksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz"; + sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3"; + name = "ksysguard-5.8.4.tar.xz"; }; }; kwallet-pam = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz"; - sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd"; - name = "kwallet-pam-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz"; + sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn"; + name = "kwallet-pam-5.8.4.tar.xz"; }; }; kwayland-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz"; - sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4"; - name = "kwayland-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz"; + sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7"; + name = "kwayland-integration-5.8.4.tar.xz"; }; }; kwin = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz"; - sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w"; - name = "kwin-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz"; + sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn"; + name = "kwin-5.8.4.tar.xz"; }; }; kwrited = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz"; - sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9"; - name = "kwrited-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz"; + sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s"; + name = "kwrited-5.8.4.tar.xz"; }; }; libkscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz"; - sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7"; - name = "libkscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz"; + sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p"; + name = "libkscreen-5.8.4.tar.xz"; }; }; libksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz"; - sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy"; - name = "libksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz"; + sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq"; + name = "libksysguard-5.8.4.tar.xz"; }; }; milou = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz"; - sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl"; - name = "milou-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz"; + sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8"; + name = "milou-5.8.4.tar.xz"; }; }; oxygen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz"; - sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg"; - name = "oxygen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz"; + sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4"; + name = "oxygen-5.8.4.tar.xz"; }; }; plasma-desktop = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz"; - sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7"; - name = "plasma-desktop-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz"; + sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q"; + name = "plasma-desktop-5.8.4.tar.xz"; }; }; plasma-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz"; - sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23"; - name = "plasma-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz"; + sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn"; + name = "plasma-integration-5.8.4.tar.xz"; }; }; plasma-nm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz"; - sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7"; - name = "plasma-nm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz"; + sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq"; + name = "plasma-nm-5.8.4.tar.xz"; }; }; plasma-pa = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz"; - sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4"; - name = "plasma-pa-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz"; + sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i"; + name = "plasma-pa-5.8.4.tar.xz"; }; }; plasma-sdk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz"; - sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7"; - name = "plasma-sdk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz"; + sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9"; + name = "plasma-sdk-5.8.4.tar.xz"; }; }; plasma-tests = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz"; - sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4"; - name = "plasma-tests-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz"; + sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k"; + name = "plasma-tests-5.8.4.tar.xz"; }; }; plasma-workspace = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz"; - sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb"; - name = "plasma-workspace-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz"; + sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd"; + name = "plasma-workspace-5.8.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz"; - sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2"; - name = "plasma-workspace-wallpapers-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz"; + sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3"; + name = "plasma-workspace-wallpapers-5.8.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.3"; + version = "1-5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz"; - sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z"; - name = "polkit-kde-agent-1-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz"; + sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg"; + name = "polkit-kde-agent-1-5.8.4.tar.xz"; }; }; powerdevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz"; - sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1"; - name = "powerdevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz"; + sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy"; + name = "powerdevil-5.8.4.tar.xz"; }; }; sddm-kcm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz"; - sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d"; - name = "sddm-kcm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz"; + sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx"; + name = "sddm-kcm-5.8.4.tar.xz"; }; }; systemsettings = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz"; - sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm"; - name = "systemsettings-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz"; + sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv"; + name = "systemsettings-5.8.4.tar.xz"; }; }; user-manager = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz"; - sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v"; - name = "user-manager-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz"; + sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d"; + name = "user-manager-5.8.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 256f9949e834..63c62f12321e 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -6,6 +6,36 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@" export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" +# Set the default GTK 2 theme +if ! [ -e $HOME/.gtkrc-2.0 ] \ + && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then + cat >$HOME/.gtkrc-2.0 <<EOF +# Default GTK+ 2 config for NixOS KDE 5 +include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" +gtk-theme-name="Breeze" +gtk-icon-theme-name="breeze" +gtk-fallback-icon-theme="hicolor" +gtk-cursor-theme-name="breeze_cursors" +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-menu-images=1 +gtk-button-images=1 +EOF +fi + +if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \ + && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then + cat >$HOME/.config/gtk-3.0/settings.ini <<EOF +[Settings] +gtk-theme-name=Breeze +gtk-icon-theme-name=breeze +gtk-fallback-icon-theme=hicolor +gtk-cursor-theme-name=breeze_cursors +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-menu-images=1 +gtk-button-images=1 +EOF +fi + # The KDE icon cache is supposed to update itself # automatically, but it uses the timestamp on the icon # theme directory as a trigger. Since in Nix the @@ -71,6 +101,14 @@ fi configDir=$(qtpaths --writable-path GenericConfigLocation) mkdir -p "$configDir" +if ! [ -e $configDir/kcminputrc ]; then + cat >$configDir/kcminputrc <<EOF +[Mouse] +cursorTheme=breeze_cursors +cursorSize=0 +EOF +fi + THEME=org.kde.breeze #This is basically setting defaults so we can use them with kstartupconfig5 #We cannot set the equivilant of THEME here as it will generate an diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 2cb06b07e597..69559a26c8fa 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { name = "hex"; - version = "v0.11.3"; + version = "v0.14.0"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; - rev = "f5e200ad95f030f0a7ab88a86545dd0dde1ee521"; - sha256 = "0n4cgmnbmglarydls9pmxznbzp49pv85ncbd4f2lp1fm7qr08xfw"; + rev = "${version}"; + sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai"; }; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix new file mode 100644 index 000000000000..d3c4bf19a65b --- /dev/null +++ b/pkgs/development/compilers/asn1c/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "asn1c-${version}"; + version = "0.9.27"; + + src = fetchurl { + url = "http://lionet.info/soft/asn1c-${version}.tar.gz"; + sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2"; + }; + + outputs = [ "out" "doc" "man" ]; + + buildInputs = [ perl ]; + + preConfigure = '' + patchShebangs examples/crfc2asn1.pl + ''; + + postInstall = '' + cp -r skeletons/standard-modules $out/share/asn1c + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://lionet.info/asn1c/compiler.html; + description = "Open Source ASN.1 Compiler"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index b7773a91d983..8cf8a04f4eb5 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.13.0.3"; + version = "0.13.0.4"; src = fetchurl { url = "http://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2"; + sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 950caeedf53b..e125a050b249 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -80,9 +80,9 @@ let }; }; in hsPkgs.elmPkgs // { - elm = buildEnv { + elm = lib.hiPrio (buildEnv { name = "elm-${hsPkgs.elmVersion}"; paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs; pathsToLink = [ "/bin" ]; - }; + }); } diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix index f6a92b64f6d7..b0943f1ece35 100644 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-compiler"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-compiler"; - sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if"; - rev = "e44deafaf9cbf3749484070f267f03a368711adb"; + sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh"; + rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80"; }; isLibrary = true; isExecutable = true; @@ -35,4 +35,7 @@ mkDerivation { homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; + # added manually since tests are not passing + # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852 + doCheck = false; } diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 4d30c697abd4..48eafff6f724 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.4.0"; + version = "0.5.2"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm"; - rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0"; + sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8"; + rev = "e452ed9342620e7bb0bc822983b96411d57143ef"; }; isLibrary = false; isExecutable = true; @@ -32,14 +32,4 @@ mkDerivation { homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; - - # XXX: I've manually disabled tests, only the following test is failing - # ... - # ElmFormat.Cli - # format a single file in place: OK - # usage instructions: FAIL - # ... - # 1 out of 266 tests failed (0.50s) - # Test suite elm-format-tests: FAIL - doCheck = false; } diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix index bed7698cfe42..dc1760e2958b 100644 --- a/pkgs/development/compilers/elm/packages/elm-make.nix +++ b/pkgs/development/compilers/elm/packages/elm-make.nix @@ -5,11 +5,11 @@ }: mkDerivation { pname = "elm-make"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-make"; - sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw"; - rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335"; + sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2"; + rev = "1a554833a70694ab142b9179bfac996143f68d9e"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index faf46e859c94..f93432dc0a30 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-package"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-package"; - sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85"; - rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd"; + sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; + rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix index 790430125901..90c8956323b5 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix @@ -1,22 +1,22 @@ { "elm-lang/virtual-dom" = { - version = "1.1.0"; - sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz"; + version = "2.0.1"; + sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3"; }; "evancz/elm-markdown" = { - version = "3.0.0"; - sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6"; + version = "3.0.1"; + sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj"; }; "elm-lang/html" = { - version = "1.1.0"; - sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y"; + version = "2.0.0"; + sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi"; }; "elm-lang/svg" = { - version = "1.1.1"; - sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn"; + version = "2.0.0"; + sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l"; }; "elm-lang/core" = { - version = "4.0.2"; - sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6"; + version = "5.0.0"; + sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn"; }; } diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix index cf6d33a5acb4..08bf5779b74a 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-reactor"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-reactor"; - sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8"; - rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63"; + sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65"; + rev = "c519d4ec0aaf2f043a416fe858346b0181eca516"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index e08c295f294c..64e29596099c 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-repl"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-repl"; - sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28"; - rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30"; + sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5"; + rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix index 6817d8e297f4..fd4e08fff09c 100644 --- a/pkgs/development/compilers/elm/packages/release.nix +++ b/pkgs/development/compilers/elm/packages/release.nix @@ -2,7 +2,7 @@ # Please, do not modify it by hand! { callPackage }: { - version = "0.17.1"; + version = "0.18.0"; packages = { elm-compiler = callPackage ./elm-compiler.nix { }; elm-package = callPackage ./elm-package.nix { }; diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb index a1f76945cd2c..5169ff3fd29a 100755 --- a/pkgs/development/compilers/elm/update-elm.rb +++ b/pkgs/development/compilers/elm/update-elm.rb @@ -1,12 +1,12 @@ #!/usr/bin/env ruby # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs -$elm_version = "0.17.1" -$elm_packages = { "elm-compiler" => "0.17.1", - "elm-package" => "0.17.1", - "elm-make" => "0.17.1", - "elm-reactor" => "0.17.1", - "elm-repl" => "0.17.1" +$elm_version = "0.18.0" +$elm_packages = { "elm-compiler" => "0.18.0", + "elm-package" => "0.18.0", + "elm-make" => "0.18.0", + "elm-reactor" => "0.18.0", + "elm-repl" => "0.18.0" } for pkg, ver in $elm_packages diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch new file mode 100644 index 000000000000..0ee1b06c7346 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2710.patch @@ -0,0 +1,19 @@ +diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h +--- a/rts/LinkerInternals.h ++++ b/rts/LinkerInternals.h +@@ -303,4 +303,14 @@ + # define OBJFORMAT_MACHO + #endif + ++/* In order to simplify control flow a bit, some references to mmap-related ++ definitions are blocked off by a C-level if statement rather than a CPP-level ++ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we ++ just stub out the relevant symbols here ++*/ ++#if !RTS_LINKER_USE_MMAP ++#define munmap(x,y) /* nothing */ ++#define MAP_ANONYMOUS 0 ++#endif ++ + #endif /* LINKERINTERNALS_H */ + diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch new file mode 100644 index 000000000000..8d229f273999 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2711.patch @@ -0,0 +1,22 @@ +diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c +--- a/rts/sm/Storage.c ++++ b/rts/sm/Storage.c +@@ -1314,7 +1314,7 @@ + ------------------------------------------------------------------------- */ + + #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) +-void sys_icache_invalidate(void *start, size_t len); ++#include <libkern/OSCacheControl.h> + #endif + + /* On ARM and other platforms, we need to flush the cache after +@@ -1327,7 +1327,7 @@ + (void)exec_addr; + #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) + /* On iOS we need to use the special 'sys_icache_invalidate' call. */ +- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len); ++ sys_icache_invalidate(exec_addr, len); + #elif defined(__GNUC__) + /* For all other platforms, fall back to a libgcc builtin. */ + unsigned char* begin = (unsigned char*)exec_addr; + diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch new file mode 100644 index 000000000000..d938d70bbcfe --- /dev/null +++ b/pkgs/development/compilers/ghc/D2712.patch @@ -0,0 +1,158 @@ +diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h +--- a/includes/rts/OSThreads.h ++++ b/includes/rts/OSThreads.h +@@ -15,7 +15,12 @@ + #ifndef RTS_OSTHREADS_H + #define RTS_OSTHREADS_H + +-#if defined(THREADED_RTS) /* to near the end */ ++#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) ++#define BUILD_OSTHREAD_POSIX ++#endif ++ ++ ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */ + + #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) + +@@ -205,13 +210,25 @@ + void releaseThreadNode (void); + #endif // !CMINUSMINUS + +-#else ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#ifndef THREADED_RTS ++ ++#ifdef ACQUIRE_LOCK ++// If we have pthreads, we pull in the threading primitives even when the RTS ++// isn't threaded, but we expect these macros to be noops on non-threaded RTS. ++ ++#undef ACQUIRE_LOCK ++#undef RELEASE_LOCK ++#undef ASSERT_LOCK_HELD ++ ++#endif + + #define ACQUIRE_LOCK(l) + #define RELEASE_LOCK(l) + #define ASSERT_LOCK_HELD(l) + +-#endif /* defined(THREADED_RTS) */ ++#endif + + #ifndef CMINUSMINUS + // +diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c +--- a/rts/posix/OSThreads.c ++++ b/rts/posix/OSThreads.c +@@ -35,7 +35,7 @@ + #endif + #endif + +-#if defined(THREADED_RTS) ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) + #include "RtsUtils.h" + #include "Task.h" + +@@ -225,47 +225,6 @@ + return NULL; + } + +-int +-forkOS_createThread ( HsStablePtr entry ) +-{ +- pthread_t tid; +- int result = pthread_create(&tid, NULL, +- forkOS_createThreadWrapper, (void*)entry); +- if(!result) +- pthread_detach(tid); +- return result; +-} +- +-void freeThreadingResources (void) { /* nothing */ } +- +-uint32_t +-getNumberOfProcessors (void) +-{ +- static uint32_t nproc = 0; +- +- if (nproc == 0) { +-#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) +- nproc = sysconf(_SC_NPROCESSORS_ONLN); +-#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) +- nproc = sysconf(_SC_NPROCESSORS_CONF); +-#elif defined(darwin_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +- } +-#elif defined(freebsd_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +-#else +- nproc = 1; +-#endif +- } +- +- return nproc; +-} +- + #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY) + // Schedules the thread to run on CPU n of m. m may be less than the + // number of physical CPUs, in which case, the thread will be allowed +@@ -353,6 +312,51 @@ + pthread_kill(id, SIGPIPE); + } + ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#if defined(THREADED_RTS) ++ ++int ++forkOS_createThread ( HsStablePtr entry ) ++{ ++ pthread_t tid; ++ int result = pthread_create(&tid, NULL, ++ forkOS_createThreadWrapper, (void*)entry); ++ if(!result) ++ pthread_detach(tid); ++ return result; ++} ++ ++void freeThreadingResources (void) { /* nothing */ } ++ ++uint32_t ++getNumberOfProcessors (void) ++{ ++ static uint32_t nproc = 0; ++ ++ if (nproc == 0) { ++#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) ++ nproc = sysconf(_SC_NPROCESSORS_ONLN); ++#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) ++ nproc = sysconf(_SC_NPROCESSORS_CONF); ++#elif defined(darwin_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++ } ++#elif defined(freebsd_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++#else ++ nproc = 1; ++#endif ++ } ++ ++ return nproc; ++} ++ + #else /* !defined(THREADED_RTS) */ + + int + diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch new file mode 100644 index 000000000000..80cf35a52974 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2713.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -437,7 +437,11 @@ + else + CrossCompilePrefix="" + fi +-TargetPlatformFull="${TargetPlatform}" ++# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used ++# in calls to subproject configure scripts and thus must be set to the autoconf ++# triple, not the normalized GHC triple that TargetPlatform is set to. ++# It may be better to just do away with the GHC triples all together. ++TargetPlatformFull="${target}" + AC_SUBST(CrossCompiling) + AC_SUBST(CrossCompilePrefix) + AC_SUBST(TargetPlatformFull) + diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d57b6e575da5..f46a017c66aa 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,48 +1,51 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex +, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null }: let inherit (bootPkgs) ghc; -in stdenv.mkDerivation rec { - version = "8.1.20161109"; + commonBuildInputs = [ ghc perl autoconf automake happy alex ]; + + version = "8.1.20161115"; + + commonPreConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; +in stdenv.mkDerivation (rec { + inherit version; name = "ghc-${version}"; - rev = "2e8463b232054b788b73e6551947a9434aa76009"; + rev = "017d11e0a36866b05ace32ece1af11adf652a619"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; + sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; - patches = [ - ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 - ]; + # This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but + # see http://hydra.cryp.to/build/2061608/nixlog/1/raw + patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ]; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} + postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . ./boot - popd ''; - buildInputs = [ ghc perl autoconf automake happy alex ]; + buildInputs = commonBuildInputs; enableParallelBuilding = true; - preConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; + preConfigure = commonPreConfigure; configureFlags = [ - "--with-cc=${stdenv.cc}/bin/cc" + "CC=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ @@ -67,6 +70,11 @@ in stdenv.mkDerivation rec { passthru = { inherit bootPkgs; + } // stdenv.lib.optionalAttrs (crossSystem != null) { + crossCompiler = selfPkgs.ghc.override { + cross = crossSystem; + bootPkgs = selfPkgs; + }; }; meta = { @@ -76,4 +84,35 @@ in stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713) + patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ]; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld" + "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar" + "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" + "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" + ]; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; + + dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + + ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix new file mode 100644 index 000000000000..f8b861311d60 --- /dev/null +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -0,0 +1,186 @@ +{ mkDerivation +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, data-default +, ghc-paths +, haskell-src-exts +, haskell-src-meta +, optparse-applicative +, system-fileio +, system-filepath +, text-binary +, unordered-containers +, cabal-install +, wl-pprint-text +, base16-bytestring +, executable-path +, transformers-compat +, haddock-api +, ghcjs-prim +, regex-posix +, callPackage + +, bootPkgs, gmp +, jailbreak-cabal + +, runCommand +, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm +, time +, zlib, aeson, attoparsec, bzlib, hashable +, lens +, parallel, safe, shelly, split, stringsearch, syb +, tar, terminfo +, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, alex, happy, git, gnumake, autoconf, patch +, automake, libtool +, cryptohash +, haddock, hspec, xhtml, primitive, cacert, pkgs +, coreutils +, libiconv + +, version ? "0.2.0" +, ghcjsSrc ? fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; + } +, ghcjsBootSrc ? fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "8c549931da27ba9e607f77195208ec156c840c8a"; + sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; + fetchSubmodules = true; + } +, ghcjsBoot ? import ./ghcjs-boot.nix { + inherit runCommand; + src = ghcjsBootSrc; + } +, shims ? import ./shims.nix { inherit fetchFromGitHub; } + +# This is the list of the Stage 1 packages that are built into a booted ghcjs installation +# It can be generated with the command: +# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" +, stage1Packages ? [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ] + +, stage2 ? import ./stage2.nix +}: +let + inherit (bootPkgs) ghc; + +in mkDerivation (rec { + pname = "ghcjs"; + inherit version; + src = ghcjsSrc; + isLibrary = true; + isExecutable = true; + jailbreak = true; + doHaddock = false; + doCheck = false; + buildDepends = [ + filepath HTTP mtl network random stm time zlib aeson attoparsec + bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta + lens optparse-applicative parallel safe shelly split + stringsearch syb system-fileio system-filepath tar terminfo text-binary + unordered-containers vector wl-pprint-text yaml + alex happy git gnumake autoconf automake libtool patch gmp + base16-bytestring cryptohash executable-path haddock-api + transformers-compat QuickCheck haddock hspec xhtml + ghcjs-prim regex-posix libiconv + ]; + buildTools = [ nodejs git ]; + testDepends = [ + HUnit test-framework test-framework-hunit + ]; + patches = [ ./ghcjs.patch ]; + postPatch = '' + substituteInPlace Setup.hs \ + --replace "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace src/Compiler/Info.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@VERSION@" "${version}" + + substituteInPlace src-bin/Boot.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@CC@" "${stdenv.cc}/bin/cc" + ''; + preBuild = '' + export HOME="$TMP" + + local topDir=$out/lib/ghcjs-${version} + mkdir -p $topDir + + cp -r ${ghcjsBoot} $topDir/ghcjs-boot + chmod -R u+w $topDir/ghcjs-boot + + cp -r ${shims} $topDir/shims + chmod -R u+w $topDir/shims + + # Make the patches be relative their corresponding package's directory. + # See: https://github.com/ghcjs/ghcjs-boot/pull/12 + for patch in "$topDir/ghcjs-boot/patches/"*.patch; do + echo "fixing patch: $patch" + sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch + done + ''; + # We build with --quick so we can build stage 2 packages separately. + # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a + # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw + postInstall = '' + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ + env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ + --dev \ + --quick \ + --with-cabal ${cabal-install}/bin/cabal \ + --with-gmp-includes ${gmp.dev}/include \ + --with-gmp-libraries ${gmp.out}/lib + ''; + passthru = let + ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { + generated = ./node-packages-generated.nix; + self = ghcjsNodePkgs; + }; + in { + inherit bootPkgs; + isCross = true; + isGhcjs = true; + inherit nodejs ghcjsBoot; + inherit (ghcjsNodePkgs) "socket.io"; + + inherit stage1Packages; + mkStage2 = stage2 { + inherit ghcjsBoot; + }; + }; + + homepage = "https://github.com/ghcjs/ghcjs"; + description = "A Haskell to JavaScript compiler that uses the GHC API"; + license = stdenv.lib.licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; +}) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 565215f474ea..7400057b128f 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,179 +1,3 @@ -{ mkDerivation -, test-framework -, test-framework-hunit -, test-framework-quickcheck2 -, data-default -, ghc-paths -, haskell-src-exts -, haskell-src-meta -, optparse-applicative -, system-fileio -, system-filepath -, text-binary -, unordered-containers -, cabal-install -, wl-pprint-text -, base16-bytestring -, executable-path -, transformers-compat -, haddock-api -, ghcjs-prim -, regex-posix -, callPackage +{ bootPkgs }: -, bootPkgs, gmp -, jailbreak-cabal - -, runCommand -, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, time -, zlib, aeson, attoparsec, bzlib, hashable -, lens -, parallel, safe, shelly, split, stringsearch, syb -, tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal -, alex, happy, git, gnumake, autoconf, patch -, automake, libtool -, cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs -, coreutils -, libiconv - -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8c549931da27ba9e607f77195208ec156c840c8a"; - sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; - fetchSubmodules = true; - } -, ghcjsBoot ? import ./ghcjs-boot.nix { - inherit runCommand; - src = ghcjsBootSrc; - } -, shims ? import ./shims.nix { inherit fetchFromGitHub; } -}: -let - inherit (bootPkgs) ghc; - version = "0.2.0"; - -in mkDerivation (rec { - pname = "ghcjs"; - inherit version; - src = fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; - sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; - }; - isLibrary = true; - isExecutable = true; - jailbreak = true; - doHaddock = false; - doCheck = false; - buildDepends = [ - filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta - lens optparse-applicative parallel safe shelly split - stringsearch syb system-fileio system-filepath tar terminfo text-binary - unordered-containers vector wl-pprint-text yaml - alex happy git gnumake autoconf automake libtool patch gmp - base16-bytestring cryptohash executable-path haddock-api - transformers-compat QuickCheck haddock hspec xhtml - ghcjs-prim regex-posix libiconv - ]; - buildTools = [ nodejs git ]; - testDepends = [ - HUnit test-framework test-framework-hunit - ]; - patches = [ ./ghcjs.patch ]; - postPatch = '' - substituteInPlace Setup.hs \ - --replace "/usr/bin/env" "${coreutils}/bin/env" - - substituteInPlace src/Compiler/Info.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@VERSION@" "${version}" - - substituteInPlace src-bin/Boot.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@CC@" "${stdenv.cc}/bin/cc" - ''; - preBuild = '' - export HOME="$TMP" - - local topDir=$out/lib/ghcjs-${version} - mkdir -p $topDir - - cp -r ${ghcjsBoot} $topDir/ghcjs-boot - chmod -R u+w $topDir/ghcjs-boot - - cp -r ${shims} $topDir/shims - chmod -R u+w $topDir/shims - - # Make the patches be relative their corresponding package's directory. - # See: https://github.com/ghcjs/ghcjs-boot/pull/12 - for patch in "$topDir/ghcjs-boot/patches/"*.patch; do - echo "fixing patch: $patch" - sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch - done - ''; - # We build with --quick so we can build stage 2 packages separately. - # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a - # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw - postInstall = '' - PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ - env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ - --dev \ - --quick \ - --with-cabal ${cabal-install}/bin/cabal \ - --with-gmp-includes ${gmp.dev}/include \ - --with-gmp-libraries ${gmp.out}/lib - ''; - passthru = let - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - }; - in { - inherit bootPkgs; - isCross = true; - isGhcjs = true; - inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; - - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" - stage1Packages = [ - "array" - "base" - "binary" - "rts" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-prim" - "ghcjs-prim" - "integer-gmp" - "old-locale" - "pretty" - "primitive" - "process" - "template-haskell" - "time" - "transformers" - "unix" - ]; - - mkStage2 = import ./stage2.nix { - inherit ghcjsBoot; - }; - }; - - homepage = "https://github.com/ghcjs/ghcjs"; - description = "A Haskell to JavaScript compiler that uses the GHC API"; - license = stdenv.lib.licenses.bsd3; - platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; -}) +bootPkgs.callPackage ./base.nix { inherit bootPkgs; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 2bf13cb895f5..b191f9655d2a 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,178 +1,50 @@ -{ mkDerivation -, test-framework -, test-framework-hunit -, test-framework-quickcheck2 -, data-default -, ghc-paths -, haskell-src-exts -, haskell-src-meta -, optparse-applicative -, system-fileio -, system-filepath -, text-binary -, unordered-containers -, cabal-install -, wl-pprint-text -, base16-bytestring -, executable-path -, transformers-compat -, haddock-api -, regex-posix -, callPackage +{ fetchgit, fetchFromGitHub, bootPkgs }: -, bootPkgs, gmp -, jailbreak-cabal - -, runCommand -, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, time -, zlib, aeson, attoparsec, bzlib, hashable -, lens -, parallel, safe, shelly, split, stringsearch, syb -, tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal -, alex, happy, git, gnumake, autoconf, patch -, automake, libtool -, cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs -, coreutils -, libiconv - -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; - sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; - fetchSubmodules = true; - } -, ghcjsBoot ? import ./ghcjs-boot.nix { - inherit runCommand; - src = ghcjsBootSrc; - } -, shims ? import ./head_shims.nix { inherit fetchFromGitHub; } -}: -let - inherit (bootPkgs) ghc; +bootPkgs.callPackage ./base.nix { version = "0.2.020161101"; -in mkDerivation (rec { - pname = "ghcjs"; - inherit version; - src = fetchFromGitHub { + # deprecated on HEAD, directly included in the distribution + ghcjs-prim = null; + inherit bootPkgs; + + ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; }; - isLibrary = true; - isExecutable = true; - jailbreak = true; - doHaddock = false; - doCheck = false; - buildDepends = [ - filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta - lens optparse-applicative parallel safe shelly split - stringsearch syb system-fileio system-filepath tar terminfo text-binary - unordered-containers vector wl-pprint-text yaml - alex happy git gnumake autoconf automake libtool patch gmp - base16-bytestring cryptohash executable-path haddock-api - transformers-compat QuickCheck haddock hspec xhtml - regex-posix libiconv - ]; - buildTools = [ nodejs git ]; - testDepends = [ - HUnit test-framework test-framework-hunit - ]; - patches = [ ./ghcjs.patch ]; - postPatch = '' - substituteInPlace Setup.hs \ - --replace "/usr/bin/env" "${coreutils}/bin/env" - - substituteInPlace src/Compiler/Info.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@VERSION@" "${version}" - - substituteInPlace src-bin/Boot.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@CC@" "${stdenv.cc}/bin/cc" - ''; - preBuild = '' - export HOME="$TMP" - - local topDir=$out/lib/ghcjs-${version} - mkdir -p $topDir - - cp -r ${ghcjsBoot} $topDir/ghcjs-boot - chmod -R u+w $topDir/ghcjs-boot - - cp -r ${shims} $topDir/shims - chmod -R u+w $topDir/shims - - # Make the patches be relative their corresponding package's directory. - # See: https://github.com/ghcjs/ghcjs-boot/pull/12 - for patch in "$topDir/ghcjs-boot/patches/"*.patch; do - echo "fixing patch: $patch" - sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch - done - ''; - # We build with --quick so we can build stage 2 packages separately. - # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a - # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw - postInstall = '' - PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ - env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ - --dev \ - --quick \ - --with-cabal ${cabal-install}/bin/cabal \ - --with-gmp-includes ${gmp.dev}/include \ - --with-gmp-libraries ${gmp.out}/lib - ''; - passthru = let - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - }; - in { - inherit bootPkgs; - isCross = true; - isGhcjs = true; - inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; - - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" - stage1Packages = [ - "array" - "base" - "binary" - "rts" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-prim" - "ghcjs-prim" - "integer-gmp" - "old-locale" - "pretty" - "primitive" - "process" - "template-haskell" - "time" - "transformers" - "unix" - ]; - - mkStage2 = import ./stage2.nix { - inherit ghcjsBoot; - }; + ghcjsBootSrc = fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; + sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; + fetchSubmodules = true; }; - homepage = "https://github.com/ghcjs/ghcjs"; - description = "A Haskell to JavaScript compiler that uses the GHC API"; - license = stdenv.lib.licenses.bsd3; - platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; -}) + shims = import ./head_shims.nix { inherit fetchFromGitHub; }; + stage1Packages = [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ]; + stage2 = import ./head_stage2.nix; +} diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix index e321978f0bdc..68b03d057397 100644 --- a/pkgs/development/compilers/ghcjs/head_shims.nix +++ b/pkgs/development/compilers/ghcjs/head_shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37"; - sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws"; + rev = "f67394c559ac921a768b12f141499119563b8bf3"; + sha256 = "1lz86qmkxkfch1yk9a62admw7jsd34sqcrskgpq28hbhjpgzf1lv"; } diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix new file mode 100644 index 000000000000..765a384bf634 --- /dev/null +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -0,0 +1,345 @@ +{ ghcjsBoot }: { callPackage }: + +{ + async = callPackage + ({ mkDerivation, base, HUnit, stdenv, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.1.0"; + src = "${ghcjsBoot}/boot/async"; + doCheck = false; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + aeson = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific + , stdenv, syb, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "0.11.2.0"; + src = "${ghcjsBoot}/boot/aeson"; + doCheck = false; + libraryHaskellDepends = [ + attoparsec base bytestring containers deepseq dlist fail ghc-prim + hashable mtl scientific syb tagged template-haskell text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + attoparsec = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , QuickCheck, quickcheck-unicode, scientific, stdenv + , test-framework, test-framework-quickcheck2, text, transformers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.0.2"; + src = "${ghcjsBoot}/boot/attoparsec"; + doCheck = false; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring containers deepseq QuickCheck + quickcheck-unicode scientific test-framework + test-framework-quickcheck2 text transformers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + case-insensitive = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.6"; + src = "${ghcjsBoot}/boot/case-insensitive"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; + dlist = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: + mkDerivation { + pname = "dlist"; + version = "0.7.1.2"; + src = "${ghcjsBoot}/boot/dlist"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + extensible-exceptions = callPackage + ({ mkDerivation, base, stdenv }: + mkDerivation { + pname = "extensible-exceptions"; + version = "0.1.1.4"; + src = "${ghcjsBoot}/boot/extensible-exceptions"; + doCheck = false; + libraryHaskellDepends = [ base ]; + jailbreak = true; + description = "Extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + hashable = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp + , QuickCheck, random, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.4.0"; + src = "${ghcjsBoot}/boot/hashable"; + doCheck = false; + libraryHaskellDepends = [ + base bytestring ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + jailbreak = true; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + }) {}; + mtl = callPackage + ({ mkDerivation, base, stdenv, transformers }: + mkDerivation { + pname = "mtl"; + version = "2.2.2"; + src = "${ghcjsBoot}/boot/mtl"; + doCheck = false; + libraryHaskellDepends = [ base transformers ]; + jailbreak = true; + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + old-time = callPackage + ({ mkDerivation, base, old-locale, stdenv }: + mkDerivation { + pname = "old-time"; + version = "1.1.0.3"; + src = "${ghcjsBoot}/boot/old-time"; + doCheck = false; + libraryHaskellDepends = [ base old-locale ]; + jailbreak = true; + description = "Time library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + parallel = callPackage + ({ mkDerivation, array, base, containers, deepseq, stdenv }: + mkDerivation { + pname = "parallel"; + version = "3.2.1.0"; + src = "${ghcjsBoot}/boot/parallel"; + doCheck = false; + libraryHaskellDepends = [ array base containers deepseq ]; + jailbreak = true; + description = "Parallel programming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + scientific = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim + , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty + , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , text, vector + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.7"; + src = "${ghcjsBoot}/boot/scientific"; + doCheck = false; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp text vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + stm = callPackage + ({ mkDerivation, array, base, stdenv }: + mkDerivation { + pname = "stm"; + version = "2.4.4.1"; + src = "${ghcjsBoot}/boot/stm"; + doCheck = false; + libraryHaskellDepends = [ array base ]; + jailbreak = true; + description = "Software Transactional Memory"; + license = stdenv.lib.licenses.bsd3; + }) {}; + syb = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, stdenv }: + mkDerivation { + pname = "syb"; + version = "0.6"; + src = "${ghcjsBoot}/boot/syb"; + doCheck = false; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers HUnit mtl ]; + jailbreak = true; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + text = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq, directory + , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode + , random, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "text"; + version = "1.2.2.1"; + src = "${ghcjsBoot}/boot/text"; + doCheck = false; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim integer-gmp + ]; + testHaskellDepends = [ + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + unordered-containers = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable + , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.0"; + src = "${ghcjsBoot}/boot/unordered-containers"; + doCheck = false; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + vector = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , random, stdenv, template-haskell, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.11.0.0"; + src = "${ghcjsBoot}/boot/vector"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base QuickCheck random template-haskell test-framework + test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + ghcjs-base = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, bytestring + , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim + , hashable, HUnit, integer-gmp, primitive, QuickCheck + , quickcheck-unicode, random, scientific, stdenv, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "ghcjs-base"; + version = "0.2.0.0"; + src = "${ghcjsBoot}/ghcjs/ghcjs-base"; + doCheck = false; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq dlist ghc-prim + ghcjs-prim hashable integer-gmp primitive scientific text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit + primitive QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + jailbreak = true; + homepage = "http://github.com/ghcjs/ghcjs-base"; + description = "Base library for GHCJS"; + license = stdenv.lib.licenses.mit; + }) {}; + Cabal = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix, stdenv + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal"; + version = "1.24.0.0"; + src = "${ghcjsBoot}/boot/cabal/Cabal"; + doCheck = false; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + HUnit old-time process QuickCheck regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 unix + ]; + jailbreak = true; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + }) {}; +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index e1de97e17c40..52a47c50420e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.5-2"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "0bkgxr4an1fq890s3bw4izwc8ly29xk28gdibvnp2q9qd15rwrny5dgns697rnbw2gg0nn08q5p33asvbkac001cfabfphamjwndvc9"; + sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch new file mode 100644 index 000000000000..79ca953d6e5b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.8/D17533-1.patch @@ -0,0 +1,60 @@ +commit eb92f5a745014532b83abfba04602fce87ca8393 +Author: Chuang-Yu Cheng <cycheng@multicorewareinc.com> +Date: Fri Apr 8 12:04:32 2016 +0000 + + CXX_FAST_TLS calling convention: performance improvement for PPC64 + + This is the same change on PPC64 as r255821 on AArch64. I have even borrowed + his commit message. + + The access function has a short entry and a short exit, the initialization + block is only run the first time. To improve the performance, we want to + have a short frame at the entry and exit. + + We explicitly handle most of the CSRs via copies. Only the CSRs that are not + handled via copies will be in CSR_SaveList. + + Frame lowering and prologue/epilogue insertion will generate a short frame + in the entry and exit according to CSR_SaveList. The majority of the CSRs will + be handled by register allcoator. Register allocator will try to spill and + reload them in the initialization block. + + We add CSRsViaCopy, it will be explicitly handled during lowering. + + 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target + supports it for the given machine function and the function has only return + exits). We also call TLI->initializeSplitCSR to perform initialization. + 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to + virtual registers at beginning of the entry block and copies from virtual + registers to CSRsViaCopy at beginning of the exit blocks. + 3> we also need to make sure the explicit copies will not be eliminated. + + Author: Tom Jablin (tjablin) + Reviewers: hfinkel kbarton cycheng + + http://reviews.llvm.org/D17533 + + git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8 + +diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp +index 679ade1..0a0e079 100644 +--- a/lib/CodeGen/TargetFrameLoweringImpl.cpp ++++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp +@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, + const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); + const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF); + ++ // Resize before the early returns. Some backends expect that ++ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no ++ // saved registers. ++ SavedRegs.resize(TRI.getNumRegs()); ++ + // Early exit if there are no callee saved registers. + if (!CSRegs || CSRegs[0] == 0) + return; + +- SavedRegs.resize(TRI.getNumRegs()); +- + // In Naked functions we aren't going to save any registers. + if (MF.getFunction()->hasFnAttribute(Attribute::Naked)) + return; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 6112228bf4fc..fa647e62ff14 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -35,10 +35,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + # Fix a segfault in llc + # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html + patches = [ ./D17533-1.patch ]; + # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc ''; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 454b67b8151b..b912a9d7933c 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.9.0` + # fetch hashes by running `print-hashes.sh 1.12.1` bootstrapHash = if stdenv.system == "i686-linux" - then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" + then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" else if stdenv.system == "x86_64-linux" - then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" + then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" else if stdenv.system == "i686-darwin" - then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" + then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" else if stdenv.system == "x86_64-darwin" - then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" + then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.11.0"; + version = "1.12.1"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7e29435b7d59..dd2d47e940d1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.12.1"; + shortVersion = "1.13"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd"; - srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr"; + srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; + srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; patches = [ ./patches/disable-lockfile-check.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.13.0"; - srcRev = "109cb7c33d426044d141457049bd0fffaca1327c"; - srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs"; - depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z"; + version = "0.14.0"; + srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; + srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; + depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e1bff12f398e..57480974a3f1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation { # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs + # Disable test getting stuck on hydra - possible fix: + # https://reviews.llvm.org/rL281650 + rm -vr src/test/run-pass/issue-36474.rs + # Useful debugging parameter # export VERBOSE=1 '' + diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4ceff8e7819..f521f3100500 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -4,6 +4,11 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Some Hackage packages reference this attribute, which exists only in the + # GHCJS package set. We provide a dummy version here to fix potential + # evaluation errors. + ghcjs-base = null; + # Some packages need a non-core version of Cabal. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); @@ -43,7 +48,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01"; + sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd"; rev = drv.version; }; })).overrideScope (self: super: { @@ -139,7 +144,6 @@ self: super: { groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; HaXml = dontHaddock super.HaXml; - HDBC-odbc = dontHaddock super.HDBC-odbc; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; http-client-conduit = dontHaddock super.http-client-conduit; @@ -984,6 +988,25 @@ self: super: { # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + # To be in sync with Hoogle. + lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch"; + sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf"; + stripLen = 2; + addPrefixes = true; + }) + ]; + + jailbreak = true; + })).override { + haskell-src-exts = self.haskell-src-exts-simple; + }; + + # Needs new version. + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; @@ -1018,14 +1041,14 @@ self: super: { # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2; + http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3; # Fix build for latest versions of servant and servant-client. servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; }); servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; servant-server = self.servant-server_0_9_1_1; servant = self.servant_0_9_1_1; }); @@ -1043,6 +1066,15 @@ self: super: { # https://github.com/roelvandijk/terminal-progress-bar/issues/13 terminal-progress-bar = doJailbreak super.terminal-progress-bar; + # https://github.com/hdbc/hdbc-odbc/pull/29 + HDBC-odbc = overrideCabal super.HDBC-odbc (old: { + postPatch = old.postPatch or "" + '' + sed -e '/data BoundValue =/ { s/$/{/ ; n; n ; s/{ bvVal/ bvVal/ }' \ + -e 's/-- | This is rather/-- This is rather/' \ + -i Database/HDBC/ODBC/Statement.hsc + ''; + }); + # https://github.com/vshabanov/HsOpenSSL/issues/11 HsOpenSSL = doJailbreak super.HsOpenSSL; @@ -1077,4 +1109,21 @@ self: super: { # https://github.com/josefs/STMonadTrans/issues/4 STMonadTrans = dontCheck super.STMonadTrans; + socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); + + # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R" + ghc-core = overrideCabal super.ghc-core (drv: { + src = pkgs.fetchFromGitHub { + owner = "shachaf"; + repo = "ghc-core"; + rev = "630196adf0bebf073328325302453ef1c409fd9a"; + sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848"; + }; + version = "2012-12-15"; + }); + + # Encountered missing dependencies: hspec >=1.3 && <2.1 + # https://github.com/rampion/ReadArgs/issues/8 + ReadArgs = doJailbreak super.ReadArgs; + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index c97296cd5bad..894022c176be 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -1,3 +1,7 @@ +# GHCJS package fixes +# +# Please insert new packages *alphabetically* +# in the OTHER PACKAGES section. { pkgs }: let @@ -9,6 +13,8 @@ with import ./lib.nix { inherit pkgs; }; self: super: +## GENERAL SETUP BASE PACKAGES + let # The stage 1 packages stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null); # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb @@ -47,24 +53,26 @@ self: super: terminfo = self.terminfo_0_4_0_1; xhtml = self.xhtml_3000_2_1; - pqueue = overrideCabal super.pqueue (drv: { - postPatch = '' - sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs - sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs - sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs - sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs - ''; - }); - transformers-compat = overrideCabal super.transformers-compat (drv: { - configureFlags = []; +## OTHER PACKAGES + + cereal = addBuildDepend super.cereal [ self.fail ]; + + entropy = overrideCabal super.entropy (old: { + postPatch = old.postPatch or "" + '' + # cabal doesn’t find ghc in this script, since it’s in the bootPkgs + sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ + -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs + ''; }); - profunctors = overrideCabal super.profunctors (drv: { - preConfigure = '' - sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + # https://github.com/kazu-yamamoto/logger/issues/97 + fast-logger = overrideCabal super.fast-logger (old: { + postPatch = old.postPatch or "" + '' + # remove the Safe extensions, since ghcjs-boot directory + # doesn’t provide Trustworthy + sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs + cat System/Log/FastLogger/Date.hs ''; }); @@ -88,16 +96,43 @@ self: super: }) {}; ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { - libraryHaskellDepends = [ self.ghcjs-base ] ++ - removeLibraryHaskellDepends [ - "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3" - ] drv.libraryHaskellDepends; + libraryHaskellDepends = with self; [ + ghcjs-base ghcjs-dom-jsffi text transformers + ]; + configureFlags = [ "-fjsffi" "-f-webkit" ]; + }); + + ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { + libraryHaskellDepends = [ self.ghcjs-base self.text ]; + isLibrary = true; }); ghc-paths = overrideCabal super.ghc-paths (drv: { patches = [ ./patches/ghc-paths-nix-ghcjs.patch ]; }); + http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; + # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + + pqueue = overrideCabal super.pqueue (drv: { + postPatch = '' + sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs + sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs + sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs + sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs + ''; + }); + + profunctors = overrideCabal super.profunctors (drv: { + preConfigure = '' + sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + ''; + }); + + protolude = doJailbreak super.protolude; + # reflex 0.3, made compatible with the newest GHCJS. reflex = overrideCabal super.reflex (drv: { src = pkgs.fetchFromGitHub { @@ -122,12 +157,13 @@ self: super: ] drv.libraryHaskellDepends; }); - http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; - # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* - protolude = doJailbreak super.protolude; semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; + + transformers-compat = overrideCabal super.transformers-compat (drv: { + configureFlags = []; + }); + # triggers an internal pattern match failure in haddock # https://github.com/haskell/haddock/issues/553 wai = dontHaddock super.wai; - cereal = addBuildDepend super.cereal [ self.fail ]; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 37b050d05d4d..832451138ee8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -31,8 +31,13 @@ core-packages: - unix-2.7.2.0 - xhtml-3000.2.1 + # Hack: The following package is a core package of GHCJS. If we don't declare + # it, then hackage2nix will generate a Hackage database where all dependants + # if this library are maked as "broken". + - ghcjs-base-0 + default-package-overrides: - # LTS Haskell 7.8 + # LTS Haskell 7.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,11 +151,11 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - - asciidiagram ==1.3.2 + - asciidiagram ==1.3.3 - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 - - async ==2.1.0 + - async ==2.1.1 - async-dejafu ==0.1.3.0 - atndapi ==0.1.1.0 - atom-conduit ==0.3.1.2 @@ -214,7 +219,7 @@ default-package-overrides: - bitx-bitcoin ==0.10.0.0 - blake2 ==0.2.0 - blank-canvas ==0.6 - - BlastHTTP ==1.2.0 + - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 @@ -272,16 +277,16 @@ default-package-overrides: - case-insensitive ==1.2.0.7 - cased ==0.1.0.0 - cases ==0.1.3.1 - - cassava ==0.4.5.0 + - cassava ==0.4.5.1 - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - cayley-client ==0.2.1.0 - - cereal ==0.5.3.0 + - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - - cgi ==3001.3.0.1 + - cgi ==3001.3.0.2 - ChannelT ==0.0.0.2 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.1 @@ -309,9 +314,9 @@ default-package-overrides: - clash-systemverilog ==0.6.10 - clash-verilog ==0.6.10 - clash-vhdl ==0.6.16 - - classy-prelude ==1.0.0.2 - - classy-prelude-conduit ==1.0.0 - - classy-prelude-yesod ==1.0.0 + - classy-prelude ==1.0.1 + - classy-prelude-conduit ==1.0.1 + - classy-prelude-yesod ==1.0.1 - clay ==0.11 - clckwrks ==0.23.19.2 - clckwrks-cli ==0.2.16 @@ -325,7 +330,7 @@ default-package-overrides: - clumpiness ==0.17.0.0 - ClustalParser ==1.1.4 - clustering ==0.2.1 - - cmark ==0.5.3.1 + - cmark ==0.5.4 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.14 @@ -346,8 +351,8 @@ default-package-overrides: - concurrent-output ==1.7.7 - concurrent-supply ==0.1.8 - conduit ==1.2.8 - - conduit-combinators ==1.0.8.1 - - conduit-extra ==1.1.13.3 + - conduit-combinators ==1.0.8.2 + - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 - ConfigFile ==1.1.4 @@ -462,10 +467,10 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.8 + - dns ==2.0.9 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - - docopt ==0.7.0.4 + - docopt ==0.7.0.5 - doctest ==0.11.0 - doctest-discover ==0.1.0.7 - doctest-prop ==0.2.0.1 @@ -616,7 +621,7 @@ default-package-overrides: - ghc-typelits-extra ==0.2.1 - ghc-typelits-knownnat ==0.2.2 - ghc-typelits-natnormalise ==0.5.1 - - ghcid ==0.6.5 + - ghcid ==0.6.6 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - ghcjs-perch ==0.3.3 @@ -649,7 +654,7 @@ default-package-overrides: - glib ==0.13.4.1 - Glob ==0.7.12 - gloss ==1.10.2.3 - - gloss-rendering ==1.10.3.3 + - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.2 - GLUT ==2.7.0.10 - gogol ==0.1.0 @@ -848,7 +853,7 @@ default-package-overrides: - hjsonpointer ==1.0.0.2 - hjsonschema ==1.1.0.1 - hledger ==1.0.1 - - hledger-interest ==1.5 + - hledger-interest ==1.5.1 - hledger-lib ==1.0.1 - hlibgit2 ==0.18.0.15 - hlibsass ==0.1.5.0 @@ -878,7 +883,7 @@ default-package-overrides: - HPDF ==1.4.10 - hpio ==0.8.0.4 - hprotoc ==2.4.0 - - hquantlib ==0.0.3.2 + - hquantlib ==0.0.3.3 - hreader ==1.0.2 - hruby ==0.3.4.2 - hs-bibutils ==5.5 @@ -917,7 +922,7 @@ default-package-overrides: - hspec-wai ==0.6.6 - hspec-wai-json ==0.6.1 - hspec-webdriver ==1.2.0 - - hstatistics ==0.2.5.3 + - hstatistics ==0.2.5.4 - hstatsd ==0.1 - HStringTemplate ==0.8.5 - hsx-jmacro ==7.3.8 @@ -927,7 +932,7 @@ default-package-overrides: - HTF ==0.13.1.0 - html ==1.0.1.2 - html-conduit ==1.2.1.1 - - htoml ==1.0.0.1 + - htoml ==1.0.0.3 - HTTP ==4000.3.3 - http-api-data ==0.2.4 - http-client ==0.4.31.1 @@ -936,7 +941,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.1.11 - http-date ==0.0.6.1 - - http-link-header ==1.0.2 + - http-link-header ==1.0.3 - http-media ==0.6.4 - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 @@ -971,7 +976,7 @@ default-package-overrides: - iconv ==0.4.1.3 - identicon ==0.1.0 - idris ==0.12.3 - - ieee754 ==0.7.8 + - ieee754 ==0.7.9 - IfElse ==0.85 - ignore ==0.1.1.0 - ilist ==0.2.0.0 @@ -993,7 +998,7 @@ default-package-overrides: - intero ==0.1.19 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - - IntervalMap ==0.5.1.1 + - IntervalMap ==0.5.2.0 - intervals ==0.7.2 - invariant ==0.4 - io-choice ==0.0.6 @@ -1006,7 +1011,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.1 - ip6addr ==0.5.1.4 - iproute ==1.7.1 - - IPv6Addr ==0.6.1.0 + - IPv6Addr ==0.6.2.0 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - irc-conduit ==0.2.1.1 @@ -1056,7 +1061,7 @@ default-package-overrides: - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - - language-javascript ==0.6.0.8 + - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - language-puppet ==1.3.1.1 @@ -1105,7 +1110,7 @@ default-package-overrides: - lrucache ==1.2.0.0 - lrucaching ==0.3.0 - ltext ==0.1.2.1 - - lucid ==2.9.6 + - lucid ==2.9.7 - lucid-svg ==0.7.0.0 - machines ==0.6.1 - magic ==1.1 @@ -1113,7 +1118,7 @@ default-package-overrides: - makefile ==0.1.0.5 - managed ==1.0.5 - mandrill ==0.5.2.3 - - markdown ==0.1.15 + - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 - math-functions ==0.2.0.2 @@ -1147,7 +1152,7 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mmap ==0.5.9 - - mmorph ==1.0.6 + - mmorph ==1.0.9 - mockery ==0.3.4 - modify-fasta ==0.8.2.1 - moesocks ==1.0.0.41 @@ -1156,7 +1161,7 @@ default-package-overrides: - monad-extras ==0.5.11 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.20 + - monad-logger ==0.3.20.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.2.0 @@ -1198,7 +1203,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - murmur3 ==1.0.3 - MusicBrainz ==0.2.4 - - mustache ==2.1 + - mustache ==2.1.2 - mutable-containers ==0.3.3 - mwc-probability ==1.2.2 - mwc-random ==0.13.4.0 @@ -1253,7 +1258,7 @@ default-package-overrides: - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.1.1 + - opaleye ==0.5.2.1 - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 @@ -1261,7 +1266,7 @@ default-package-overrides: - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.0 - - operational ==0.2.3.4 + - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.5.0.1 - optional-args ==1.0.1 @@ -1437,7 +1442,7 @@ default-package-overrides: - readable ==0.3.1 - ReadArgs ==1.2.2 - readline ==1.0.3.0 - - rebase ==1.0.2.1 + - rebase ==1.0.3 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1473,7 +1478,7 @@ default-package-overrides: - reroute ==0.4.0.1 - resolve-trivial-conflicts ==0.3.2.3 - resource-pool ==0.2.3.2 - - resourcet ==1.1.8 + - resourcet ==1.1.8.1 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.19.0.3 @@ -1496,13 +1501,14 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.9 + - safe ==0.3.10 - safe-exceptions ==0.1.4.0 - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - sampling ==0.2.0 - sandi ==0.4.0 - sandman ==0.2.0.1 + - say ==0.1.0.0 - sbv ==5.12 - scalpel ==0.3.1 - scanner ==0.2 @@ -1553,7 +1559,7 @@ default-package-overrides: - SHA ==1.6.4.2 - shake ==0.15.10 - shake-language-c ==0.10.0 - - shakespeare ==2.0.11.1 + - shakespeare ==2.0.11.2 - shell-conduit ==4.5.2 - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 @@ -1582,8 +1588,8 @@ default-package-overrides: - smsaero ==0.6.1 - smtLib ==1.0.8 - smtp-mail ==0.1.4.5 - - snap-core ==1.0.0.0 - - snap-server ==1.0.1.0 + - snap-core ==1.0.1.0 + - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.1 - soap-openssl ==0.1.0.2 @@ -1591,7 +1597,7 @@ default-package-overrides: - socket ==0.6.1.0 - socks ==0.5.5 - solga ==0.1.0.1 - - solga-swagger ==0.1.0.1 + - solga-swagger ==0.1.0.2 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - spdx ==0.2.1.0 @@ -1610,7 +1616,7 @@ default-package-overrides: - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.9.0 + - sqlite-simple ==0.4.10.0 - srcloc ==0.5.1.0 - stache ==0.1.8 - stack-run-auto ==0.1.1.4 @@ -1705,13 +1711,13 @@ default-package-overrides: - terminal-progress-bar ==0.0.1.4 - terminal-size ==0.3.2.1 - terminfo ==0.4.0.2 - - test-fixture ==0.4.1.0 + - test-fixture ==0.4.2.0 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.3 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - - test-simple ==0.1.8 + - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - texmath ==0.8.6.7 - text ==1.2.2.1 @@ -1730,14 +1736,15 @@ default-package-overrides: - tf-random ==0.5 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 - - th-expand-syns ==0.4.0.0 + - th-expand-syns ==0.4.1.0 - th-extras ==0.0.0.4 - th-lift ==0.7.6 - th-lift-instances ==0.1.10 - - th-orphans ==0.13.2 + - th-orphans ==0.13.3 - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 + - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - these ==0.7.2 - threads ==0.5.1.4 @@ -1764,7 +1771,7 @@ default-package-overrides: - transformers-base ==0.4.4 - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 - - transient ==0.4.4 + - transient ==0.4.4.1 - transient-universe ==0.3.5 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 @@ -1846,7 +1853,7 @@ default-package-overrides: - vcswrapper ==0.1.3 - vector ==0.11.0.0 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.2 + - vector-binary-instances ==0.2.3.3 - vector-buffer ==0.4.1 - vector-fftw ==0.1.3.7 - vector-instances ==3.3.1 @@ -1885,7 +1892,7 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.8 + - warp ==3.2.9 - warp-tls ==3.2.2 - web-plugins ==0.2.9 - web-routes ==0.27.11 @@ -1918,7 +1925,7 @@ default-package-overrides: - wl-pprint-text ==1.1.0.4 - word-trie ==0.3.0 - word8 ==0.1.2 - - wordpass ==1.0.0.6 + - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 @@ -1957,18 +1964,18 @@ default-package-overrides: - YampaSynth ==0.2 - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - - yesod ==1.4.3 + - yesod ==1.4.3.1 - yesod-auth ==1.4.13.5 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.5.1.3 - yesod-auth-oauth2 ==0.2.2 - yesod-bin ==1.4.18.7 - - yesod-core ==1.4.25 + - yesod-core ==1.4.26 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 - - yesod-form ==1.4.8 + - yesod-form ==1.4.9 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 @@ -2071,7 +2078,6 @@ package-maintainers: - shakespeare abbradar: - Agda - - lambdabot dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2584,6 +2590,7 @@ dont-distribute-packages: 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 ] + brick: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ 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 ] @@ -2672,6 +2679,7 @@ dont-distribute-packages: car-pool: [ 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 ] + carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2945,6 +2953,7 @@ dont-distribute-packages: Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ] contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + convert-annotation: [ i686-linux, x86_64-linux, x86_64-darwin ] convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3206,11 +3215,9 @@ dont-distribute-packages: 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 ] - diff-parse: [ 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 ] - difftodo: [ 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 ] @@ -3843,6 +3850,14 @@ dont-distribute-packages: goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-simulation: [ 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-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-iam: [ 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 ] gooey: [ 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 ] @@ -3929,6 +3944,8 @@ dont-distribute-packages: 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-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + gssapi: [ 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 ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4138,10 +4155,12 @@ dont-distribute-packages: haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast: [ 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-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 ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4357,6 +4376,7 @@ dont-distribute-packages: HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4420,6 +4440,10 @@ 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-ui: [ 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 ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4432,6 +4456,7 @@ 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-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4439,6 +4464,7 @@ dont-distribute-packages: hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ 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-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4637,6 +4663,7 @@ dont-distribute-packages: hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ 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-diff: [ 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 ] @@ -4669,6 +4696,7 @@ dont-distribute-packages: hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hsubconvert: [ 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 ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4692,6 +4720,7 @@ dont-distribute-packages: 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-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4901,6 +4930,7 @@ dont-distribute-packages: 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 ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4935,6 +4965,7 @@ dont-distribute-packages: jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4955,6 +4986,8 @@ dont-distribute-packages: js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle: [ 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 ] @@ -5074,7 +5107,9 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ 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 ] @@ -5277,6 +5312,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5401,6 +5437,7 @@ dont-distribute-packages: MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT: [ 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 ] mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5622,6 +5659,7 @@ 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-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell: [ 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 ] @@ -5823,6 +5861,7 @@ dont-distribute-packages: 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 ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6294,6 +6333,7 @@ dont-distribute-packages: recursion-schemes: [ 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 ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6375,6 +6415,8 @@ dont-distribute-packages: repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + req: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6460,6 +6502,7 @@ dont-distribute-packages: ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6666,6 +6709,7 @@ dont-distribute-packages: 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-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 ] @@ -7027,6 +7071,7 @@ dont-distribute-packages: target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ 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 ] @@ -7038,6 +7083,7 @@ dont-distribute-packages: 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-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7151,6 +7197,7 @@ dont-distribute-packages: time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ 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 ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b597532b44d..168558424641 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused , jailbreak-cabal, hscolour, cpphs, nodePackages -}: +}: let isCross = (ghc.cross or null) != null; in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -12,13 +12,14 @@ , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [] , configureFlags ? [] , description ? "" -, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version +, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false , enableExecutableProfiling ? false -, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) -, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +# TODO enable shared libs for cross-compiling +, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) +, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] @@ -30,7 +31,8 @@ , jailbreak ? false , license , maintainers ? [] -, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" +# TODO Do we care about haddock when cross-compiling? +, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] @@ -57,14 +59,12 @@ let inherit (stdenv.lib) optional optionals optionalString versionOlder concatStringsSep enableFeature optionalAttrs toUpper; - isCross = ghc.isCross or false; isGhcjs = ghc.isGhcjs or false; packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version then "package-db" else "package-conf"; - nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc; - nativeIsCross = nativeGhc.isCross or false; + nativeGhc = if isCross || isGhcjs then ghc.bootPkgs.ghc else ghc; nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version then "package-db" else "package-conf"; @@ -88,6 +88,17 @@ let # details are at <https://github.com/peti/ghc-library-id-bug>. enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; + crossCabalFlags = [ + "--with-ghc=${ghc.cross.config}-ghc" + "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" + "--with-gcc=${ghc.cc}" + "--with-ld=${ghc.ld}" + "--hsc2hs-options=--cross-compile" + ]; + + crossCabalFlagsString = + stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); + defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" "--with-gcc=$CC" # Clang won't work without that extra information. @@ -106,7 +117,9 @@ let ] ++ optionals isGhcjs [ "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" - ]; + ] ++ optionals isCross ([ + "--configure-option=--host=${ghc.cross.config}" + ] ++ crossCabalFlags); setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") @@ -132,9 +145,9 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; + setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; - ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc"; ghcCommandCaps = toUpper ghcCommand; in @@ -194,9 +207,6 @@ stdenv.mkDerivation ({ fi if [ -d "$p/lib" ]; then configureFlags+=" --extra-lib-dirs=$p/lib" - ${ stdenv.lib.optionalString stdenv.isDarwin - "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib" - } fi done ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache @@ -236,7 +246,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${setupCommand} build ${buildTarget} + ${setupCommand} build ${buildTarget}${crossCabalFlagsString} runHook postBuild ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 728684fd028b..65904d0d249c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1655,10 +1655,8 @@ self: { }: mkDerivation { pname = "BlastHTTP"; - version = "1.2.0"; - sha256 = "65a58d1e7f5731feabef05480032c674fc55d559d2d4c391cf3fb0aa9ee4166e"; - revision = "1"; - editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba"; + version = "1.2.1"; + sha256 = "cee85e0fba0530aff57209b3d91a800db52b63c3f7e4a431a04e7a9cbd355bd5"; libraryHaskellDepends = [ base biocore biofasta blastxml bytestring conduit HTTP http-conduit hxt mtl network transformers @@ -1699,8 +1697,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.4.1"; - sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429"; + version = "0.8.4.2"; + sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4504,8 +4502,8 @@ self: { }: mkDerivation { pname = "EntrezHTTP"; - version = "1.0.2"; - sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9"; + version = "1.0.3"; + sha256 = "395c438c8b5b68fc0826e1946483d252a8936d5a91a25bf928eef113b4f9a89b"; libraryHaskellDepends = [ base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -5672,8 +5670,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.0"; - sha256 = "7f66dcdd5cdaa85d9ee14cbabb856e545b97f05ceeb55ce52ba1ef79ea33d3a9"; + version = "0.9.1.1"; + sha256 = "be780905be2f45683bb7ea702ac87f7c9b30d7cfeadc0fce9d5a9d989533a38c"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -5751,12 +5749,19 @@ self: { }) {}; "GPipe-GLFW" = callPackage - ({ mkDerivation, base, GLFW-b, GPipe, transformers }: + ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe + , transformers + }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.2.2"; - sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652"; + version = "1.2.3"; + sha256 = "a6854b9e0a2790db5205d22035cfa6e68c8e2341918a875e851f22264a9b5c40"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; + executableHaskellDepends = [ + base exception-transformers GPipe transformers + ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; @@ -6057,17 +6062,20 @@ self: { }) {}; "Gifcurry" = callPackage - ({ mkDerivation, base, cmdargs, directory, gtk3, process, temporary + ({ mkDerivation, base, cmdargs, directory, filepath, gtk3, process + , temporary, text }: mkDerivation { pname = "Gifcurry"; - version = "2.0.0.2"; - sha256 = "1a7f269eda348fa34fe57f9a35cc810b304acc646f5146c4db2d72eb738c8b32"; + version = "2.1.0.0"; + sha256 = "51cf0949e4ea0ae9503887c0c8613d4bfee0b4bdce1d641cf0b2fd016124170c"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory process temporary ]; + libraryHaskellDepends = [ + base directory filepath process temporary text + ]; executableHaskellDepends = [ - base cmdargs directory gtk3 process temporary + base cmdargs directory filepath gtk3 process temporary text ]; homepage = "https://github.com/lettier/gifcurry"; description = "Create animated GIFs, overlaid with optional text, from video files"; @@ -6881,6 +6889,7 @@ self: { homepage = "https://github.com/I3ck/HGE2D"; description = "2D game engine written in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HGL" = callPackage @@ -9562,25 +9571,6 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "0.6.1.0"; - sha256 = "dea0eb0a534e1df647487f120428ac7cfc54ab9c8ca75f63fe47a4020d4888c6"; - libraryHaskellDepends = [ - attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_0_6_2_0" = callPackage - ({ mkDerivation, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; version = "0.6.2.0"; sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926"; libraryHaskellDepends = [ @@ -9592,7 +9582,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IcoGrid" = callPackage @@ -9708,8 +9697,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.5.1.1"; - sha256 = "5a3324a4a98f2b15f871db98e2b2fe4a0f65d9de776314b955f30d4c1eda32ab"; + version = "0.5.2.0"; + sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -10576,8 +10565,8 @@ self: { }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "2.1.0"; - sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82"; + version = "2.1.1"; + sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory @@ -10982,6 +10971,7 @@ 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 @@ -12071,8 +12061,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.2"; - sha256 = "7f29640168103c6a6194b37737a62057e7bb8cff3e8503e9dd1e46bb60552c9b"; + version = "0.3.2.4"; + sha256 = "45ee5a82f1cecc381299d1998ae194ee05348a30cfa827cd5aea277310bf5c5b"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -13686,10 +13676,10 @@ self: { ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { pname = "QIO"; - version = "1.2"; - sha256 = "a6c35c08c698137e2923a1e5d5877d0349f75711d6119fcb68eb395b72b1a0f2"; + version = "1.3"; + sha256 = "e81da8f965cc031009fd9005f5cc253b83466bc0a14a2857d73c2c902ab6aba7"; libraryHaskellDepends = [ base containers mtl old-time random ]; - homepage = "http://www.cs.nott.ac.uk/~asg/QIO/"; + 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; @@ -14136,8 +14126,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.2.5"; - sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd"; + version = "1.2.6"; + sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14340,15 +14330,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Rasterific_0_7" = callPackage + "Rasterific_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.7"; - sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1"; + version = "0.7.1"; + sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef"; + revision = "1"; + editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -15756,8 +15748,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "Spock-api-server" = callPackage ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: @@ -17971,20 +17962,20 @@ self: { }) {}; "XSaiga" = callPackage - ({ mkDerivation, base, cgi, containers, hsparql, pretty, rdf4h - , text + ({ mkDerivation, base, cgi, containers, hsparql, network, pretty + , rdf4h, text }: mkDerivation { pname = "XSaiga"; - version = "1.3.0.1"; - sha256 = "a913eac19f76759271bc331084773e04f4d6d16dd70190e10bd9403e51cdaad2"; + version = "1.5.0.0"; + sha256 = "395e8e9710edac5a9c9355d52fc08cc293d76a6fbda12b7cc1d173d8d10f8e6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hsparql pretty rdf4h text + base containers hsparql network pretty rdf4h text ]; executableHaskellDepends = [ - base cgi containers hsparql pretty rdf4h text + base cgi containers hsparql network pretty rdf4h text ]; homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; @@ -20144,8 +20135,8 @@ self: { ({ mkDerivation, aeson, base, json-ast }: mkDerivation { pname = "aeson-json-ast"; - version = "0.1"; - sha256 = "fac988efb621e4ac75269138df140dc1e1e8287c206416f2a81cd3d3b3716d9a"; + version = "0.1.1"; + sha256 = "ff45897bfecd8cd29c7464a60c97829361569285300bb5d30a01c97519512d5d"; libraryHaskellDepends = [ aeson base json-ast ]; homepage = "https://github.com/sannsyn/aeson-json-ast"; description = "Integration layer for \"json-ast\" and \"aeson\""; @@ -20421,8 +20412,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.3.1"; - sha256 = "8d7555500b9b267eee568b04e7d1ffd58dbfd4033256347d4cc82f3a8f50a116"; + version = "0.11.4"; + sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e"; libraryHaskellDepends = [ aeson base-prelude mtl-prelude scientific success text unordered-containers vector @@ -21486,8 +21477,8 @@ self: { }: mkDerivation { pname = "alsa-seq"; - version = "0.6.0.6"; - sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144"; + version = "0.6.0.7"; + sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778"; libraryHaskellDepends = [ alsa-core array base bytestring data-accessor enumset extensible-exceptions poll transformers utility-ht @@ -24415,6 +24406,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amby" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour + , data-default, data-default-class, doctest, either, exceptions + , lens, mtl, mwc-random, pretty-display, process, safe, scientific + , statistics, tasty, tasty-hunit, vector, vector-algorithms + }: + mkDerivation { + pname = "amby"; + version = "0.3.1"; + sha256 = "c13b92e077e577df6e34da03bd267f9e9c29a0f3345e6935915aabf8a3b3fda5"; + libraryHaskellDepends = [ + base Chart Chart-cairo Chart-diagrams colour data-default + data-default-class either exceptions lens mtl mwc-random + pretty-display process safe scientific statistics vector + vector-algorithms + ]; + testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; + homepage = "https://github.com/jsermeno/amby#readme"; + description = "Statistical data visualization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ampersand" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, csv , directory, filepath, graphviz, hashable, HStringTemplate, lens @@ -24503,8 +24516,8 @@ self: { }: mkDerivation { pname = "amqp-worker"; - version = "0.2.1"; - sha256 = "f3b89e4286f84b4d1029d4750184831b2fcb5f194446fb1b1d938824abcf08a4"; + version = "0.2.2"; + sha256 = "4d45b13eb6d58763f7da1d058ebca6163e37775c25898869811c684719d975e4"; libraryHaskellDepends = [ aeson amqp base bytestring data-default exceptions monad-control mtl resource-pool split text transformers-base @@ -26724,29 +26737,6 @@ self: { }: mkDerivation { pname = "asciidiagram"; - version = "1.3.2"; - sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asciidiagram_1_3_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative - , rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; version = "1.3.3"; sha256 = "694948f5f408aa7dfcab17ffefb74e413f1d3dacf2c523bfbf9ecaf972645f18"; isLibrary = true; @@ -26761,7 +26751,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -27016,8 +27005,8 @@ self: { }: mkDerivation { pname = "async"; - version = "2.1.0"; - sha256 = "93c37611f9c68b5cdc8cd9960ae77a7fbc25da83cae90137ef1378d857f22c2f"; + version = "2.1.1"; + sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -30108,14 +30097,18 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, silently, text, turtle }: + ({ mkDerivation, base, criterion, optparse-applicative, silently + , text, turtle + }: mkDerivation { pname = "bench"; - version = "1.0.1"; - sha256 = "b90b0789604d351aa97d736492c4b10be9bebaa369efc4145579f9f6d2eeb019"; + version = "1.0.2"; + sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base criterion silently text turtle ]; + executableHaskellDepends = [ + base criterion optparse-applicative silently text turtle + ]; homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; @@ -30368,8 +30361,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.1.0.1"; - sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271"; + version = "0.2.0.1"; + sha256 = "2e8abcb38c557c256d871f5df7566d02e74741bec24d86d2a65c97d6c1dc3b40"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -30401,8 +30394,8 @@ self: { }: mkDerivation { pname = "bibdb"; - version = "0.5.2"; - sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80"; + version = "0.5.3"; + sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32797,6 +32790,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.11.0.0"; + sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -33789,8 +33807,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.6.0.0"; - sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; + version = "0.7.0.0"; + sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34410,8 +34428,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.13"; - sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7"; + version = "0.14"; + sha256 = "5cccff3f432593ad50288e66a78a115c5e030bbb3aca37c332a914d6743bcc81"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34420,6 +34438,7 @@ self: { homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brillig" = callPackage @@ -34632,6 +34651,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "btrfs_0_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, time, unix }: + mkDerivation { + pname = "btrfs"; + version = "0.1.2.2"; + sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5"; + libraryHaskellDepends = [ base bytestring time unix ]; + homepage = "https://github.com/redneb/hs-btrfs"; + description = "Bindings to the btrfs API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, mtl, quickcheck-instances, text @@ -37430,6 +37462,7 @@ self: { homepage = "https://github.com/m1dnight/carte"; description = "Carte: A commandline pastebin server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cartel" = callPackage @@ -37487,13 +37520,13 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.0.0.5"; - sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9"; + version = "3.1.0.2"; + sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; testHaskellDepends = [ base containers doctest HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector @@ -37527,12 +37560,12 @@ self: { }: mkDerivation { pname = "casadi-bindings-core"; - version = "3.0.0.0"; - sha256 = "8cd59ae975cc1de7db78ac59f6212f2523bdf723a782a9ce0c0b47922fdf31be"; + version = "3.1.0.0"; + sha256 = "360f2cd21f2cb418b56b9a487333b1d18dbc86def6ab659a3061080b1194e623"; libraryHaskellDepends = [ base casadi-bindings-internal containers vector ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37542,10 +37575,10 @@ self: { ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.4.0"; - sha256 = "c5a48653c1f893618287adad1979ee684064daeb9b060294d65a0bea6e378976"; + version = "0.1.5.0"; + sha256 = "c24100f6de46d5a6ba21af67fca017ac67a7da2c945863b5d2879012c05bf35c"; libraryHaskellDepends = [ base containers vector ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; description = "low level bindings to CasADi"; license = stdenv.lib.licenses.lgpl3; @@ -37935,8 +37968,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.5.0"; - sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9"; + version = "0.4.5.1"; + sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -37969,19 +38002,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cassava-conduit_0_3_4" = callPackage + "cassava-conduit_0_3_5_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.3.4"; - sha256 = "cebd36d3b7cd575f2ccf38860d3f89ba0872cd196d25f5f5d1cefb579a111849"; + version = "0.3.5.1"; + sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base bytestring cassava conduit conduit-extra QuickCheck text + ]; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -38436,26 +38471,6 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.3.0"; - sha256 = "c316e07cde7559684b71d345890e8f16eb5f6cc1cdd29f96e8c4296bcf8a8af4"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_4_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; version = "0.5.4.0"; sha256 = "daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7"; libraryHaskellDepends = [ @@ -38468,7 +38483,6 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -38757,8 +38771,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.3.0.1"; - sha256 = "96859110c72904089d8b3ac5fe493ac6f47aeafd1b30ffd1efce649442cc4752"; + version = "3001.3.0.2"; + sha256 = "92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1"; libraryHaskellDepends = [ base bytestring containers exceptions mtl multipart network network-uri parsec time xhtml @@ -39622,6 +39636,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cielo" = callPackage + ({ mkDerivation, aeson, base, bytestring, convertible, data-default + , hspec, http-client, http-types, lens, mtl, pretty-show + , QuickCheck, template-haskell, text, uuid, wreq + }: + mkDerivation { + pname = "cielo"; + version = "0.1.2.0"; + sha256 = "9c7df3e4d019a625c143f6ace77e282389651197b5d7b5fd9d502dec0ca24020"; + libraryHaskellDepends = [ + aeson base bytestring convertible data-default http-client + http-types lens mtl template-haskell text uuid wreq + ]; + testHaskellDepends = [ + aeson base bytestring convertible data-default hspec http-client + http-types lens mtl pretty-show QuickCheck template-haskell text + uuid wreq + ]; + homepage = "https://github.com/beijaflor-io/haskell-cielo"; + description = "Cielo API v3 Bindings for Haskell"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cil" = callPackage ({ mkDerivation, base, bytestring, language-c }: mkDerivation { @@ -40075,8 +40112,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.1"; - sha256 = "27c81214e72d9a4c6e701fc05d2adc5cb0732cc07c4fb715a6bf2f9d904058ee"; + version = "0.2.0.2"; + sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c"; libraryHaskellDepends = [ base bytestring containers contravariant inline-c microlens microlens-contra singletons stm template-haskell vector @@ -40319,22 +40356,23 @@ self: { , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions - , semigroups, stm, text, time, time-locale-compat, transformers - , transformers-base, unordered-containers, vector, vector-instances + , mutable-containers, primitive, QuickCheck, safe-exceptions, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0.2"; - sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; + version = "1.0.1"; + sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async lifted-base monad-unlift mono-traversable mono-traversable-instances mtl mutable-containers primitive - safe-exceptions semigroups stm text time time-locale-compat - transformers transformers-base unordered-containers vector - vector-instances + safe-exceptions say semigroups stm stm-chans text time + time-locale-compat transformers transformers-base + unordered-containers vector vector-instances ]; testHaskellDepends = [ base containers hspec QuickCheck transformers unordered-containers @@ -40352,8 +40390,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.0.0"; - sha256 = "248b3a30c6da08400039b5a9485039319e059c52927edf2a1dbcd6a9089da22e"; + version = "1.0.1"; + sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -40374,8 +40412,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.0.0"; - sha256 = "12ac3f4b72302cf18a7ebd5a836eb8cfe22729cbcd1f0a723db047c2b80a9ce2"; + version = "1.0.1"; + sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -40387,6 +40425,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classyplate" = callPackage + ({ mkDerivation, base, template-haskell, type-list }: + mkDerivation { + pname = "classyplate"; + version = "0.1.0.0"; + sha256 = "b10d14b679f41e41755013b18b11158310bf80ff415cb369444a8f82388f6fbc"; + libraryHaskellDepends = [ base template-haskell type-list ]; + description = "Fuseable type-class based generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clay" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { @@ -41149,6 +41198,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clustering_0_3_1" = callPackage + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty + , tasty-hunit, tasty-quickcheck, unordered-containers, vector + }: + mkDerivation { + pname = "clustering"; + version = "0.3.1"; + sha256 = "bc69248083d4c7f7ed32b1f0971d18a52414fd0ee8bc1f05fea8e4538fe87f86"; + libraryHaskellDepends = [ + base binary containers matrices mwc-random parallel primitive + unordered-containers vector + ]; + testHaskellDepends = [ + base binary hierarchical-clustering matrices mwc-random Rlang-QQ + split tasty tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clustertools" = callPackage ({ mkDerivation, base, bio, bytestring, containers, QuickCheck , regex-compat, simpleargs @@ -41206,11 +41277,11 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.5.3.1"; - sha256 = "4ae12da7e712d10a662a8323e7bc513daa1abf3ad4d055054b5f19b1122ca124"; + version = "0.5.4"; + sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; - homepage = "https://github.com/jgm/commonmark-hs"; + homepage = "https://github.com/jgm/cmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41248,8 +41319,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.1"; - sha256 = "4df6ea052023b545da67a38311b69c751e1372515799b6ff88163b12f38ddf00"; + version = "0.1.0.2"; + sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -42947,6 +43018,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concrete-haskell" = callPackage + ({ mkDerivation, base, bytestring, hashable, QuickCheck, text + , thrift, unordered-containers, vector + }: + mkDerivation { + pname = "concrete-haskell"; + version = "0.1.0.0"; + sha256 = "68312cbefd0aa617b253c5e4d89dbdd71a394c74dfee9eb20426222fff017e40"; + libraryHaskellDepends = [ + base bytestring hashable QuickCheck text thrift + unordered-containers vector + ]; + homepage = "https://github.com/hltcoe"; + description = "Library for the Concrete data format"; + license = "GPL"; + }) {}; + "concrete-relaxng-parser" = callPackage ({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties , hxt-curl, hxt-relaxng, hxt-tagsoup @@ -43387,8 +43475,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.8.1"; - sha256 = "cf347790f173dce64ebf7ef1b364686fee2d890bfa38caa9145494a5909a7637"; + version = "1.0.8.2"; + sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -43435,8 +43523,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.13.3"; - sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48"; + version = "1.1.15"; + sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -43444,7 +43532,7 @@ self: { ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm + conduit directory exceptions hspec process QuickCheck resourcet stm streaming-commons text transformers transformers-base ]; homepage = "http://github.com/snoyberg/conduit"; @@ -43452,33 +43540,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-extra_1_1_14" = callPackage - ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , hspec, monad-control, network, primitive, process, QuickCheck - , resourcet, stm, streaming-commons, text, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.1.14"; - sha256 = "6f3abc94f28fb577fc03383ba477fe4f2635cb14fed2f90c7520e1331dc343c6"; - libraryHaskellDepends = [ - async attoparsec base blaze-builder bytestring conduit directory - exceptions filepath monad-control network primitive process - resourcet stm streaming-commons text transformers transformers-base - ]; - testHaskellDepends = [ - async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -43657,6 +43718,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "config-ini" = callPackage + ({ mkDerivation, base, directory, ini, megaparsec, QuickCheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "config-ini"; + version = "0.1.1.0"; + sha256 = "ef88423e53604474a4e1b2bfb0f0824efed740af25f2b1841577838bc96d10ac"; + revision = "1"; + editedCabalFile = "8665338f86052e9963fe0472b0c1e30c865e14f8450d16bc35519bf5e07f2032"; + libraryHaskellDepends = [ + base megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + base directory ini QuickCheck text unordered-containers + ]; + homepage = "https://github.com/aisamanra/config-ini"; + description = "A library for simple INI-based configuration files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -43993,13 +44075,13 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.1.0"; - sha256 = "688cbecb6288c5e12c48c2bafaf27f470fe1b9d61c293b529581799cf95c7146"; + version = "0.4.2.0"; + sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht ]; - description = "Interpret the command line and settings in a config file as commands and options"; + description = "Interpret the command line and a config file as commands and options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -44773,6 +44855,7 @@ self: { homepage = "http://github.com/GregorySchwartz/convert-annotation#readme"; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "convertible" = callPackage @@ -45923,8 +46006,8 @@ self: { }: mkDerivation { pname = "crawlchain"; - version = "0.1.0.9"; - sha256 = "12bd2f1f2f9dbe5abb67a77a85db087669917381f2ddcc2b28fb5d3aa1248238"; + version = "0.1.1.4"; + sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917"; libraryHaskellDepends = [ base bytestring directory HTTP network-uri split tagsoup time ]; @@ -46225,6 +46308,8 @@ self: { pname = "criterion"; version = "1.1.4.0"; sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76"; + revision = "1"; + editedCabalFile = "61a5386463efe3da9c0bc5d14f6074e500dc76fc62e2dda40eaf81955716fe41"; libraryHaskellDepends = [ aeson ansi-wl-pprint base binary bytestring cassava code-page containers deepseq directory filepath Glob hastache js-flot @@ -46341,6 +46426,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_4_2" = callPackage + ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat + , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers-compat + }: + mkDerivation { + pname = "cron"; + version = "0.4.2"; + sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3"; + revision = "1"; + editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde"; + libraryHaskellDepends = [ + attoparsec base mtl mtl-compat old-locale semigroups text time + ]; + testHaskellDepends = [ + attoparsec base generics-sop quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck text time transformers-compat + ]; + homepage = "http://github.com/michaelxavier/cron"; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cron-compat" = callPackage ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -46964,9 +47073,9 @@ self: { }: mkDerivation { pname = "cryptonite-openssl"; - version = "0.2"; - sha256 = "bbf6787c33edb287359fc48802512ab2d5c95b02bd6c1a759d7f9bc157703fcb"; - libraryHaskellDepends = [ base bytestring memory ]; + version = "0.3"; + sha256 = "43c8f8b4259f103be4408734f604c55a0053e60d302890174ba4773828bdee26"; + libraryHaskellDepends = [ base bytestring cryptonite memory ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring cryptonite tasty tasty-hunit tasty-kat @@ -47404,8 +47513,8 @@ self: { }: mkDerivation { pname = "cubicbezier"; - version = "0.4.0.2"; - sha256 = "b3e87a3fa4000f44121b6278d1a0b258acc2c71425fe7bf9d565fa7c36581a17"; + version = "0.5.0.0"; + sha256 = "96c2792707bc80a45a428886af97c1b4c7524a2e9ba0be13fa60d7bac879e508"; libraryHaskellDepends = [ base containers integration matrices microlens microlens-mtl microlens-th mtl vector @@ -47778,8 +47887,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.4"; - sha256 = "e194ab6f0447adf7954b1b94b1533ded8c79af99a7c8976e316934a22452f5b3"; + version = "0.1.5"; + sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49129,6 +49238,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-has" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-has"; + version = "0.1.0.0"; + sha256 = "8b5b4a68965b8c31ef10cc2ae37e7c4d09ae44ee0790002adb8ccf1ad6a48ab2"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/winterland1989/data-has"; + description = "Simple extensible product"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-hash" = callPackage ({ mkDerivation, array, base, containers, QuickCheck , test-framework, test-framework-quickcheck2 @@ -50786,8 +50907,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.91.1"; - sha256 = "0624b718aec8e1d28fdf4d471c1236a66099555ac22858dbe49a7ee00f9b25e6"; + version = "3.91.2"; + sha256 = "16b14ad562ef5895462b59790f42d591d977e1433c4c2763a3a6a34e052e0d56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52148,8 +52269,10 @@ self: { pname = "diagrams-boolean"; version = "0.1.0"; sha256 = "c0b174cc23e6dc461e6ec6a68797a9552933e7d800e3e66ce85ef1ccf151b69e"; + revision = "2"; + editedCabalFile = "49fa3d3493471de57b921c41b986c3537a9cd30cf1f42eb7170a13293c70d596"; libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; - description = "boolean operations on Diagrams paths"; + description = "deprecated, part of diagrams-contrib since 1.4"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52294,7 +52417,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-contrib_1_4" = callPackage + "diagrams-contrib_1_4_0_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -52304,8 +52427,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4"; - sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb"; + version = "1.4.0.1"; + sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -53006,7 +53129,6 @@ self: { testHaskellDepends = [ attoparsec base hspec text ]; description = "A parser for diff file formats"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diff3" = callPackage @@ -53100,7 +53222,6 @@ self: { homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digamma" = callPackage @@ -53667,12 +53788,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_7_0" = callPackage + "directory_1_2_7_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.7.0"; - sha256 = "4ae59ebd9969f300e579c2b62fb072954a297b2f53fcd5d58bab363535ce7040"; + version = "1.2.7.1"; + sha256 = "cf3c0984238ac5bb67706b03f86f823feb50d46092ed6ec6e523b89a1d0836cf"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54505,6 +54626,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "diversity_0_8_0_2" = callPackage + ({ mkDerivation, base, containers, data-ordlist, fasta + , math-functions, MonadRandom, optparse-applicative, parsec, pipes + , random-shuffle, scientific, semigroups, split + }: + mkDerivation { + pname = "diversity"; + version = "0.8.0.2"; + sha256 = "f8bea710958aff9169f150efc112ec871230eccf464315b956dccdd8460c7324"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-ordlist fasta math-functions MonadRandom + parsec random-shuffle scientific split + ]; + executableHaskellDepends = [ + base containers fasta optparse-applicative pipes semigroups + ]; + homepage = "https://github.com/GregorySchwartz/diversity"; + description = "Quantify the diversity of a population"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dixi" = callPackage ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base , base-orphans, blaze-html, blaze-markup, bytestring @@ -54645,30 +54790,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 + "dmenu" = callPackage + ({ mkDerivation, base, containers, directory, lens, mtl, process + , transformers }: mkDerivation { - pname = "dns"; - version = "2.0.8"; - sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9"; + pname = "dmenu"; + version = "0.3.0.0"; + sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb"; libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe + base containers directory lens mtl process transformers ]; - 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"; + homepage = "https://github.com/m0rphism/haskell-dmenu"; + description = "Complete bindings to the dmenu and dmenu2 command line tools"; license = stdenv.lib.licenses.bsd3; }) {}; - "dns_2_0_9" = callPackage + "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -54689,7 +54827,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -54891,26 +55028,6 @@ self: { "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , HUnit, parsec, split, template-haskell, th-lift - }: - mkDerivation { - pname = "docopt"; - version = "0.7.0.4"; - sha256 = "3470cd9de7b1731a0b2c0a3fe8b9ea1bfdcfbebeffa5ed77831572f50f01e480"; - libraryHaskellDepends = [ - base containers parsec template-haskell th-lift - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring containers HUnit parsec split - template-haskell th-lift - ]; - homepage = "https://github.com/docopt/docopt.hs"; - description = "A command-line interface parser that will make you smile"; - license = stdenv.lib.licenses.mit; - }) {}; - - "docopt_0_7_0_5" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift }: mkDerivation { @@ -54927,7 +55044,6 @@ self: { homepage = "https://github.com/docopt/docopt.hs"; description = "A command-line interface parser that will make you smile"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctemplates" = callPackage @@ -55077,24 +55193,24 @@ self: { }) {}; "dom-parser" = callPackage - ({ mkDerivation, base, data-default, hspec, lens, mtl, semigroups - , shakespeare, text, transformers, xml-conduit + ({ mkDerivation, base, data-default, hspec, lens, mtl, open-union + , semigroups, shakespeare, text, transformers, type-fun + , xml-conduit, xml-lens }: mkDerivation { pname = "dom-parser"; - version = "0.0.1"; - sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b"; - revision = "1"; - editedCabalFile = "1157c5f603c43f5a4bd0ea7f45da822b989db065324bbecb2e14659473eb766f"; + version = "0.1.1"; + sha256 = "e001c486adb3b2c6c6ab18e70205dc759ea018b6db084f8668bb424b623e4e03"; libraryHaskellDepends = [ - base lens mtl semigroups shakespeare text transformers xml-conduit + base lens mtl open-union semigroups shakespeare text transformers + type-fun xml-conduit xml-lens ]; testHaskellDepends = [ - base data-default hspec shakespeare text xml-conduit + base data-default hspec lens semigroups shakespeare text + xml-conduit ]; - homepage = "https://github.com/s9gf4ult/dom-parser"; - description = "Simple monad for parsing DOM"; - license = stdenv.lib.licenses.bsd3; + description = "Simple monadic DOM parser"; + license = stdenv.lib.licenses.mit; }) {}; "dom-selector" = callPackage @@ -55695,6 +55811,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "drawille_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "drawille"; + version = "0.1.2.0"; + sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + homepage = "https://github.com/yamadapc/haskell-drawille#readme"; + description = "A port of asciimoo's drawille to haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dresdner-verkehrsbetriebe" = callPackage ({ mkDerivation, aeson, base, bytestring, HTTP, old-locale , optparse-applicative, time, unordered-containers, vector @@ -55761,11 +55891,11 @@ self: { ({ mkDerivation, base, drmaa, inline-c, shelly, text }: mkDerivation { pname = "drmaa"; - version = "0.1.0.1"; - sha256 = "5cb530e4c7f8cde9e8b4520ef116a44e9c5cde8191ad7f91964ca270c69ae1e7"; + version = "0.1.1"; + sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; libraryHaskellDepends = [ base inline-c shelly text ]; librarySystemDepends = [ drmaa ]; - description = "A simple Haskell bindings to DRMAA C library"; + description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {drmaa = null;}; @@ -57172,8 +57302,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.6.1"; - sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; + version = "3.6.3"; + sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57217,8 +57347,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.5.9"; - sha256 = "9540ca3bcf92594a9b203df1f1b862264ebfe0e36eb49bb04fe10bbae2a9c9ab"; + version = "3.6.2"; + sha256 = "b1dc21a80daacb240ad339bfcd895ee7e10f41560b14566766e168ab4606a2c0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57443,6 +57573,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-influxdb" = callPackage + ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "ekg-influxdb"; + version = "0.1.0.0"; + sha256 = "8512eb20523c3b21811a3f61ab53ff91bfefdc8edea223bb9d9969a59c3935a4"; + libraryHaskellDepends = [ + base clock containers ekg-core libinfluxdb text time + unordered-containers vector + ]; + homepage = "https://github.com/angerman/ekg-influxdb"; + description = "An EKG backend to send statistics to influxdb"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ekg-json" = callPackage ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers }: @@ -57553,8 +57700,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck }: mkDerivation { pname = "electrum-mnemonic"; - version = "0.1.2"; - sha256 = "638a29ecaf2e3fb9123e01c959c4299bbcc487dadb3743821123d6280e775cd3"; + version = "0.1.3"; + sha256 = "c05e2ddd4b18a0f8202e523032ed8cacd3cd57549c533154fb0bbc604b27aaf6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; @@ -58136,6 +58283,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emailaddress_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest + , email-validate, Glob, http-api-data, opaleye, path-pieces + , persistent, postgresql-simple, product-profunctors, profunctors + , text + }: + mkDerivation { + pname = "emailaddress"; + version = "0.2.0.0"; + sha256 = "390b0aaf8fa2d3a694b812ad83fc0f26ed5c7172cc318a7d46c1fc3456d9c15c"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring email-validate http-api-data + opaleye path-pieces persistent postgresql-simple + product-profunctors profunctors text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/emailaddress#readme"; + description = "Wrapper around email-validate library adding instances for common type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emailparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, either , either-unwrap, HUnit, mime, MissingH, mtl, QuickCheck, strptime @@ -61463,8 +61632,8 @@ self: { }: mkDerivation { pname = "fbmessenger-api"; - version = "0.1.2.0"; - sha256 = "94bba7cff0abeb451ca841d30ef8237c9803331e1e988a9a5f6303eb4797ab2c"; + version = "0.1.2.1"; + sha256 = "9df807a7c6ecf9dc374a17cbda52433b2567aa60753797497c7e043ef6837237"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61669,8 +61838,8 @@ self: { pname = "feed"; version = "0.3.11.1"; sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983"; - revision = "3"; - editedCabalFile = "0baffc9bcab66296a904d211d4254f625811dc28eda4f1be0692cc2b219a6bdd"; + revision = "4"; + editedCabalFile = "ecce0a16a0d695b1c8ed80af4ea59e33c767ad9c6bdac5898e7cae20bd5da8c6"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -62426,12 +62595,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_4_1_0" = callPackage + "filepath_1_4_1_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.1.0"; - sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00"; + version = "1.4.1.1"; + sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -63184,8 +63353,8 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.6"; - sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da"; + version = "0.3.7"; + sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64598,8 +64767,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.1"; - sha256 = "d2db56431c37247352d2497e1a782197434f02269767584cfebbb740fde69730"; + version = "0.0.2"; + sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -65407,8 +65576,8 @@ self: { ({ mkDerivation, base, doctest, Glob, mtl }: mkDerivation { pname = "from-sum"; - version = "0.2.0.0"; - sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4"; + version = "0.2.1.0"; + sha256 = "a1ed8a433b98df8a70be2f9199abae3e5ed7fb4c2f2b3fb1268b6b588f326667"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/from-sum"; @@ -66292,8 +66461,7 @@ self: { homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "g-npm" = callPackage ({ mkDerivation, base, HTTP, json }: @@ -67232,8 +67400,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "genifunctors"; - version = "0.3"; - sha256 = "2520632580921ea35be3f5bfb94562abb935f8cc577e0bc8b41886eb5bf15a9a"; + version = "0.4"; + sha256 = "2df0f1cfa6861afa3eb5ecb1c87c405e30c07a843f588474902fa1531b848045"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/danr/genifunctors"; @@ -67404,15 +67572,15 @@ self: { }) {}; "geo-uk" = callPackage - ({ mkDerivation, array, base, binary, bytestring, template-haskell - , th-lift + ({ mkDerivation, array, base, binary, bytestring, bzlib + , template-haskell, th-lift }: mkDerivation { pname = "geo-uk"; - version = "0.1.0.1"; - sha256 = "a92648834307b9ac6dde2a581fbf291b36cbd8d005965e7e64512f8bdfb01e70"; + version = "0.1.0.2"; + sha256 = "feb2d70452d160a342670c56eebd8f6b135d83661dfa6860cd528248fa9f27ad"; libraryHaskellDepends = [ - array base binary bytestring template-haskell th-lift + array base binary bytestring bzlib template-haskell th-lift ]; homepage = "https://github.com/tolysz/geo-uk"; description = "High precision conversion between GPS and UK Grid"; @@ -68563,8 +68731,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.5"; - sha256 = "67f9f5c89d35f0d56d4d26bf72f25dd2f8794a67949449ef61739e84a316923c"; + version = "0.6.6"; + sha256 = "62f567852111da733b6feedbfb37ff561889e27af63d16df048f37a4bfeb6ab0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68612,8 +68780,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.5.0.2"; - sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e"; + version = "0.6.0.0"; + sha256 = "35b859e5a09dd12ada9cea7c343dae75500f50cd7d5ff247d5a5868d419049d6"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -68642,8 +68810,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.5.0.0"; - sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8"; + version = "0.6.0.0"; + sha256 = "92dea9556a700d8473b0657f80228868194984dd9edb3405cd11f58939d81e5a"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -68655,8 +68823,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.5.0.2"; - sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878"; + version = "0.6.0.0"; + sha256 = "cf65462c0b94e3d2b21efc78dd60e90e147767a0b9719a7542f4a040dc00e60d"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -68706,8 +68874,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-promise" = callPackage + ({ mkDerivation, base, ghcjs-base, protolude }: + mkDerivation { + pname = "ghcjs-promise"; + version = "0.1.0.3"; + sha256 = "2395a17260e27ac252df2a5968de8ee5f0cf55d970c2fbe6fb27b2ccf01af81b"; + libraryHaskellDepends = [ base ghcjs-base protolude ]; + homepage = "https://github.com/vwwv/ghcjs-promise"; + description = "Bidirectional bidings to javascript's promise"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcjs-websockets" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring, text + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , ghcjs-base, text }: mkDerivation { pname = "ghcjs-websockets"; @@ -68716,7 +68897,7 @@ self: { revision = "1"; editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring text + base base64-bytestring binary bytestring ghcjs-base text ]; homepage = "http://github.com/mstksg/ghcjs-websockets"; description = "Deprecated: use ghcjs-base's native websockets"; @@ -69697,8 +69878,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.7.0"; - sha256 = "97918cba0952621a9bdb78718c824a6f43a0098f6e52335d35164a2f9c7d7afa"; + version = "0.3.7.2"; + sha256 = "53b18bf7146c4d46347eb74a64add43167220377d75fb572afe5bb1e0ac173dd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69920,8 +70101,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161031"; - sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce"; + version = "6.20161118"; + sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70147,17 +70328,22 @@ self: { }) {}; "git-repair" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, filepath, hslogger, IfElse, MissingH, mtl, network - , network-uri, optparse-applicative, process, QuickCheck, text - , time, transformers, unix, unix-compat, utf8-string + ({ mkDerivation, async, base, bytestring, Cabal, containers + , data-default, directory, exceptions, filepath, hslogger, IfElse + , MissingH, mtl, network, network-uri, optparse-applicative + , process, QuickCheck, text, time, transformers, unix, unix-compat + , utf8-string }: mkDerivation { pname = "git-repair"; - version = "1.20151215"; - sha256 = "e1e5756f7ffba86a36abcdc296e0730b2a74e0f5e7711b0b6b89a09eb6f10463"; + version = "1.20161118"; + sha256 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal data-default directory exceptions filepath + hslogger IfElse MissingH mtl process unix unix-compat + ]; executableHaskellDepends = [ async base bytestring containers directory exceptions filepath hslogger IfElse MissingH mtl network network-uri @@ -70314,7 +70500,7 @@ self: { }) {}; "github-backup" = callPackage - ({ mkDerivation, base, bytestring, containers, directory + ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, MissingH , mtl, network, network-uri, optparse-applicative, pretty-show , process, text, transformers, unix, unix-compat, utf8-string @@ -70322,11 +70508,14 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20161110"; - sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245"; + version = "1.20161118"; + sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b"; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base hslogger MissingH ]; + setupHaskellDepends = [ + base bytestring Cabal directory exceptions filepath hslogger IfElse + MissingH mtl process unix unix-compat + ]; executableHaskellDepends = [ base bytestring containers directory exceptions filepath github hslogger IfElse MissingH mtl network network-uri @@ -70961,6 +71150,8 @@ self: { pname = "glirc"; version = "2.20.1.1"; sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; + revision = "2"; + editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -71279,19 +71470,6 @@ self: { ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; - version = "1.10.3.3"; - sha256 = "ca559268107524c8ac73f7bd4ea164e26fe5426bff49b457276ff04fce872567"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_10_3_5" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; version = "1.10.3.5"; sha256 = "00c68518b2eb62f086257238034a18065faa7939369a5b2986c2f461e6a80d73"; libraryHaskellDepends = [ @@ -71299,7 +71477,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -71559,8 +71736,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.18"; - sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a"; + version = "0.1.19"; + sha256 = "4cf869138bb7a748ccfb0d084ed53ddb19930793da39c0a45065d14e5251013b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72591,6 +72768,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-core" = callPackage @@ -72952,6 +73130,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage @@ -73264,6 +73443,7 @@ 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 @@ -73451,6 +73631,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-monitoring" = callPackage @@ -73863,6 +74044,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage @@ -73875,6 +74057,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-script" = callPackage @@ -73912,6 +74095,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage @@ -73924,6 +74108,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-sheets" = callPackage @@ -74458,8 +74643,8 @@ self: { }: mkDerivation { pname = "google-oauth2"; - version = "0.2.1"; - sha256 = "ff16b3d74d6b1d4b81dcabc07f40020d19d39c04956d0067c1fe111e9b8d14ca"; + version = "0.2.2"; + sha256 = "3230c41fc67242671c517e4483dfd9612f58495389ff2413f0f33444e0448058"; libraryHaskellDepends = [ aeson base bytestring HTTP http-conduit ]; @@ -74581,8 +74766,8 @@ self: { }: mkDerivation { pname = "gore-and-ash"; - version = "1.2.1.0"; - sha256 = "216c58cf971d991aedcdda7100da3dfda433371c6fa47404df9431357cd84f82"; + version = "1.2.2.0"; + sha256 = "4192efc2afac62ba0fb5d1b591a387e8bc4c346fdcd6ceb1f0d568cd8027cace"; libraryHaskellDepends = [ base containers deepseq exceptions hashable linear mtl parallel profunctors random semigroups time transformers @@ -74600,8 +74785,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-actor"; - version = "1.2.1.0"; - sha256 = "7769718f402328fb3ae3ea268d8da5398f897cd7c3702372b8a9a1f560cc9360"; + version = "1.2.2.0"; + sha256 = "0de7d9391e0760193904ea91d6cc3f499a155923bc31bb9130d3fe694eda9a10"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -74619,8 +74804,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-async"; - version = "1.1.0.0"; - sha256 = "8ed161f2d598e3f84c1ee3a2abe2ed0b8d41f4bcb526467bfbe00ba3cf6edf74"; + version = "1.1.1.0"; + sha256 = "ed0c0ee1404d68675b03cf133d0af8ecb9553ba2ce279e32c353db55957ebd18"; libraryHaskellDepends = [ async base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -74644,8 +74829,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-demo"; - version = "1.1.0.0"; - sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b"; + version = "1.2.0.0"; + sha256 = "73bfb46b00664c92376e3c2ffff7df7e54552b077c9c8ae146117d31d2465309"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74667,8 +74852,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-glfw"; - version = "1.1.1.0"; - sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c"; + version = "1.1.2.0"; + sha256 = "43fc8a90e985baa99334c11f48f87c166145bc9b597c7751cce0e18b282a483e"; libraryHaskellDepends = [ base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl transformers unordered-containers @@ -74678,6 +74863,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gore-and-ash-lambdacube" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl + , text, unordered-containers + }: + mkDerivation { + pname = "gore-and-ash-lambdacube"; + version = "0.2.0.0"; + sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d"; + libraryHaskellDepends = [ + base containers deepseq exceptions gore-and-ash hashable + lambdacube-compiler lambdacube-gl mtl text unordered-containers + ]; + homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme"; + description = "Core module for Gore&Ash engine that do something"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gore-and-ash-logging" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, extra , gore-and-ash, hashable, mtl, resourcet, text, text-show @@ -74685,8 +74888,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-logging"; - version = "2.0.0.0"; - sha256 = "a01fa0ba3867c791462f17f4910a155e5d814c113789b2b5d12766c399d65b93"; + version = "2.0.1.0"; + sha256 = "6ce12cadec13514b91593dd9cc33d3deb1cdd9bd13fec92b98d985934fa72149"; libraryHaskellDepends = [ base containers deepseq exceptions extra gore-and-ash hashable mtl resourcet text text-show transformers transformers-base @@ -74707,8 +74910,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-network"; - version = "1.3.2.0"; - sha256 = "7093854a9ceb887bd7b58cad8d79d46ed632609f54bdfb2c7a2dcefe7296f4d2"; + version = "1.4.0.0"; + sha256 = "d1bea115605525454c300419c1860168fd38e414a3760b2f6e1ef2793f5bfece"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions extra ghc-prim gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network @@ -74728,8 +74931,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-sdl"; - version = "2.1.0.0"; - sha256 = "2c8ec109e234cbaef34ac6b72a7a5182437a0f0473006d033cd51102d868294d"; + version = "2.1.1.0"; + sha256 = "8bc3bac8c1297f9110481b4fe9b75e9817952521e12af6ccfde5cd1fd589618c"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash lens linear mtl resourcet sdl2 text transformers transformers-base @@ -74743,19 +74946,17 @@ self: { "gore-and-ash-sync" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq , exceptions, gore-and-ash, gore-and-ash-actor - , gore-and-ash-logging, gore-and-ash-network, hashable, mtl - , resourcet, text, transformers, transformers-base + , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text , unordered-containers }: mkDerivation { pname = "gore-and-ash-sync"; - version = "1.2.0.0"; - sha256 = "719827da28924991b85d8d3aca1ca5fe1ebdb77d3d32154bdfc1790928015769"; + version = "1.2.0.1"; + sha256 = "e4c919188198e1c6740cd17f782ddb08bfac928448e84b77fba4987e94f262dc"; libraryHaskellDepends = [ base bytestring cereal containers deepseq exceptions gore-and-ash gore-and-ash-actor gore-and-ash-logging gore-and-ash-network - hashable mtl resourcet text transformers transformers-base - unordered-containers + hashable mtl text unordered-containers ]; homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync"; description = "Gore&Ash module for high level network synchronization"; @@ -76105,6 +76306,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gssapi" = callPackage + ({ mkDerivation, base, bytestring, gssapi_krb5, krb5, resourcet + , transformers + }: + mkDerivation { + pname = "gssapi"; + version = "0.1.0.0"; + sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd"; + libraryHaskellDepends = [ base bytestring resourcet transformers ]; + librarySystemDepends = [ gssapi_krb5 krb5 ]; + homepage = "https://github.com/ondrap/gssapi"; + description = "libgssapi and libkrb5 bindings for haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gssapi_krb5 = null; krb5 = null;}; + + "gssapi-wai" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , case-insensitive, gssapi, http-types, vault, wai, wai-extra + }: + mkDerivation { + pname = "gssapi-wai"; + version = "0.1.0.0"; + sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f"; + libraryHaskellDepends = [ + base base64-bytestring bytestring case-insensitive gssapi + http-types vault wai wai-extra + ]; + homepage = "https://github.com/ondrap/gssapi-wai"; + description = "WAI Middleware for SPNEGO authentiaction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl @@ -77980,25 +78215,27 @@ self: { }) {}; "hackport" = callPackage - ({ mkDerivation, array, base, base64-bytestring, binary, bytestring - , containers, cryptohash, deepseq, directory, ed25519 - , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit - , MissingH, mtl, network, network-uri, old-locale, old-time, parsec - , pretty, process, random, regex-compat, split, stm, tar - , template-haskell, time, transformers, unix, xml, zlib + ({ mkDerivation, array, async, base, base16-bytestring + , base64-bytestring, binary, bytestring, containers, cryptohash + , deepseq, directory, ed25519, extensible-exceptions, filepath + , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network + , network-uri, old-locale, old-time, parsec, pretty, process + , random, regex-compat, split, stm, tar, template-haskell, time + , transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.5"; - sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f"; + version = "0.5.1"; + sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base64-bytestring binary bytestring containers - cryptohash deepseq directory ed25519 extensible-exceptions filepath - ghc-prim hashable HTTP MissingH mtl network network-uri old-locale - old-time parsec pretty process random regex-compat split stm tar - template-haskell time transformers unix xml zlib + array async base base16-bytestring base64-bytestring binary + bytestring containers cryptohash deepseq directory ed25519 + extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl + network network-uri old-locale old-time parsec pretty process + random regex-compat split stm tar template-haskell time + transformers unix xml zlib ]; testHaskellDepends = [ base binary bytestring containers deepseq directory @@ -78429,6 +78666,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hailgun-simple" = callPackage + ({ mkDerivation, base, email-validate, hailgun, mtl, text + , transformers + }: + mkDerivation { + pname = "hailgun-simple"; + version = "0.1.0.0"; + sha256 = "30526e6b7ec6083b090e880ef6fe942cc8425d3b2700bac565e4fc6629ec2954"; + libraryHaskellDepends = [ + base email-validate hailgun mtl text transformers + ]; + homepage = "https://github.com/cdepillabout/hailgun-simple"; + description = "Easy-to-use wrapper for the hailgun package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hails" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bson, bytestring, conduit, conduit-extra @@ -80636,8 +80889,10 @@ self: { }: mkDerivation { pname = "hashabler"; - version = "1.3.0"; - sha256 = "6bbd711b75f9c8fe72a1471ed99709e382ce7a58595a0088228aa39e74bf74ab"; + version = "2.0.0"; + sha256 = "6a2bd750238fb73bbef9572fc553aee6d0cc82326970a8598d9eb8b6ef923cf3"; + revision = "1"; + editedCabalFile = "c86a0c3e2fbc461ab3e75631a456f416ec9c57b7d48558ae0ad76fb4c48c3284"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp primitive template-haskell text @@ -81010,6 +81265,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskelisp" = callPackage + ({ mkDerivation, base, containers, mtl, protolude, text }: + mkDerivation { + pname = "haskelisp"; + version = "0.1.0.5"; + sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949"; + libraryHaskellDepends = [ base containers mtl protolude text ]; + homepage = "http://github.com/githubuser/haskelisp#readme"; + description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "haskell-aliyun" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude , blaze-builder, bytestring, case-insensitive, conduit, Crypto @@ -81936,8 +82203,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.18.0.1.1"; - sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b"; + version = "1.19.0.0"; + sha256 = "41bc9166e7d08bb18b5309eb2af00ce122c70eeffd047da47e9e2d9db89a2406"; libraryHaskellDepends = [ base haskell-src-exts ]; homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; @@ -82105,6 +82372,7 @@ self: { 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; }) {}; "haskell-tools-cli" = callPackage @@ -82218,6 +82486,7 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tor" = callPackage @@ -83473,8 +83742,8 @@ self: { }: mkDerivation { pname = "hasql-class"; - version = "0.0.0.1"; - sha256 = "90db8a197d6755401f0431fa9586aa3f1744d411fe714ec8bfd2b51f5540c9de"; + version = "0.0.1.0"; + sha256 = "f46dc9cd83ba0f121f8c67c10cf25d199218b4d303aed008084655fdb60aa681"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector @@ -83539,8 +83808,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.1.1"; - sha256 = "8d0e6601a5353d4cd5bd6fd7f713d79ecf8bfbe3458163c0b0e0f10a90ed80fd"; + version = "0.2"; + sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -84318,27 +84587,29 @@ self: { }) {}; "hbro" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, cond, containers - , data-default-class, directory, dyre, errors, exceptions - , fast-logger, filepath, glib, gtk3, lens, lifted-async - , lifted-base, monad-control, monad-logger, mtl, network-uri - , optparse-applicative, pango, parsec, process, random, resourcet - , safe, semigroups, stm-chans, text, time, transformers - , transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell + ({ mkDerivation, base, bytestring, chunked-data, cond, containers + , data-default-class, directory, dyre, errors, fast-logger + , filepath, glib, gtk3, lens, lifted-async, lifted-base + , monad-control, monad-logger, monadIO, mono-traversable, mtl + , network-uri, optparse-applicative, pango, parsec, process, random + , resourcet, safe, safe-exceptions, semigroups, stm-chans, text + , time, transformers, transformers-base, unix, uuid, webkitgtk3 + , zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.5.0.0"; - sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f"; + version = "1.6.0.0"; + sha256 = "0572d35613f0b6e199f563375fb71991fe46ebfa7881bcee591a2054629febce"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring classy-prelude cond containers data-default-class - directory dyre errors exceptions fast-logger filepath glib gtk3 - lens lifted-async lifted-base monad-control monad-logger mtl - network-uri optparse-applicative pango parsec process random - resourcet safe semigroups stm-chans text time transformers - transformers-base unix uuid webkitgtk3 zeromq4-haskell + base bytestring chunked-data cond containers data-default-class + directory dyre errors fast-logger filepath glib gtk3 lens + lifted-async lifted-base monad-control monad-logger monadIO + mono-traversable mtl network-uri optparse-applicative pango parsec + process random resourcet safe safe-exceptions semigroups stm-chans + text time transformers transformers-base unix uuid webkitgtk3 + zeromq4-haskell ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/k0ral/hbro"; @@ -84349,19 +84620,20 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , classy-prelude, containers, directory, glib, gtk3, hbro, lens - , monad-control, mtl, network-uri, pango, parsec, process - , resourcet, safe, text, time, transformers-base, unix, webkitgtk3 + , chunked-data, containers, directory, filepath, glib, gtk3, hbro + , lens, monad-control, mono-traversable, mtl, network-uri, pango + , parsec, process, resourcet, safe, safe-exceptions, text, time + , transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.5.0.0"; - sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc"; + version = "1.6.0.0"; + sha256 = "7ca63236aa588f4ac538ffb17840fca1039c36eefb2f56317b1614170c9b1603"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring classy-prelude containers - directory glib gtk3 hbro lens monad-control mtl network-uri pango - parsec process resourcet safe text time transformers-base unix - webkitgtk3 + aeson aeson-pretty base bytestring chunked-data containers + directory filepath glib gtk3 hbro lens monad-control + mono-traversable mtl network-uri pango parsec process resourcet + safe safe-exceptions text time transformers-base unix webkitgtk3 ]; homepage = "https://github.com/k0ral/hbro-contrib"; description = "Third-party extensions to hbro"; @@ -85079,8 +85351,8 @@ self: { }: mkDerivation { pname = "heckle"; - version = "2.0.1.1"; - sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14"; + version = "2.0.1.5"; + sha256 = "64655fc2c10b00e31cbd8ba6ca6a339fdb184f580f56e24258ecf85605e7d97b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85281,6 +85553,8 @@ self: { pname = "heist"; version = "1.0.1.0"; sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb"; + revision = "1"; + editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -85767,10 +86041,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.1.3.1"; - sha256 = "51c7b375ef2e5d34da7533a2b919e7908e94c89fcbc087fb559fa89dd5e0ddb6"; - revision = "2"; - editedCabalFile = "f46b25d4890df9e9da69c0a491580c32d2b9519903e795efe6385b0d11c3a796"; + version = "0.1.4"; + sha256 = "3f879b0e2f34d98f670e6a210f1bc61d9c4a9505c147c7ec93576f54fe69c56f"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -86008,6 +86280,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heterocephalus" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers + , doctest, Glob, parsec, shakespeare, template-haskell, text + }: + mkDerivation { + pname = "heterocephalus"; + version = "1.0.0.1"; + sha256 = "f25a727b6df685596b78d1a82c60da8433b3afb8a3c0766ece241700578fa5b7"; + libraryHaskellDepends = [ + base blaze-html blaze-markup containers parsec shakespeare + template-haskell text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/heterocephalus#readme"; + description = "A type safe template engine for collaborating with front end development tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: @@ -88215,6 +88505,7 @@ self: { homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -88234,6 +88525,7 @@ self: { homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-diff" = callPackage @@ -88256,8 +88548,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5"; - sha256 = "77fb04190160de91eb791f2326691133e1be26c0984fabf30581ba1f0af3fab1"; + version = "1.5.1"; + sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88324,8 +88616,10 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.0.4"; - sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d"; + version = "1.0.5"; + sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875"; + revision = "1"; + editedCabalFile = "3189cd365d74e481da18730d14c0ac538f435a331cfe76d519e37214f94adf54"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88337,6 +88631,7 @@ self: { homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-vty" = callPackage @@ -88355,6 +88650,7 @@ self: { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-web" = callPackage @@ -88700,6 +88996,7 @@ 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 @@ -88752,6 +89049,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats_0_4_1_6" = callPackage + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix-gsl-stats"; + version = "0.4.1.6"; + sha256 = "1bf5bb87312525256868872a5d51e43d851b75ef549a8834052263171b91cd71"; + libraryHaskellDepends = [ + base binary hmatrix storable-complex vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hmatrix-gsl-stats"; + description = "GSL Statistics interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: mkDerivation { @@ -88879,6 +89194,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -90097,7 +90413,7 @@ self: { description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {opencc = null;}; + }) {inherit (pkgs) opencc;}; "hopencl" = callPackage ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck @@ -91057,15 +91373,18 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, directory, filepath, time, transformers }: + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: mkDerivation { pname = "hpp"; - version = "0.3.1.0"; - sha256 = "1ec268eee4adc227768a22e601fe8ca1f90170705b44186e9522f791172842ee"; + version = "0.4.0"; + sha256 = "05923e6dacc0549f50ff342a3eb2b6782fe3cdc4c6190eea0e4cabc17f429f5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath time transformers + base bytestring bytestring-trie directory filepath ghc-prim time + transformers ]; executableHaskellDepends = [ base directory filepath time ]; homepage = "https://github.com/acowley/hpp"; @@ -91084,6 +91403,8 @@ self: { pname = "hpqtypes"; version = "1.5.1.1"; sha256 = "b99c214d7cc83573f5bf295837b42a13a4057dc9cab701b25798086f0d54795a"; + revision = "1"; + editedCabalFile = "6915ef5e4cd5c22aee26cf85b2d6b86947ada1b0c39d39b6cadcc6bf572e454c"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions lifted-base monad-control mtl resource-pool text text-show time @@ -91290,35 +91611,6 @@ self: { }: mkDerivation { pname = "hquantlib"; - version = "0.0.3.2"; - sha256 = "b26666d1d95a4895ff3e0773d8234e67c692c7f2fe740466b653face4bfb9af3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random - parallel statistics time vector vector-algorithms - ]; - executableHaskellDepends = [ - base containers mersenne-random parallel - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "http://github.com/paulrzcz/hquantlib.git"; - description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hquantlib_0_0_3_3" = callPackage - ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl - , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector, vector-algorithms - }: - mkDerivation { - pname = "hquantlib"; version = "0.0.3.3"; sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28"; isLibrary = true; @@ -92243,8 +92535,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68"; - sha256 = "13834608a7a768e4aeeefee0a79660b2fc7c91bb83e036f0c1cb7b0543c61fda"; + version = "0.68.1"; + sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92589,8 +92881,8 @@ self: { }: mkDerivation { pname = "hscaffold"; - version = "0.4.4.0"; - sha256 = "f56776610c0a64fe5bf396a3d0d1fff5e2e22ad8996f1f95fa1336d7d25285df"; + version = "0.4.5.0"; + sha256 = "8f94525878efbe2f6c8ce80717027596d9e004a5b3ca86f1c3db8bcb2cbd365e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92714,21 +93006,17 @@ self: { }) {}; "hscrtmpl" = callPackage - ({ mkDerivation, base, directory, process, regex-compat, time - , time-locale-compat - }: + ({ mkDerivation, base, directory, process, time }: mkDerivation { pname = "hscrtmpl"; - version = "1.4"; - sha256 = "31c642da0e9c90b961160214e4a91e6aba9acbd1253eec009f4d626e360be5ab"; + version = "1.5"; + sha256 = "808a80880f2880432fd6c27c99aeb841d325afdad36f0aae7a5a45f512206589"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base directory process regex-compat time time-locale-compat - ]; + executableHaskellDepends = [ base directory process time ]; homepage = "http://hub.darcs.net/dino/hscrtmpl"; description = "Haskell shell script template"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; }) {}; "hscuid" = callPackage @@ -92795,6 +93083,8 @@ self: { pname = "hsdev"; version = "0.2.1.0"; sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794"; + revision = "1"; + editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93153,6 +93443,28 @@ self: { }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; + "hsignal_0_2_7_5" = callPackage + ({ mkDerivation, array, base, binary, blas, bytestring, gsl + , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack + , mtl, storable-complex, vector + }: + mkDerivation { + pname = "hsignal"; + version = "0.2.7.5"; + sha256 = "0f61f820556c431c3811643cc40e49a6d6c68075da1be0b39298a41c1c7119ac"; + libraryHaskellDepends = [ + array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats + hstatistics mtl storable-complex vector + ]; + librarySystemDepends = [ blas liblapack ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hsignal"; + description = "Signal processing and EEG data analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; + inherit (pkgs) liblapack;}; + "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir }: @@ -93905,6 +94217,7 @@ 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 @@ -94851,8 +95164,8 @@ self: { }: mkDerivation { pname = "hstatistics"; - version = "0.2.5.3"; - sha256 = "d8a8bf9dcf6bd25ac5ca695ec1c4fc198310411cc87ab2a23ffe1d9116812a2d"; + version = "0.2.5.4"; + sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -95077,6 +95390,7 @@ self: { ]; description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hswip" = callPackage @@ -95542,34 +95856,6 @@ self: { }: mkDerivation { pname = "htoml"; - version = "1.0.0.1"; - sha256 = "11145f645768abaa51c6ffda70f1c6fe7bb99163877efb13058a16d2d0bd592b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers old-locale parsec text time - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - homepage = "https://github.com/cies/htoml"; - description = "Parser for TOML files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "htoml_1_0_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "htoml"; version = "1.0.0.3"; sha256 = "08f8d88a326f80fb55c0abb9431941c3a2a30f2d58f49c94349961ceeb4c856f"; libraryHaskellDepends = [ @@ -95583,7 +95869,6 @@ self: { homepage = "https://github.com/cies/htoml"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htrace" = callPackage @@ -95708,7 +95993,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_2" = callPackage + "http-api-data_0_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, doctest , filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -95716,8 +96001,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.2"; - sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2"; + version = "0.3.3"; + sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449"; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat unordered-containers uri-bytestring uuid-types @@ -96129,8 +96414,8 @@ self: { }: mkDerivation { pname = "http-dispatch"; - version = "0.6.0.0"; - sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7"; + version = "0.6.2.0"; + sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive http-client http-client-tls http-types @@ -96139,6 +96424,7 @@ self: { homepage = "http://github.com/owainlewis/http-dispatch#readme"; description = "High level HTTP client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-encodings" = callPackage @@ -96228,15 +96514,15 @@ self: { "http-link-header" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text + , http-api-data, network-uri, QuickCheck, text }: mkDerivation { pname = "http-link-header"; - version = "1.0.2"; - sha256 = "618b33aa9518cfae4d63e3d79689642bde5eecfa33c83ea1d1e3aa33420f8685"; + version = "1.0.3"; + sha256 = "59bd2db4e7d14b6f7ce86848af5e38b4bd2e9963e9ffe5068c7b1a710dbdd7fe"; libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors network-uri - text + attoparsec base bytestring bytestring-conversion errors + http-api-data network-uri text ]; testHaskellDepends = [ base hspec hspec-attoparsec QuickCheck text @@ -96387,8 +96673,8 @@ self: { }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.4"; - sha256 = "e5e582a106ead5c3a4a96fa96f95891f67714483e83154a6a3228bba41e756f4"; + version = "0.1.0.5"; + sha256 = "4406e4f19ae08d4d281d15a76c19c0661fcb7c5b9bf93c0f279001ac761894d8"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit @@ -99370,8 +99656,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ieee754"; - version = "0.7.8"; - sha256 = "de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff"; + version = "0.7.9"; + sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; @@ -99388,6 +99674,18 @@ self: { license = "GPL"; }) {}; + "if" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "if"; + version = "0.1.0.0"; + sha256 = "28f673e867dbe0f51324d97fcb7884673a34912593746520a470116b167a141d"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/winterland1989/if"; + description = "(?) and (?>) conditional operator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ifcxt" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , template-haskell @@ -102722,24 +103020,26 @@ self: { }) {}; "isobmff-builder" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, hspec - , singletons, tagged, text, time, type-list, type-spec - , vector-sized + ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl + , pretty-types, QuickCheck, singletons, tagged, template-haskell + , text, time, type-list, type-spec, vector }: mkDerivation { pname = "isobmff-builder"; - version = "0.10.5.0"; - sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1"; + version = "0.11.2.0"; + sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220"; libraryHaskellDepends = [ - base bytestring data-default singletons tagged text time type-list - type-spec vector-sized + base bytestring data-default mtl pretty-types singletons tagged + template-haskell text time type-list type-spec vector ]; testHaskellDepends = [ - base binary bytestring hspec text type-spec + base binary bytestring hspec mtl pretty-types QuickCheck tagged + text type-spec ]; homepage = "https://github.com/sheyll/isobmff-builder#readme"; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isohunt" = callPackage @@ -103349,8 +103649,8 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.1"; - sha256 = "9a92d0482acb2647e46955d6ad73ba7cd4a148cd9f6c5263a405296b87a5afd9"; + version = "0.7.1.1"; + sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40"; libraryHaskellDepends = [ array base bytestring enumset event-list explicit-exception midi non-negative transformers @@ -103532,6 +103832,7 @@ self: { homepage = "https://github.com/Lupino/jason#readme"; description = "A fast JASONETTE-iOS JSON combinator library for haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "java-bridge" = callPackage @@ -103949,7 +104250,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "jose_0_5_0_0" = callPackage + "jose_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , byteable, bytestring, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -103958,8 +104259,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.5.0.0"; - sha256 = "cb2da4049b288be97e1a7530fbf0ff86cf98a3277b13cd84ba352519741b36ce"; + version = "0.5.0.1"; + sha256 = "be03e97bad8c492bc6e268d917b0c0ea18f12a971a94be8e8c28af636d52c84f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104056,23 +104357,17 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , filepath, http-types, lens, primitive, process, QuickCheck - , ref-tf, stm, template-haskell, text, time, transformers, vector - , wai, wai-app-static, wai-websockets, warp, websockets + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , http-types, lens, primitive, process, ref-tf, stm + , template-haskell, text, time, transformers }: mkDerivation { pname = "jsaddle"; - version = "0.5.2.0"; - sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb"; + version = "0.6.0.1"; + sha256 = "16bca9ea2c962ecaeb42961b9795de61504f1c214a20d189c3e3483cdbc557e1"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types lens primitive - process ref-tf stm template-haskell text time transformers wai - wai-app-static wai-websockets warp websockets - ]; - testHaskellDepends = [ - base bytestring doctest filepath http-types process QuickCheck text - vector wai wai-app-static wai-websockets warp websockets + process ref-tf stm template-haskell text time transformers ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104085,8 +104380,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.5.0.1"; - sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a"; + version = "0.6.0.0"; + sha256 = "ef270104ea9a4eef9eca156bd2406f1ad453f1d7543e9dc3054d4549e8a85e37"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -104110,6 +104405,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsaddle-warp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, http-types, jsaddle, lens, primitive, process + , QuickCheck, ref-tf, stm, text, time, transformers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "jsaddle-warp"; + version = "0.6.0.1"; + sha256 = "c91ba8f83df56044247ee8deadec3889346c640b069efed2b8035162e8c4cfc0"; + libraryHaskellDepends = [ + aeson base containers http-types jsaddle stm text time transformers + wai wai-websockets warp websockets + ]; + testHaskellDepends = [ + base bytestring doctest filepath jsaddle lens primitive process + QuickCheck ref-tf + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "jsaddle-wkwebview" = callPackage + ({ mkDerivation, aeson, base, bytestring, jsaddle }: + mkDerivation { + pname = "jsaddle-wkwebview"; + version = "0.6.0.0"; + sha256 = "cedc6b826bc2b07841aed149ecf3ad3c39f5ed75964f3ea49e0ee3c445b5373c"; + libraryHaskellDepends = [ aeson base bytestring jsaddle ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jsc" = callPackage ({ mkDerivation, base, jmacro, lens, template-haskell, text , transformers, webkitgtk3, webkitgtk3-javascriptcore @@ -104323,8 +104653,8 @@ self: { }: mkDerivation { pname = "json-bytes-builder"; - version = "0.4"; - sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97"; + version = "0.5"; + sha256 = "b2c1114ef0a164fdf6b5c0899790fd5c91fa98b66b4a65475ba82829a5efa3ad"; libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; @@ -104469,8 +104799,8 @@ self: { }: mkDerivation { pname = "json-pointer-aeson"; - version = "0.1"; - sha256 = "b291114509843bae81251ee517d1dad5d7c904809417b35e17cc47eec04764d4"; + version = "0.1.1"; + sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1"; libraryHaskellDepends = [ aeson base-prelude json-pointer unordered-containers vector ]; @@ -104689,8 +105019,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.1.2"; - sha256 = "096be98bf0f8eb13a83388a455fc123d13c18c11a598fbde31506b610c78e976"; + version = "0.4.1.3"; + sha256 = "1e281cfddd1c71b40e8a4b8a75dbd0c1f16b1e349edcbc5e44e45c25241ff9dc"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -105113,6 +105443,8 @@ self: { pname = "jwt"; version = "0.7.2"; sha256 = "17967413d21399596a236bc8169d9e030bb85e2b1c349c6e470543767cc20a31"; + revision = "1"; + editedCabalFile = "b5858c05476741b4dc7f9f075bb8c8aca128ed25a9f325d937d370aa3d4910e1"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite data-default http-types memory network-uri scientific semigroups text time @@ -107054,7 +107386,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -107107,6 +107439,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -107329,29 +107662,23 @@ self: { }) {}; "lambdacube-compiler" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, deepseq, directory, exceptions, filepath, JuicyPixels - , lambdacube-ir, megaparsec, monad-control, mtl - , optparse-applicative, patience, pretty-show, process, QuickCheck - , tasty, tasty-quickcheck, text, time, vect, vector, websockets - , wl-pprint + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , containers, directory, exceptions, filepath, lambdacube-ir + , megaparsec, mtl, optparse-applicative, pretty-show, semigroups + , text, vector }: mkDerivation { pname = "lambdacube-compiler"; - version = "0.5.0.1"; - sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564"; + version = "0.6.0.0"; + sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers deepseq directory exceptions filepath - lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint + aeson ansi-wl-pprint base containers directory exceptions filepath + lambdacube-ir megaparsec mtl pretty-show semigroups text vector ]; executableHaskellDepends = [ - aeson async base base64-bytestring bytestring containers deepseq - directory exceptions filepath JuicyPixels lambdacube-ir megaparsec - monad-control mtl optparse-applicative patience pretty-show process - QuickCheck tasty tasty-quickcheck text time vect vector websockets - wl-pprint + aeson base bytestring filepath optparse-applicative ]; homepage = "http://lambdacube3d.com"; description = "LambdaCube 3D is a DSL to program GPUs"; @@ -107438,8 +107765,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.5.1.1"; - sha256 = "44fcd8abfd86607a65702caac4894114632590473bc1701f8e082966b79c63c3"; + version = "0.5.1.2"; + sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe"; libraryHaskellDepends = [ base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms @@ -107454,8 +107781,8 @@ self: { ({ mkDerivation, aeson, base, containers, mtl, text, vector }: mkDerivation { pname = "lambdacube-ir"; - version = "0.3.0.0"; - sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc"; + version = "0.3.0.1"; + sha256 = "1f28588141a7f2b5ac9847f2f35c8129e68273a3804748a71f06cd728fa001f7"; libraryHaskellDepends = [ aeson base containers mtl text vector ]; description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; license = stdenv.lib.licenses.bsd3; @@ -108021,28 +108348,6 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.8"; - sha256 = "98a48760012d7b9eb7625532ea1d18ee0127a18dc11ccd679717ea53151c2ab9"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - homepage = "http://github.com/erikd/language-javascript"; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_9" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; version = "0.6.0.9"; sha256 = "a86b98d4fb8c27bbe54f7bedecde2acfea7e7d8e30a55434fd971b15238932cc"; libraryHaskellDepends = [ @@ -108056,7 +108361,6 @@ self: { homepage = "https://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-kort" = callPackage @@ -108714,6 +109018,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "latex-function-tables" = callPackage + ({ mkDerivation, base, bifunctors, HaTeX, lens, mtl, process + , semigroups, template-haskell, th-printf + }: + mkDerivation { + pname = "latex-function-tables"; + version = "0.1.0.0"; + sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors HaTeX lens mtl semigroups template-haskell + th-printf + ]; + executableHaskellDepends = [ base HaTeX process template-haskell ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/nfm2017#readme"; + description = "Function table specifications in latex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck , semigroups, tagged, tasty, tasty-quickcheck, transformers @@ -109094,6 +109419,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leapseconds" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, time }: + mkDerivation { + pname = "leapseconds"; + version = "1.0"; + sha256 = "c69b5acaf60b610ac6bc68e45c1f96161b920547dc89821220b6836ba8dfd11e"; + revision = "1"; + editedCabalFile = "4ffceb9290e689f9b707270ab393d57dacc9c69fc880252bfed608830a0b79d8"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base tasty tasty-hunit time ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "leapseconds-announced" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { @@ -111178,10 +111516,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.1.0.1"; - sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd"; + version = "0.2.0.0"; + sha256 = "99e027c01da96c907a94b8bd57a7e36597d57b4786aa4835b1b66e921bad21d3"; revision = "1"; - editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4"; + editedCabalFile = "2da156de9e6cffcbd1b9910c4d177250d27a18bf77bdae54bf8560c26b1b89b7"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear semigroups vector vector-space @@ -112125,13 +112463,14 @@ self: { , concurrent-split, containers, data-accessor , data-accessor-transformers, directory, event-list , explicit-exception, filepath, html, httpd-shed, midi, midi-alsa - , network, non-empty, non-negative, parsec, pretty, process, stm - , stm-split, strict, transformers, unix, utility-ht, wx, wxcore + , network, network-uri, non-empty, non-negative, parsec, pretty + , process, stm, stm-split, strict, transformers, unix, utility-ht + , wx, wxcore }: mkDerivation { pname = "live-sequencer"; - version = "0.0.5.1"; - sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1"; + version = "0.0.5.2"; + sha256 = "848f38148ffbe61b0799aa471db89ade287fb06061a9b3dfbec248574dd192e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base event-list non-negative ]; @@ -112139,8 +112478,8 @@ self: { alsa-core alsa-seq base bytestring cgi concurrent-split containers data-accessor data-accessor-transformers directory explicit-exception filepath html httpd-shed midi midi-alsa network - non-empty parsec pretty process stm stm-split strict transformers - unix utility-ht wx wxcore + network-uri non-empty parsec pretty process stm stm-split strict + transformers unix utility-ht wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; @@ -112842,7 +113181,7 @@ self: { "log" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, cond, deepseq, exceptions, hpqtypes + , bloodhound, bytestring, deepseq, exceptions, hpqtypes , http-client, http-types, lifted-base, monad-control, monad-time , mtl, old-locale, process, random, semigroups, split, stm, tasty , tasty-hunit, text, text-show, time, transformers @@ -112850,14 +113189,13 @@ self: { }: mkDerivation { pname = "log"; - version = "0.5.4"; - sha256 = "54dbe118a7bb4cc54b9a894859bb9b0e411f9b8f5f5205fe8bd2c0d079ef1962"; + version = "0.6"; + sha256 = "7b059a5130d7a7ec87109bdb118223ba281135ccdbc68551ff4123da4181176a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring - cond deepseq exceptions hpqtypes http-client lifted-base - monad-control monad-time mtl old-locale semigroups split stm text - text-show time transformers transformers-base unordered-containers - vector + deepseq exceptions hpqtypes http-client lifted-base monad-control + monad-time mtl old-locale semigroups split stm text text-show time + transformers transformers-base unordered-containers vector ]; testHaskellDepends = [ aeson base bloodhound bytestring exceptions http-client http-types @@ -112932,6 +113270,7 @@ self: { homepage = "https://github.com/scrive/log-utils"; description = "Utils for working with logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -113044,6 +113383,8 @@ self: { pname = "logging-facade"; version = "0.1.1"; sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2"; + revision = "1"; + editedCabalFile = "fc89005336a9b64c524183154716ebf8a26c27f8fa5730225f818f0128c2a2b2"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base hspec ]; description = "Simple logging abstraction that allows multiple back-ends"; @@ -113590,8 +113931,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.0.0"; - sha256 = "8ff64960d7874d4a34867d8834eac9c535b73175f0abe8743b50dfd886aabf50"; + version = "2.1.0"; + sha256 = "289129d3581ea5276c3e9a829322bc1ce38ca62094390706a5fa2c6f176c37be"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -113901,27 +114242,6 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.6"; - sha256 = "a8435c73bacc3dc60efd89c21b29c9fbca9a10676ec158d4e810ab751849a8c9"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_7" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; version = "2.9.7"; sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; libraryHaskellDepends = [ @@ -113934,7 +114254,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -115434,8 +115753,8 @@ self: { }: mkDerivation { pname = "markdown"; - version = "0.1.15"; - sha256 = "5bf44c4a0df5a9c43dc7fcac86cbbd586c703e1a5f8ba6a77ea8f8207152e628"; + version = "0.1.16"; + sha256 = "08b0b352e208316ddc99c6f161704c8ecaf248c2e51f506900e344c93757ed85"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xml-conduit xml-types @@ -115727,27 +116046,25 @@ self: { }) {}; "marxup" = callPackage - ({ mkDerivation, base, configurator, containers, cubicbezier - , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens - , mtl, parsek, polynomials-bernstein, pretty, process, text - , typography-geometry, vector + ({ mkDerivation, base, configurator, containers, directory, dlist + , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl + , parsek, pretty, process, text }: mkDerivation { pname = "marxup"; - version = "3.0.0.1"; - sha256 = "1675a378317ff0b1b3e2500ae8b4e62555dc85c4ab8d8f72c0d3cc227c4edf07"; + version = "3.1.0.0"; + sha256 = "21dded8147b7eed7ae4ae5a1ba10648467f77334e01351d1dff754fc59585f2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers cubicbezier directory filepath glpk-hs graphviz - labeled-tree lens mtl polynomials-bernstein process text - typography-geometry vector + base containers directory filepath haskell-src-exts labeled-tree + lens lp-diagrams mtl process text ]; executableHaskellDepends = [ base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -116398,8 +116715,8 @@ self: { ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { pname = "median-stream"; - version = "0.3.0.0"; - sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74"; + version = "0.6.0.0"; + sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d"; libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/caneroj1/median-stream#readme"; @@ -118329,8 +118646,8 @@ self: { ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; - version = "1.0.6"; - sha256 = "14c391b111af4cc10917a9340897ae2a5718f5b0b7e6bc13f379445c58fe0dc5"; + version = "1.0.9"; + sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -118416,13 +118733,15 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, bytestring, cereal, network, transformers }: + ({ mkDerivation, base, bytestring, cereal, mtl, network + , transformers + }: mkDerivation { pname = "modbus-tcp"; - version = "0.2.1.1"; - sha256 = "60cf7f9956387abd5b24e760d281b7a3423432d271502745df59b398d499de86"; + version = "0.3"; + sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737"; libraryHaskellDepends = [ - base bytestring cereal network transformers + base bytestring cereal mtl network transformers ]; homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; @@ -118472,15 +118791,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "modify-fasta_0_8_2_2" = callPackage + "modify-fasta_0_8_2_3" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text - , text-show + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split + , text, text-show }: mkDerivation { pname = "modify-fasta"; - version = "0.8.2.2"; - sha256 = "76d72306f18d23ef72ec8dada391483136689f3b0a2f074ec79506759908100f"; + version = "0.8.2.3"; + sha256 = "dcee07de4f97b10c557cc3a18aee35d75caf8ef65bdc104bcd6785bfabc7465e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118489,7 +118808,7 @@ self: { ]; executableHaskellDepends = [ base containers fasta mtl optparse-applicative pipes pipes-text - split text + semigroups split text ]; homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; @@ -119084,28 +119403,6 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.20"; - sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_20_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-logger"; version = "0.3.20.1"; sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad"; libraryHaskellDepends = [ @@ -119117,7 +119414,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -119949,6 +120245,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "money" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "money"; + version = "0.1.0"; + sha256 = "b3d078e6bf2201dfe7d524776fb7c3cee47b4f4d06d493c6f9bb9d3fb2407f9c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/jpvillaisaza/money"; + description = "Money"; + license = stdenv.lib.licenses.mit; + }) {}; + "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, containers, cryptohash @@ -120036,6 +120345,8 @@ self: { pname = "monky"; version = "2.1.0.0"; sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0"; + revision = "1"; + editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120981,12 +121292,12 @@ self: { }) {}; "mtl-c" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "mtl-c"; - version = "0.1"; - sha256 = "eb852379c1710af26179c148114b5269f568e3b8317b1a5716f2a07d00942159"; - libraryHaskellDepends = [ base mtl ]; + version = "0.1.1"; + sha256 = "2dd7da3c2ed207aa2e4bb5b49aa09e537cfe8c2cae241d026bc52cd091f6ea8b"; + libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/fumieval/mtl-c"; description = "Very strict CPS'd transformers"; license = stdenv.lib.licenses.bsd3; @@ -121997,8 +122308,8 @@ self: { }: mkDerivation { pname = "mustache"; - version = "2.1"; - sha256 = "159241066d7e78bb40436391113f319ccb9753e6e00a72c604ccba493e7d42d6"; + version = "2.1.2"; + sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122353,8 +122664,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.7.0.0"; - sha256 = "c4ab3b07780ab7ba3df4ec5c9575d717456433ea7af5ab0af4aae346af22ceda"; + version = "0.7.1.0"; + sha256 = "0d0107914bc3f869eac868e1ad66a1ceba97cd68e2f5b9a595eecab24840edeb"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -122384,6 +122695,7 @@ self: { homepage = "https://github.com/winterland1989/mysql-haskell"; description = "TLS support for mysql-haskell package using openssl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple" = callPackage @@ -122809,15 +123121,16 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, containers, freeglut, GLEW + ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW , hspec, inline-c, mesa, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; - version = "0.5.0.0"; - sha256 = "26fae2bd7cc430b5fa46200ae0100779f481cde5c236d33f87a78feca3678f6e"; + version = "0.5.1.0"; + sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437"; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; @@ -122997,6 +123310,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation_0_4" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.4"; + sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -123734,8 +124065,7 @@ self: { homepage = "https://github.com/ziocroc/netwire-input-javascript"; description = "JavaScript instance of netwire-input"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "netwire-vinylglfw-examples" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory @@ -124884,8 +125214,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.4.2"; - sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; + version = "0.2.5.0"; + sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -125042,13 +125372,14 @@ self: { }) {}; "nix-eval" = callPackage - ({ mkDerivation, base, process, QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty + , tasty-quickcheck }: mkDerivation { pname = "nix-eval"; - version = "0.1.0.2"; - sha256 = "f603ce62cd8abaab8cf09c8cf3f8b17332b0490658310eadea5242826b2ef419"; - libraryHaskellDepends = [ base process ]; + version = "0.3.3.0"; + sha256 = "4bf250e5a866b4cdfc9d9feaf6c186bfdd45ea04dcfa30dcb1131aa38d7910b1"; + libraryHaskellDepends = [ base hindent process strict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; @@ -126239,6 +126570,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oauth10a" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash, entropy, http-types, time, transformers + }: + mkDerivation { + pname = "oauth10a"; + version = "0.1.0.0"; + sha256 = "a923cb04195ed275990623b821933bc52e00a7311ee485e803d272185c11aacc"; + revision = "1"; + editedCabalFile = "5ee8aca8d824721a86d2ecb7cc094baffa6591059e49e6f7da5682851c30b7a1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash entropy + http-types time transformers + ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/gatlin/oauth10a#readme"; + description = "Fully Automatic Luxury OAuth 1.0a headers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, crypto-random, cryptohash, either @@ -126287,13 +126638,15 @@ self: { }) {}; "obdd" = callPackage - ({ mkDerivation, array, base, containers, mtl, random }: + ({ mkDerivation, array, base, containers, mtl, process, random }: mkDerivation { pname = "obdd"; - version = "0.3.3"; - sha256 = "bf9aa0cc89f4964df7e9fe61d1c5e3b37d6e04f3750a9c98025c21d45a24f1b5"; - libraryHaskellDepends = [ array base containers mtl random ]; - testHaskellDepends = [ base containers ]; + version = "0.6.1"; + sha256 = "0db47df8588a5ffd6a925cf4d21c3e313aac9ec8ced2461dfddbfafb38ba1053"; + libraryHaskellDepends = [ + array base containers mtl process random + ]; + testHaskellDepends = [ array base containers ]; homepage = "https://github.com/jwaldmann/haskell-obdd"; description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; @@ -126422,6 +126775,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_17_0" = 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.17.0"; + sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288"; + 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 ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -126528,6 +126905,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oeis_0_3_8" = callPackage + ({ mkDerivation, base, HTTP, HUnit, network, network-uri + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "oeis"; + version = "0.3.8"; + sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93"; + libraryHaskellDepends = [ base HTTP network network-uri ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "off-simple" = callPackage ({ mkDerivation, base, parsec3, vector }: mkDerivation { @@ -126735,15 +127129,14 @@ self: { "ombra" = callPackage ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect, vector + , unordered-containers, vect }: mkDerivation { pname = "ombra"; - version = "0.1.1.0"; - sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72"; + version = "0.2.1.0"; + sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c"; libraryHaskellDepends = [ base gl hashable hashtables transformers unordered-containers vect - vector ]; homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; @@ -126977,34 +127370,6 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.1.1"; - sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; - revision = "1"; - editedCabalFile = "134244b5b0a2b0d253dfd9021e6522938a138ed68631af787c0d7f3d673e6e39"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_2_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; version = "0.5.2.1"; sha256 = "ef175620163b6aaa5dc7aff6a49347b698134fb924869a789c097406ad746152"; libraryHaskellDepends = [ @@ -127020,7 +127385,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -127185,16 +127549,16 @@ self: { }) {}; "open-union" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.1.0.1"; - sha256 = "1ceb46a9eeb6114a5eb8eeb3805a9d4f218c88cd2f24e42c25271b348b3a7fb6"; + version = "0.2.0.0"; + sha256 = "e9835d4e736afcedda90ff1e21ab6446266c1aa925b453ebf2292561dab48bbe"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/RobotGymnast/open-union"; + libraryHaskellDepends = [ base type-fun ]; + executableHaskellDepends = [ base type-fun ]; + homepage = "https://github.com/bfopa/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -127220,8 +127584,8 @@ self: { ({ mkDerivation, atomspace-cwrapper, base, transformers }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.6"; - sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a"; + version = "0.1.0.7"; + sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ atomspace-cwrapper ]; homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; @@ -127766,6 +128130,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentype" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc + , pretty-hex, time, vector + }: + mkDerivation { + pname = "opentype"; + version = "0.0.1"; + sha256 = "21c574b4af3c99607e1e647b52bd32a2ae644135ab55e3dc3041f6dd6f4f1340"; + libraryHaskellDepends = [ + base binary bytestring containers ghc pretty-hex time vector + ]; + description = "Opentype loading and writing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "operate-do" = callPackage ({ mkDerivation, base, charset, doctest, filemanip , haskell-src-meta, hspec, QuickCheck, template-haskell @@ -127787,12 +128167,12 @@ self: { ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; - version = "0.2.3.4"; - sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810"; + version = "0.2.3.5"; + sha256 = "91d479063ae7ed3d0a6ae911bdee550fbf31cf341910f9778046b484c55b4af4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ random ]; + executableHaskellDepends = [ base mtl random ]; homepage = "http://wiki.haskell.org/Operational"; description = "Implementation of difficult monads made easy with operational semantics"; license = stdenv.lib.licenses.bsd3; @@ -129184,8 +129564,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.1.0"; - sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f"; + version = "1.2.1"; + sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129200,20 +129580,18 @@ self: { ({ mkDerivation, base, bytestring, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default , directory, filepath, hspec, mtl, pandoc, pandoc-types, process - , roman-numerals, syb, template-haskell, yaml + , roman-numerals, syb, template-haskell, utility-ht, yaml }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.3.0"; - sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e"; - revision = "1"; - editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693"; + version = "0.2.4.1"; + sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor data-accessor-template data-accessor-transformers data-default mtl pandoc pandoc-types - roman-numerals syb template-haskell yaml + roman-numerals syb template-haskell utility-ht yaml ]; executableHaskellDepends = [ base bytestring containers data-default mtl pandoc pandoc-types @@ -129223,7 +129601,7 @@ self: { base bytestring containers data-accessor data-accessor-template data-accessor-transformers data-default directory filepath hspec mtl pandoc pandoc-types process roman-numerals syb template-haskell - yaml + utility-ht yaml ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -129977,12 +130355,12 @@ self: { }) {}; "parsec-extra" = callPackage - ({ mkDerivation, base, monads-tf, parsec, transformers }: + ({ mkDerivation, base, monads-tf, parsec }: mkDerivation { pname = "parsec-extra"; - version = "0.1.0.5"; - sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474"; - libraryHaskellDepends = [ base monads-tf parsec transformers ]; + version = "0.2.0.0"; + sha256 = "4936ab0b529d041524917304c45a140901482ba1d672d8a96c169c36e7dfc702"; + libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130512,8 +130890,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.3.3.0"; - sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132"; + version = "0.4.0.0"; + sha256 = "1368b963c500cd2945ef7de890d337066ed99efab8565b1f8825febf4b5ee1b4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131877,8 +132255,8 @@ self: { ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { pname = "persistent-parser"; - version = "0.1.0.1"; - sha256 = "9ec9dda9721c20aab99ff0414c08b552c4b8893ee896460c99ae7ef960017c27"; + version = "0.1.0.2"; + sha256 = "124eb0c33845a823f5196f895201fceb8a99e52abc5f6197fc76b5981ff6bf77"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; @@ -132346,8 +132724,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.2"; - sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a"; + version = "10.4"; + sha256 = "333f39cc5317bd188435e001b3dfbe44d5b2afbc536b59e76b86fa23d827e9f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132870,8 +133248,10 @@ self: { ({ mkDerivation, base, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.0.0"; - sha256 = "2b8e4bcdb1ce5c1dd5734d4406edd899e72e0afbe83758ff77590508a39d6cd2"; + version = "0.1.0.1"; + sha256 = "163b6dc85426558ad1a897675bf7f560389addf172c8e5858f817342ee7345c8"; + revision = "1"; + editedCabalFile = "f3213f1c04a1daa726ee2f6ceda69d843b80f4726759ef2fe2e23c4f34342746"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process unix ]; @@ -134248,12 +134628,12 @@ self: { "playlists" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath - , hlint, hspec, optparse-applicative, text, word8 + , hspec, optparse-applicative, text, word8 }: mkDerivation { pname = "playlists"; - version = "0.3.0.0"; - sha256 = "8bb2141f2e996d7d4ab376e53fd00c0abfdfc05b00abc53b8c44573720e089bc"; + version = "0.4.0.0"; + sha256 = "38a4cb8370ced24a7ac198f16b509799993e9798ccfb9fc3448ee8e14bd71688"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134262,13 +134642,32 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring doctest hlint hspec ]; + testHaskellDepends = [ + base bytestring doctest filepath hspec text + ]; 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 + ({ mkDerivation, attoparsec, base, bytestring, either, exceptions + , http-client, mtl, playlists, text + }: + mkDerivation { + pname = "playlists-http"; + version = "0.1.0.0"; + sha256 = "9f3360bd4adcf45c0bd85eecc717c8093f8d8c71adcf8cff5d961c6cea1c15e3"; + libraryHaskellDepends = [ + attoparsec base bytestring either exceptions http-client mtl + playlists text + ]; + homepage = "https://github.com/pjones/playlists-http"; + description = "Library to glue together playlists and http-client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plist" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { @@ -134413,6 +134812,32 @@ self: { license = "GPL"; }) {}; + "plots" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, colour + , containers, data-default, diagrams-core, diagrams-lib, directory + , distributive, filepath, fingertree, hashable, intervals + , JuicyPixels, lens, linear, monoid-extras, mtl + , optparse-applicative, process, profunctors, semigroupoids + , semigroups, split, statistics, time, transformers, vector + }: + mkDerivation { + pname = "plots"; + version = "0.1.0.2"; + sha256 = "e5c1a5f858f2bbfb531d5d0af6a070ff8fa2bd936b3a4c30b6ca65838c16b64d"; + revision = "1"; + editedCabalFile = "3d45b5b973339a50d0686153d77b0f1e438c1a890e75c2274830e878e9fd78d8"; + libraryHaskellDepends = [ + adjunctions base base-orphans colour containers data-default + diagrams-core diagrams-lib directory distributive filepath + fingertree hashable intervals JuicyPixels lens linear monoid-extras + mtl optparse-applicative process profunctors semigroupoids + semigroups split statistics time transformers vector + ]; + homepage = "http://github.com/cchalmers/plots"; + description = "Diagrams based plotting library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plotserver-api" = callPackage ({ mkDerivation, base, curl, split }: mkDerivation { @@ -134721,6 +135146,8 @@ self: { pname = "pointful"; version = "1.0.9"; sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6"; + revision = "1"; + editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134868,11 +135295,11 @@ self: { ({ mkDerivation, base, containers, hspec, lens, mtl }: mkDerivation { pname = "polar-shader"; - version = "0.2.0.0"; - sha256 = "a251680f9d717394cb91e758d51ab8a69889be619325aff378d80b21742867f5"; + version = "0.3.0.0"; + sha256 = "426c5bb67fdb5be0e648678fa9d03800e714d5f89123b93d72fb8c7b7c01af24"; libraryHaskellDepends = [ base containers lens mtl ]; testHaskellDepends = [ base containers hspec ]; - description = "High-level shader compiler for Polar Game Engine"; + description = "High-level shader compiler framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -135149,12 +135576,12 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, hspec, network, QuickCheck }: + ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: mkDerivation { pname = "pong-server"; - version = "0.0.2.0"; - sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad"; - libraryHaskellDepends = [ base network ]; + version = "0.0.2.1"; + sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; + libraryHaskellDepends = [ base data-default network ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -136783,6 +137210,22 @@ self: { license = "GPL"; }) {}; + "pretty-display" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: + mkDerivation { + pname = "pretty-display"; + version = "0.1.9"; + sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pretty-show text ]; + executableHaskellDepends = [ ansi-wl-pprint base pretty-show ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/pretty-display#readme"; + description = "Typeclass for human-readable display"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pretty-error" = callPackage ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }: mkDerivation { @@ -136964,6 +137407,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6_2_0" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6.2.0"; + sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, ghc-prim, primitive, vector }: mkDerivation { @@ -137911,8 +138368,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.1"; - sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2"; + version = "3.2.3"; + sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138012,10 +138469,8 @@ self: { ({ mkDerivation, alsaLib, base, c2hs }: mkDerivation { pname = "proteaaudio"; - version = "0.6.4"; - sha256 = "a0343bff81c0920c75cd24b8a5ff2d16ad0e3fdd4b285f65e611dcac0ced4f32"; - revision = "1"; - editedCabalFile = "44188158887c112fc181793db917e4ca4ffdb8f6889f25e36cc262aeba7877a3"; + version = "0.6.5"; + sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; libraryToolDepends = [ c2hs ]; @@ -138527,12 +138982,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161104" = callPackage + "publicsuffix_0_20161116" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161104"; - sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4"; + version = "0.20161116"; + sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -139002,6 +139457,7 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; + doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; @@ -139052,6 +139508,7 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; + doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; @@ -141342,7 +141799,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rasterific-svg_0_3_2" = callPackage + "rasterific-svg_0_3_2_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, FontyFruity, JuicyPixels, lens, linear, mtl , optparse-applicative, primitive, Rasterific, scientific, svg-tree @@ -141350,8 +141807,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.3.2"; - sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23"; + version = "0.3.2.1"; + sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141442,24 +141899,22 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , filepath, tasty, tasty-hspec, template-haskell, temporary, text , vector }: mkDerivation { pname = "rattletrap"; - version = "0.2.0"; - sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; + version = "1.0.0"; + sha256 = "faba10702e6e41b73ab6b30d3232c1dfdf648ab5131392bdf24da81fc0f34e49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap binary binary-bits bytestring containers - data-binary-ieee754 text vector - ]; - executableHaskellDepends = [ - aeson aeson-casing base binary bytestring template-haskell + aeson aeson-casing base bimap binary binary-bits bytestring + containers data-binary-ieee754 template-haskell text vector ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base binary bytestring filepath hlint tasty tasty-hspec + base bytestring filepath tasty tasty-hspec temporary ]; homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; @@ -141577,10 +142032,8 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "rawstring-qm"; - version = "0.2.2.2"; - sha256 = "e62f4f9bbb7e67b2cf1bf39e1765cce6ede6b9669ed17447e7531364b5307a40"; - revision = "1"; - editedCabalFile = "d856c4c9407a2bf37aa5c129a34109bdbeec1cecbdcd91f84be9efcb972ab954"; + version = "0.2.3.0"; + sha256 = "11a177bb7d685fb6a98390630196bd544e877b7460648e61a2905c21a71268fe"; libraryHaskellDepends = [ base bytestring template-haskell text ]; homepage = "https://github.com/tolysz/rawstring-qm"; description = "Simple raw string quotation and dictionary interpolation"; @@ -141901,8 +142354,8 @@ self: { }: mkDerivation { pname = "reactive-balsa"; - version = "0.2.0.1"; - sha256 = "42ea83a158dee24bbe3a031d4222e195cf0b1844cba5b63c82173b261bfc5a71"; + version = "0.3"; + sha256 = "40d188ec262613a445d7e2ac06fbbd281555c45985981efe7dae45a42b83fcc0"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -142062,8 +142515,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.2.0.1"; - sha256 = "8facc607ec889c7a871cd61975d7e4e0760b0064583ad1a0da938fe4fcd702cd"; + version = "0.3"; + sha256 = "c94b9ceda912e859146267cb418afcea0428039bffb1f8ac0ede9f2027d2645c"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random reactive-banana @@ -142082,8 +142535,8 @@ self: { }: mkDerivation { pname = "reactive-midyim"; - version = "0.2.1"; - sha256 = "3d8180f416b2efd948d067d9c5c1cdcb2c8b6933093435e55e02a7e63425669c"; + version = "0.3"; + sha256 = "dd1e2d69035249ff92d633a25d3c1393810fa5477b8e18731354be37ff558f25"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana transformers utility-ht @@ -142323,28 +142776,6 @@ self: { ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.0.2.1"; - sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups 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; - }) {}; - - "rebase_1_0_3" = 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 }: @@ -142361,7 +142792,18 @@ self: { 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 { + pname = "rebindable"; + version = "0.1.2"; + sha256 = "e752ad9aa91d4c96d43865c1e3eefd93c767b8765b82c77be58e4142ca8ca17d"; + libraryHaskellDepends = [ base data-default-class indexed ]; + homepage = "https://github.com/sleexyz/rebindable"; + description = "A library to facilitate rebinding of Haskell syntax"; + license = stdenv.lib.licenses.mit; }) {}; "recaptcha" = callPackage @@ -142701,6 +143143,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reduce-equations" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , haskell-src-exts, MissingH, mtl, QuickCheck, quickspec + , stringable, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "reduce-equations"; + version = "0.1.1.0"; + sha256 = "255b5757a180d042c96d55a4fc165796801b83217cebb4237a30685b68ab57ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers haskell-src-exts mtl QuickCheck + quickspec stringable text transformers + ]; + executableHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base bytestring containers directory haskell-src-exts + MissingH QuickCheck quickspec stringable tasty tasty-quickcheck + text + ]; + homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html"; + description = "Simplify a set of equations by removing redundancies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reducers" = callPackage ({ mkDerivation, array, base, bytestring, containers, fingertree , hashable, semigroupoids, semigroups, text, transformers @@ -143346,18 +143815,18 @@ self: { }) {}; "regex-do" = callPackage - ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + ({ mkDerivation, array, base, bytestring, hspec, mtl, QuickCheck , regex-base, regex-pcre, stringsearch, text }: mkDerivation { pname = "regex-do"; - version = "2.2"; - sha256 = "3da54464f6cac1c8410b04ddeb6152908377adc9b9f94fc2190c69988e5d1f7b"; + version = "2.6.2"; + sha256 = "041396ec83639de987378825bf576dce7c52beded82801cc49af43b0a54dc76a"; libraryHaskellDepends = [ - array base bytestring regex-base regex-pcre stringsearch text + array base bytestring mtl regex-base regex-pcre stringsearch text ]; testHaskellDepends = [ - array base bytestring hspec QuickCheck regex-base regex-pcre + array base bytestring hspec mtl QuickCheck regex-base regex-pcre stringsearch text ]; homepage = "https://github.com/ciez/regex-do"; @@ -144911,6 +145380,28 @@ self: { homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "req-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , http-client, req, resourcet, temporary, transformers + }: + mkDerivation { + pname = "req-conduit"; + version = "0.1.0"; + sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + homepage = "https://github.com/mrkkrp/req-conduit"; + description = "Conduit helpers for the req HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reqcatcher" = callPackage @@ -145133,25 +145624,6 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.1.8"; - sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_1_8_1" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; version = "1.1.8.1"; sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527"; libraryHaskellDepends = [ @@ -145162,7 +145634,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -145228,8 +145699,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "2"; - editedCabalFile = "62fec3ffbc0dfaf26d82ad0689dfe74384f2e565ec0c2bff897cd4c71be74583"; + revision = "3"; + editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -145309,8 +145780,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "1"; - editedCabalFile = "32caced8ad0a5273fc9c13ae65f75a37b790ad430d3923febf567616f5eb8e95"; + revision = "2"; + editedCabalFile = "9eb0c067b4a15b128d75c240694fc31504664107c88b9b80f925ef669eac632a"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -146718,6 +147189,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rotating-log_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, old-locale + , time, time-locale-compat + }: + mkDerivation { + pname = "rotating-log"; + version = "0.4.2"; + sha256 = "6ef0ae7ecb9e30387b4088edc173fbb90b8c8b7514f9f7b8b6d92f7d95f754ec"; + libraryHaskellDepends = [ + base bytestring directory filepath old-locale time + time-locale-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath time time-locale-compat + ]; + homepage = "http://github.com/Soostone/rotating-log"; + description = "Size-limited, concurrent, automatically-rotating log writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "roundRobin" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, tasty , tasty-quickcheck @@ -147386,6 +147878,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "runtime-arbitrary" = callPackage + ({ mkDerivation, base, ifcxt, QuickCheck, template-haskell }: + mkDerivation { + pname = "runtime-arbitrary"; + version = "0.1.0.6"; + sha256 = "012e31cb21f0a057aa8a08c71834d0a5fff52c9742064fea956cd54d4e6069d1"; + libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ]; + homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html"; + description = "Runtime generation of Arbitrary values"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rvar" = callPackage ({ mkDerivation, base, MonadPrompt, mtl, random-source , transformers @@ -147469,25 +147974,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "safe"; - version = "0.3.9"; - sha256 = "d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_10" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "safe"; version = "0.3.10"; sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -148278,6 +148770,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "say" = callPackage + ({ mkDerivation, base, bytestring, hspec, temporary, text + , transformers + }: + mkDerivation { + pname = "say"; + version = "0.1.0.0"; + sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40"; + libraryHaskellDepends = [ base bytestring text transformers ]; + testHaskellDepends = [ base bytestring hspec temporary text ]; + homepage = "https://github.com/fpco/say#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "sbp" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit @@ -148288,8 +148795,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.2.8"; - sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09"; + version = "2.0.0"; + sha256 = "7babbe1f9716ee17874f2c661285d5a384b8399e279288c6d1237b5f26d061b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150170,8 +150677,8 @@ self: { ({ mkDerivation, base, containers, doctest, smallcheck }: mkDerivation { pname = "semiring-num"; - version = "0.3.0.0"; - sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec"; + version = "0.5.4.0"; + sha256 = "f96f42f4cb9bc0c34f4cc0e41178ad23c60fd4f5ff6f1059df5d352df54564e5"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest smallcheck ]; homepage = "https://github.com/oisdk/semiring-num"; @@ -150667,6 +151174,8 @@ self: { pname = "serokell-util"; version = "0.1.1.1"; sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; + revision = "1"; + editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -151864,8 +152373,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.7.0.2"; - sha256 = "0461cc7635c72f2c75770f029811a1c1e72f3245bc4be2fd1beaaee1cd84759b"; + version = "0.7.0.3"; + sha256 = "8b3892b6572677b74d1351b8dd9f274a0428c0bcdd2a0ab599ce96edfe7c2a8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152879,8 +153388,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.11.1"; - sha256 = "bc3d6c5bb3cbef9a0aa67bbf5f08b20cf77bc9e29d8e7da5a3768016a0361d5e"; + version = "2.0.11.2"; + sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -153352,6 +153861,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shikensu" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow + , Glob, tasty, tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "shikensu"; + version = "0.1.2"; + sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath flow Glob + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath flow tasty tasty-hunit + text unordered-containers + ]; + homepage = "https://github.com/icidasset/shikensu#README"; + description = "A small toolset for building static websites"; + license = stdenv.lib.licenses.mit; + }) {}; + "shine" = callPackage ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time , transformers @@ -153479,6 +154009,19 @@ self: { license = "GPL"; }) {}; + "show-prettyprint" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.1.2"; + sha256 = "5b9e93c48e91f1c91d3b2fcf214ea085f08292ee36916c324709532a7446e7a6"; + libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153573,6 +154116,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shunya-library" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunya-library"; + version = "0.1.0.4"; + sha256 = "a497607995efa72ded74f07eb4305afc1bfe9c9df0c70f9334fa062d6f6db1c6"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/shunya-library#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shunyalib" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunyalib"; + version = "0.1.0.1"; + sha256 = "ea423c1b87c14dea651bbb6fbbaa6b6c186c7c8014e8308e176071091deb06fa"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/penguinshunya/shunyalib"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -153965,8 +154532,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.6.0.0"; - sha256 = "f448eb1750229b71894a9f482981de64439093ddd72abe5a8672fbaaae135189"; + version = "0.6.0.1"; + sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944"; libraryHaskellDepends = [ base ghc-prim interlude-l lens list-t monad-control mtl transformers transformers-base @@ -153975,6 +154542,7 @@ 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 @@ -154142,8 +154710,8 @@ self: { ({ mkDerivation, base, fast-logger, mtl, text }: mkDerivation { pname = "simple-logger"; - version = "0.0.1"; - sha256 = "01efbc3f3859deb175d157e983f3497a4db2eb00b7daf35da9431bcdf484f4eb"; + version = "0.0.3"; + sha256 = "5fb002bcf2eaf6aac949acea31d0ee65a08fc4d34f6baf222db4db05c8165ec1"; libraryHaskellDepends = [ base fast-logger mtl text ]; homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; @@ -155746,6 +156314,8 @@ self: { pname = "snap"; version = "1.0.0.1"; sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8"; + revision = "1"; + editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -155864,8 +156434,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.0.0"; - sha256 = "9c35a657fc0debbe9df605d7528ce4645c0b4bc4b94b0134116f6746fe980adb"; + version = "1.0.1.0"; + sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath HUnit io-streams lifted-base @@ -156069,42 +156639,6 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "1.0.1.0"; - sha256 = "a398b15e90d2d6bc77af3edf6f5926df7863073a4774c71a46c0adb43c837488"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - homepage = "http://snapframework.com/"; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "snap-server_1_0_1_1" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, deepseq, directory, filepath, HsOpenSSL, http-common - , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base - , monad-control, mtl, network, old-locale, openssl-streams - , parallel, QuickCheck, random, snap-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, threads - , time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; version = "1.0.1.1"; sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70"; configureFlags = [ "-fopenssl" ]; @@ -156868,6 +157402,8 @@ self: { pname = "snaplet-sqlite-simple"; version = "1.0.0.2"; sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7"; + revision = "1"; + editedCabalFile = "9c49f31dc5e4b6b10942502f2d57755fc028ff2924f2c94a32030e172d19493e"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -156885,6 +157421,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-sqlite-simple-jwt-auth" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring + , clientsession, containers, directory, either, errors, jwt, lens + , mtl, snap, snap-core, snaplet-sqlite-simple, sqlite-simple, text + , time, unordered-containers + }: + mkDerivation { + pname = "snaplet-sqlite-simple-jwt-auth"; + version = "0.2.0.0"; + sha256 = "fc58870fc0cee74f9d4138c909937350faa7d1924a1da8e0f76b4a5ccdf31203"; + libraryHaskellDepends = [ + aeson attoparsec base bcrypt bytestring clientsession containers + directory either errors jwt lens mtl snap snap-core + snaplet-sqlite-simple sqlite-simple text time unordered-containers + ]; + homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme"; + description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snaplet-stripe" = callPackage ({ mkDerivation, base, bytestring, configurator, heist , lens-family-core, mtl, snap, stripe, text, text-format @@ -157351,14 +157907,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "socket_0_6_2_0" = callPackage + "socket_0_7_0_0" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "socket"; - version = "0.6.2.0"; - sha256 = "c7aed50b213c56c03f22a537acfd794e99564f50f412ec2dcaee6dd9cd9bad1c"; + version = "0.7.0.0"; + sha256 = "84dad156fe2d792194e86c4496db648e5fe0bbb55db2070b93058d6aa5f08962"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -157402,12 +157958,12 @@ self: { ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; - version = "0.1.0.0"; - sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5"; + version = "0.2.0.1"; + sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036"; libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; - homepage = "https://github.com/lpeterse/haskell-socket-sctp"; + homepage = "https://github.com/shlevy/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -157564,25 +158120,6 @@ self: { }: mkDerivation { pname = "solga-swagger"; - version = "0.1.0.1"; - sha256 = "ceac56b2de41102e739301b5edf60af546e6178f139313681cb46bfb693f765f"; - libraryHaskellDepends = [ - base bytestring dlist http-types insert-ordered-containers lens mtl - solga swagger2 text unordered-containers - ]; - homepage = "https://github.com/chpatrick/solga"; - description = "Swagger generation for Solga"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "solga-swagger_0_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, dlist, http-types - , insert-ordered-containers, lens, mtl, solga, swagger2, text - , unordered-containers - }: - mkDerivation { - pname = "solga-swagger"; version = "0.1.0.2"; sha256 = "dcb77313090c82ce9f35843ecec2ce59741fffa5f7a337d77b5d545a8e2136d4"; libraryHaskellDepends = [ @@ -158022,8 +158559,8 @@ self: { }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.1.1"; - sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; + version = "0.2.2.0"; + sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158099,8 +158636,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.3.1.0"; - sha256 = "0b3ab1617e6c5eb74aacdc156d5b74fd1c1ed8d416d793f7b6e2d279773573da"; + version = "0.4.0.0"; + sha256 = "e54b9ecf64ca50aea8b7d4e152bbb462672ac74518d844617bfccbf5c584c5e3"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -158688,8 +159225,8 @@ self: { }: mkDerivation { pname = "sproxy"; - version = "0.9.8"; - sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a"; + version = "0.9.9"; + sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158726,6 +159263,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sproxy2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, cereal, conduit, containers, cookie, docopt, entropy + , Glob, http-client, http-conduit, http-types + , interpolatedstring-perl6, network, postgresql-simple + , resource-pool, SHA, sqlite-simple, text, time, unix + , unordered-containers, wai, wai-conduit, warp, warp-tls, word8 + , yaml + }: + mkDerivation { + pname = "sproxy2"; + version = "1.90.1"; + sha256 = "5feb5f23458155f317808992af1de5cb1e86ee6d89a0ce0371efe3dfd130926b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring cereal + conduit containers cookie docopt entropy Glob http-client + http-conduit http-types interpolatedstring-perl6 network + postgresql-simple resource-pool SHA sqlite-simple text time unix + unordered-containers wai wai-conduit warp warp-tls word8 yaml + ]; + description = "Secure HTTP proxy for authenticating users via OAuth2"; + license = stdenv.lib.licenses.mit; + }) {}; + "spsa" = callPackage ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -158892,8 +159455,8 @@ self: { }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.9.0"; - sha256 = "81dfe4a1dd69d2f0334d3be10ba1d6ce91a9ba0602e69170dfbecb84b11f60a3"; + version = "0.4.10.0"; + sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers direct-sqlite text time transformers @@ -159232,8 +159795,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.1.1.0"; - sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2"; + version = "0.1.2.0"; + sha256 = "bf6e85899194446dc86b40cbfe9363dd5798a204d45f6911f98ab6ffda4fa9f6"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; @@ -160693,6 +161256,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm-supply" = callPackage + ({ mkDerivation, async, base, concurrent-supply, QuickCheck, random + , Unique + }: + mkDerivation { + pname = "stm-supply"; + version = "0.2.0.0"; + sha256 = "f839ada6e5ac9549731086ed13fcf4c9f03a6ff93d64c0a857148820864f388c"; + libraryHaskellDepends = [ base concurrent-supply ]; + testHaskellDepends = [ async base QuickCheck random Unique ]; + homepage = "https://github.com/caneroj1/stm-supply#readme"; + description = "STM wrapper around Control.Concurrent.Supply."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stm-tlist" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -161893,6 +162471,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {stripe-tests = null;}; + "strips" = callPackage + ({ mkDerivation, base, containers, hspec, mtl }: + mkDerivation { + pname = "strips"; + version = "0.1.0.0"; + sha256 = "6235efbdbf6505b9579266f047020240f642d1f3ee20e8b07480a638e0f71dce"; + revision = "1"; + editedCabalFile = "7bd62d7118703833b341b9e596a402ab58e339fe925cfc8b2650b2491fe57ae1"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers hspec mtl ]; + homepage = "https://github.com/y-kamiya/strips-haskell#readme"; + description = "resolver using strips algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit @@ -163756,8 +164349,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "system-info"; - version = "0.1.0.2"; - sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c"; + version = "0.1.0.3"; + sha256 = "9d31bad4a6ea7abdb6bef5e929388a58d200982964042cc4aa991c81066dc8b8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -163807,6 +164400,8 @@ self: { pname = "system-locale"; version = "0.1.0.0"; sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab"; + revision = "1"; + editedCabalFile = "3681691c486cb637328329037f5ccb6bc266310cc4db7bb04072a7084328cfa4"; libraryHaskellDepends = [ base megaparsec process time ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/cocreature/system-locale"; @@ -164055,6 +164650,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tabl" = callPackage + ({ mkDerivation, base, safe, text }: + mkDerivation { + pname = "tabl"; + version = "0.1.0.0"; + sha256 = "4adb4507af71badd8cb5f076d8c996f9e26e8102e4c2361a93bad1ae303c9b2e"; + libraryHaskellDepends = [ base safe text ]; + homepage = "https://github.com/lovasko/tabl"; + description = "Table layout"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "table" = callPackage ({ mkDerivation, base, csv, optparse-applicative, process, split }: mkDerivation { @@ -165042,8 +165649,8 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "1.0.0"; - sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0"; + version = "1.0.1"; + sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165053,8 +165660,9 @@ self: { executableHaskellDepends = [ base directory filepath tasty-th ]; testHaskellDepends = [ base ]; homepage = "https://github.com/lwm/tasty-discover/"; - description = "Automatically discover and run Tasty framework tests"; - license = "GPL"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -165575,6 +166183,7 @@ self: { homepage = "https://github.com/winterland1989/tcp-streams"; description = "Tcp streams using openssl for tls support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdd-util" = callPackage @@ -166318,15 +166927,16 @@ self: { "test-fixture" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl - , template-haskell, transformers + , template-haskell, th-to-exp, transformers }: mkDerivation { pname = "test-fixture"; - version = "0.4.1.0"; - sha256 = "bddd2b518151218d9848b46f233c70719711a45fd7357ecc3a5eb1d551d437a4"; + version = "0.4.2.0"; + sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a"; libraryHaskellDepends = [ base data-default mtl template-haskell ]; testHaskellDepends = [ - base hspec hspec-discover mtl transformers + base hspec hspec-discover mtl template-haskell th-to-exp + transformers ]; homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; @@ -166684,8 +167294,8 @@ self: { }: mkDerivation { pname = "test-simple"; - version = "0.1.8"; - sha256 = "8e8bacb6299e82d1f3f3643144e24ce574b99b2f052bd630930a4c2e62267895"; + version = "0.1.9"; + sha256 = "eaee79bf997272fe0c97a0cfb80347c760ca5de8ffb0d639ddbf00ba6f6ef51d"; libraryHaskellDepends = [ base mtl QuickCheck state-plus template-haskell ]; @@ -167469,6 +168079,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-utils" = callPackage + ({ mkDerivation, base, HTF, text }: + mkDerivation { + pname = "text-utils"; + version = "0.1.0.0"; + sha256 = "63b6e0bc28907593a5a98c5e27be3ab22b44cdb66c4095461fe4dd683f262662"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base HTF text ]; + homepage = "https://github.com/agrafix/text-utils#readme"; + description = "Various text utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "text-xml-generic" = callPackage ({ mkDerivation, base, bytestring, containers, haskell98, mtl , not-in-base, split, syb, template-haskell, xml @@ -167504,8 +168127,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.8.3"; - sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f"; + version = "0.9"; + sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6"; libraryHaskellDepends = [ base deepseq text vector ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; @@ -167816,8 +168439,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.0.0"; - sha256 = "59349f1999d72e4d0158de95c1ede5e8787d4c8c743ec4e6a2dbf37f823a5eea"; + version = "0.4.1.0"; + sha256 = "c198f592cc5cd644da97209f1aca0decd10e0847dd676195cb5dcb6abbbe48ea"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -167853,8 +168476,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-inline-io-action"; - version = "0.1.0.0"; - sha256 = "8f7fa350547913e30a26930cad3560044be1f440ad0159ff19d9291bec887dfb"; + version = "0.1.0.1"; + sha256 = "78dae84932b62a5dd487cbcc803d519bab4ba1bec867271a234898e2fd73bd27"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/tolysz/inline-io-action"; description = "Simple inline IO action into compiled code using TH"; @@ -167973,22 +168596,6 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.2"; - sha256 = "ac863234791b0860f7a33adc8656f0026698e1247c5fa4bd13d7befbfddc0204"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_3" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; version = "0.13.3"; sha256 = "7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d"; libraryHaskellDepends = [ @@ -167997,7 +168604,6 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-printf" = callPackage @@ -168643,12 +169249,13 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib + , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad + , xmonad-contrib }: mkDerivation { pname = "tianbar"; - version = "1.2.1.0"; - sha256 = "0ac03b869479eb576caa20bcfd76e2cf61a2cf9fbec61bc2cccbd4f4507e6c61"; + version = "1.2.4"; + sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168660,7 +169267,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 ]; + executablePkgconfigDepends = [ gtk3 webkit2gtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -168672,7 +169279,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: @@ -168909,14 +169516,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_6_0_1" = callPackage + "time_1_7" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, test-framework , test-framework-quickcheck2, unix }: mkDerivation { pname = "time"; - version = "1.6.0.1"; - sha256 = "ff69b46f38f4d226b171d078b200f8a5a1e8cfeadfa543eabade51355d7c7fcb"; + version = "1.7"; + sha256 = "a30e1ea20cc59f3bf6ee2d5fd0a0dfa58f1ec865681d762cf1bb1103562e2a7a"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck test-framework test-framework-quickcheck2 @@ -169205,8 +169812,8 @@ self: { }: mkDerivation { pname = "time-warp"; - version = "0.1.1.1"; - sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18"; + version = "0.1.1.2"; + sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169229,6 +169836,7 @@ self: { homepage = "https://github.com/serokell/time-warp"; description = "Distributed systems execution emulation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timecalc" = callPackage @@ -170182,8 +170790,8 @@ self: { }: mkDerivation { pname = "torrent"; - version = "10000.0.0"; - sha256 = "5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c"; + version = "10000.0.1"; + sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725"; libraryHaskellDepends = [ base bencode binary bytestring containers filepath syb ]; @@ -170762,22 +171370,6 @@ self: { }: mkDerivation { pname = "transient"; - version = "0.4.4"; - sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; - libraryHaskellDepends = [ - base containers directory mtl random stm time transformers - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient_0_4_4_1" = callPackage - ({ mkDerivation, base, containers, directory, mtl, random, stm - , time, transformers - }: - mkDerivation { - pname = "transient"; version = "0.4.4.1"; sha256 = "f1ad34b6c3d4044d294abf4b37f35efb764b710851eab6e58e1b9abb8a68d0ed"; libraryHaskellDepends = [ @@ -170786,7 +171378,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Making composable programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe" = callPackage @@ -173314,6 +173905,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ua-parser_0_7_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, file-embed + , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck + , text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.2"; + sha256 = "469afe9d9c7d7de7405b316a388639858b515840f74ba0b4c48985559922df55"; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -174510,12 +175122,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "unix_2_7_2_0" = callPackage + "unix_2_7_2_1" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { pname = "unix"; - version = "2.7.2.0"; - sha256 = "9444ea785b9f3547d3e04d2d42ead6bc3c2e0129390d9d41a655b18b0c322bf0"; + version = "2.7.2.1"; + sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c"; + revision = "1"; + editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -175465,6 +176079,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "users-mysql-haskell" = callPackage + ({ mkDerivation, base, bytestring, io-streams, mysql-haskell, tasty + , tasty-hunit, text, time, transformers, users, uuid + }: + mkDerivation { + pname = "users-mysql-haskell"; + version = "0.5.2.0"; + sha256 = "a7f7a2d91860e2dc4594639776aaff06c981f01aaa356553c397d50a0f367930"; + libraryHaskellDepends = [ + base io-streams mysql-haskell text time transformers users uuid + ]; + testHaskellDepends = [ + base bytestring io-streams mysql-haskell tasty tasty-hunit text + time transformers users uuid + ]; + description = "A mysql-haskell backend for the users library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "users-persistent" = callPackage ({ mkDerivation, base, bytestring, esqueleto, hspec, monad-logger , mtl, persistent, persistent-sqlite, persistent-template @@ -176642,8 +177275,8 @@ self: { pname = "vector"; version = "0.11.0.0"; sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4"; - revision = "1"; - editedCabalFile = "dfdf3252519ff35da59f977b7d37d6c5a6660673ce1234899af0111f7ece9c66"; + revision = "2"; + editedCabalFile = "2bfafd758ab4d80fa7a16b0a650aff60fb1be109728bed6ede144baf1f744ace"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base QuickCheck random template-haskell test-framework @@ -176687,8 +177320,8 @@ self: { ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.3.2"; - sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049"; + version = "0.2.3.3"; + sha256 = "20158b1ab2fb8dd1bad57896fa3f75bb7fbc5354020c5715e997972b6ffb9f5c"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; homepage = "https://github.com/bos/vector-binary-instances"; @@ -176911,8 +177544,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.4.0.0"; - sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061"; + version = "0.4.0.1"; + sha256 = "88880ec1fafecf2ef3ab545c43ff3256a32dc7dd854eec4aaa0d6bd4afd7b008"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -177142,12 +177775,12 @@ self: { ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl , pipes, pipes-concurrency, process, QuickCheck, stm, tasty - , tasty-quickcheck, template-haskell, text, transformers, unix, vty + , tasty-quickcheck, text, transformers, unix, vty }: mkDerivation { pname = "vgrep"; - version = "0.1.4.0"; - sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b"; + version = "0.1.4.1"; + sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177156,7 +177789,7 @@ self: { ]; executableHaskellDepends = [ async base cabal-file-th containers directory lens mtl pipes - pipes-concurrency process template-haskell text unix vty + pipes-concurrency process text unix vty ]; testHaskellDepends = [ base containers doctest lens QuickCheck tasty tasty-quickcheck text @@ -177756,6 +178389,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_13" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , data-default, 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.13"; + sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers data-default deepseq + directory filepath hashable microlens microlens-mtl microlens-th + mtl parallel parsec stm terminfo text transformers unix utf8-string + vector + ]; + executableHaskellDepends = [ + base containers data-default microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers data-default 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/coreyoconnor/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 @@ -178164,8 +178834,8 @@ self: { }: mkDerivation { pname = "wai-frontend-monadcgi"; - version = "3.0.0.2"; - sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91"; + version = "3.0.0.3"; + sha256 = "b140ad372252e638dfa7a8d8d48ae84121b1b67dc6454801302a15bd8cf42729"; libraryHaskellDepends = [ base bytestring case-insensitive cgi containers http-types transformers wai @@ -179350,8 +180020,10 @@ self: { }: mkDerivation { pname = "warc"; - version = "0.3.0"; - sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc"; + version = "0.3.1"; + sha256 = "2b8752553865feee48aa41d9940bc752e8d22dd866d1ba3e901fb3f7f9dd9510"; + revision = "1"; + editedCabalFile = "194f11d8f498f829f3f9dfd4ac145d1afbf6fdde1394fa4564377bcc47acbc76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179379,37 +180051,6 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.8"; - sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_9" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; version = "3.2.9"; sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca"; libraryHaskellDepends = [ @@ -179429,7 +180070,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -181210,8 +181850,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.2.12"; - sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade"; + version = "0.2.13"; + sha256 = "3c6ab5d67238b760d883c3943c3131720d0f07f4edb037c6531b9a827529f7d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181333,8 +181973,8 @@ self: { }: mkDerivation { pname = "wordpass"; - version = "1.0.0.6"; - sha256 = "ef8888709fe0f0146b6cf3739191b4ca1c5df10f77a70da15d88deed1e925a37"; + version = "1.0.0.7"; + sha256 = "2283d16807261457c54022ca028e3c3a7fec1df6b66b9074ddbf0f14e721d9d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181399,8 +182039,8 @@ self: { ({ mkDerivation, base, containers, doctest, hspec, time }: mkDerivation { pname = "workdays"; - version = "0.1.0"; - sha256 = "61c41d0b6257630ed2e9b484264a8f0c19595e6f0bf1c30dd35129951bd4a4de"; + version = "0.1.1"; + sha256 = "871cf67b17ca57f91ce73295311e4ffa5f6c8301908cbd182d6b7c50d48289e7"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest hspec ]; homepage = "https://github.com/stackbuilders/workdays"; @@ -182867,7 +183507,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xml-conduit_1_4_0_1" = callPackage + "xml-conduit_1_4_0_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -182875,8 +183515,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.4.0.1"; - sha256 = "7c9c171230bcb66b1ab6b0b201f6e5666c79ad4eb0747e68eb1d932591ab1700"; + version = "1.4.0.2"; + sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -183060,6 +183700,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-isogen" = callPackage + ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck + , semigroups, template-haskell, text, xml-conduit-writer + }: + mkDerivation { + pname = "xml-isogen"; + version = "0.1.0"; + sha256 = "ae66671939e101c38154f04f603b00ed31451477a55d183ae299316315005eae"; + libraryHaskellDepends = [ + base dom-parser lens mtl QuickCheck semigroups template-haskell + text xml-conduit-writer + ]; + description = "Generate XML-isomorphic types"; + license = stdenv.lib.licenses.mit; + }) {}; + "xml-lens" = callPackage ({ mkDerivation, base, case-insensitive, containers, lens, text , xml-conduit @@ -184629,8 +185285,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "0.3.0.2"; - sha256 = "644a83935a015b792d879dfa301bbb18beeea8515c2acd8d516a2cf6697fcbb7"; + version = "0.3.0.3"; + sha256 = "b405093850400d551cc9d443cedcd28e7b0ff4b9e724ee00d4b21c4852d80f0b"; libraryHaskellDepends = [ base containers filepath HDBC parsec template-haskell ]; @@ -184644,22 +185300,24 @@ self: { "yesod" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit-extra, data-default, directory, fast-logger - , monad-control, monad-logger, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, transformers, unix - , unordered-containers, wai, wai-extra, wai-logger, warp, yaml - , yesod-auth, yesod-core, yesod-form, yesod-persistent + , conduit, conduit-extra, data-default, directory, fast-logger + , monad-control, monad-logger, resourcet, safe, semigroups + , shakespeare, streaming-commons, template-haskell, text + , transformers, unix, unordered-containers, wai, wai-extra + , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form + , yesod-persistent }: mkDerivation { pname = "yesod"; - version = "1.4.3"; - sha256 = "13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3"; + version = "1.4.3.1"; + sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21"; libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit-extra - data-default directory fast-logger monad-control monad-logger safe - semigroups shakespeare streaming-commons template-haskell text - transformers unix unordered-containers wai wai-extra wai-logger - warp yaml yesod-auth yesod-core yesod-form yesod-persistent + aeson base blaze-html blaze-markup bytestring conduit conduit-extra + data-default directory fast-logger monad-control monad-logger + resourcet safe semigroups shakespeare streaming-commons + template-haskell text transformers unix unordered-containers wai + wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form + yesod-persistent ]; homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; @@ -185216,46 +185874,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.25"; - sha256 = "929b881c3bddf7f868ba44d8aed72e36163affb6f455dd0f4669c8451fe6c46b"; - 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 - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_26" = callPackage - ({ mkDerivation, aeson, async, 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, 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.26"; sha256 = "2441476cd66d5e615ce33d7d378f121e6f05875fa92a0e8afd3ab47c3d50dd6d"; libraryHaskellDepends = [ @@ -185279,7 +185897,6 @@ self: { 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 @@ -185409,6 +186026,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-elements" = callPackage + ({ mkDerivation, base, blaze-html, yesod-core }: + mkDerivation { + pname = "yesod-elements"; + version = "1.0"; + sha256 = "d4a0cf90675bb146acf2e7fa6e743501f20b8efc7b9beac53e6081e9c1851134"; + libraryHaskellDepends = [ base blaze-html yesod-core ]; + description = "Non template haskell markup building function in the spirit of lucid"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-eventsource" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core @@ -185495,8 +186123,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.8"; - sha256 = "c6f2f83dd361569f830c95671b70c7510b485840d20b9ade6c747de127088f0b"; + version = "1.4.9"; + sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -185693,8 +186321,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.11.1"; - sha256 = "76ce2fbc55ed6e23c70fea32441c38a6466888695b8c48035471343c407efd2f"; + version = "0.11.2"; + sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 66e151aefe3c..7929d99de153 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -47,7 +47,10 @@ let in if paths == [] && !withLLVM then ghc else buildEnv { - inherit (ghc) name; + # this makes computing paths from the name attribute impossible; + # if such a feature is needed, the real compiler name should be saved + # as a dedicated drv attribute, like `compiler-name` + name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; inherit ignoreCollisions; postBuild = '' diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix new file mode 100644 index 000000000000..cbb5f0789fa2 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang +, gnused, gawk, makeWrapper +, odbcSupport ? false, unixODBC ? null +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null +, enableDebugInfo ? false +, Carbon ? null, Cocoa ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; +assert odbcSupport -> unixODBC != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; + version = "16B03-1"; + + src = fetchgit { + url = "https://github.com/basho/otp"; + rev = "cb3a485894e493ad172db2749129e613fe52713a"; + sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + }; + + debugInfo = enableDebugInfo; + + buildInputs = + [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport [ unixODBC ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; + + preConfigure = '' + export HOME=$PWD/../ + export LANG=C + export ERL_TOP=$(pwd) + sed -e s@/bin/pwd@pwd@g -i otp_build + sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + ''; + + configureFlags= [ + "--with-ssl=${openssl.dev}" + "--enable-smp-support" + "--enable-threads" + "--enable-kernel-poll" + "--disable-hipe" + "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" + "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" + "${optionalString stdenv.isLinux "--enable-m64-build"}" + ]; + + buildPhase = '' + ./otp_build autoconf + ./otp_build setup -a --prefix=$out $configureFlags + ''; + + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = "https://github.com/basho/otp/"; + description = "Programming language used for massively scalable soft real-time systems, Basho fork"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + This version of Erlang is Basho's version, forked from Ericsson's + repository. + ''; + + platforms = ["x86_64-linux" "x86_64-darwin"]; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 56b4626a2127..57323a587f81 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 5d9c5dac3d8e..f9b6edc3fa4b 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -20,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "18.3.4"; + version = "18.3.4.4"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; }; buildInputs = @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index ddeccb29b59d..824c68688803 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -20,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1"; + version = "19.1.6"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736"; + sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; }; buildInputs = @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 78d154bb6542..a883080f58e7 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv"; + sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index adf743848d19..6da5c265aaf6 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.1.0-beta1"; + version = "2.1.0-beta2"; luaversion = "5.1"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; + sha256 = "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 96c85704f5ef..3b1b288fd5d5 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,12 +302,12 @@ let in { php56 = generic { - version = "5.6.27"; - sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv"; + version = "5.6.28"; + sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5"; }; php70 = generic { - version = "7.0.12"; - sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q"; + version = "7.0.13"; + sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h"; }; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix deleted file mode 100644 index 24ba479186ec..000000000000 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, readline, nspr }: - -stdenv.mkDerivation rec { - version = "1.8.0-rc1"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/js-${version}.tar.gz"; - sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413"; - }; - - buildInputs = [ readline nspr ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.isi686 "pic"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - ''; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch index 721aff154e37..721aff154e37 100644 --- a/pkgs/development/interpreters/spidermonkey/arm-flags.patch +++ b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch index f6dab5497a0a..f6dab5497a0a 100644 --- a/pkgs/development/interpreters/spidermonkey/findvanilla.patch +++ b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 582e7039d17c..3c5eef01db01 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,11 +1,11 @@ -{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - version = "185-1.0.0"; name = "spidermonkey-${version}"; + version = "1.8.5"; src = fetchurl { - url = "mirror://mozilla/js/js${version}.tar.gz"; + url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; }; @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out - ${if stdenv.isArm then "autoreconf --verbose --force" else ""} + ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ''; patches = stdenv.lib.optionals stdenv.isArm [ # Explained below in configureFlags for ARM - ./findvanilla.patch + ./1.8.5-findvanilla.patch # Fix for hard float flags. - ./arm-flags.patch + ./1.8.5-arm-flags.patch ]; patchFlags = "-p3"; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.nix index a2ecfb2ef97a..a2ecfb2ef97a 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.nix index 279528e9e83c..6e354c542963 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }: stdenv.mkDerivation rec { version = "24.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline icu ]; postPatch = '' # Fixes an issue with version detection under perl 5.22.x @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--enable-threadsafe" + "--with-system-icu" "--with-system-nspr" "--with-system-ffi" "--enable-readline" diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.nix index f52d526e3fa9..585ebc120d8e 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }: stdenv.mkDerivation rec { version = "31.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; }; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" "--with-system-ffi" + "--with-system-nspr" + "--with-system-icu" "--enable-readline" # enabling these because they're wanted by 0ad. They may or may diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix new file mode 100644 index 000000000000..89c02f262001 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }: + +stdenv.mkDerivation rec { + version = "38.2.1.rc0"; + name = "spidermonkey-${version}"; + + # the release notes point to some guys home directory, see + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 + # probably it would be more ideal to pull a particular tag/revision + # from the mercurial repo + src = fetchurl { + url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2"; + sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; + }; + + buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${python2.interpreter}" + ''; + + configureFlags = [ + "--enable-threadsafe" + "--with-system-ffi" + "--with-system-nspr" + "--with-system-zlib" + "--with-system-icu" + "--enable-readline" + + # enabling these because they're wanted by 0ad. They may or may + # not be good defaults for other uses. + "--enable-gcgenerational" + "--enable-shared-js" + ]; + + # This addresses some build system bug. It's quite likely to be safe + # to re-enable parallel builds if the source revision changes. + enableParallelBuilding = true; + + postFixup = '' + # The headers are symlinks to a directory that doesn't get put + # into $out, so they end up broken. Fix that by just resolving the + # symlinks. + for i in $(find $out -type l); do + cp --remove-destination "$(readlink "$i")" "$i"; + done + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra deleted file mode 100644 index a764cfc69cb6..000000000000 --- a/pkgs/development/interpreters/spidermonkey/Makefile.extra +++ /dev/null @@ -1,10 +0,0 @@ -install: $(PROGRAM) $(SHARED_LIBRARY) - mkdir -pv $(DIST)/{bin,lib} - mkdir -pv $(DIST)/include - cp -v $(PROGRAM) $(DIST)/bin - cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib - cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include - mkdir -pv $(DIST)/include/js - find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';' - find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';' - diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix deleted file mode 100644 index 1fe4b90b2b80..000000000000 --- a/pkgs/development/interpreters/spidermonkey/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, readline }: - -stdenv.mkDerivation rec { - name = "spidermonkey-1.7"; - - src = fetchurl { - url = mirror://mozilla/js/js-1.7.0.tar.gz; - sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; - }; - - hardeningDisable = [ "format" ] - ++ stdenv.lib.optional stdenv.isi686 "stackprotector"; - - buildInputs = [ readline ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8"; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 1f290bf7044f..4875d9ab5a1a 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index a10d730d06e4..e1cfb488be88 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ atk glibmm ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index fbf3cd57e3b9..017516f6b490 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9da83ca913e7..b1860872df36 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "2016-07-18"; + version = "2016-11-16"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "92d2af6def80a01b76d5e73f073c439ad00ab757"; - sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27"; + rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5"; + sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p"; }; installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/zeromq/cppzmq; + homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch index c53160a82970..bbb778914977 100644 --- a/pkgs/development/libraries/db/clang-4.8.patch +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -1,13 +1,22 @@ diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 +index 0034dcc..160c8ea 100644 --- a/dbinc/atomic.h +++ b/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ - __atomic_compare_exchange((p), (o), (n)) -+ __db_atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_int((p), (o), (n)) static inline int __atomic_inc(db_atomic_t *p) { int temp; @@ -16,7 +25,130 @@ index 0034dcc..fa7ba93 100644 * which configure could be changed to use. */ -static inline int __atomic_compare_exchange( -+static inline int __db_atomic_compare_exchange( ++static inline int __atomic_compare_exchange_int( db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/dbinc/db.in b/dbinc/db.in +index 9fc6712..7428e0a 100644 +--- a/dbinc/db.in ++++ b/dbinc/db.in +@@ -2413,7 +2413,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/mp/mp_fget.c b/mp/mp_fget.c +index 5fdee5a..0b75f57 100644 +--- a/mp/mp_fget.c ++++ b/mp/mp_fget.c +@@ -617,7 +617,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, +@@ -911,7 +911,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c +index 34467d2..f05aa0c 100644 +--- a/mp/mp_mvcc.c ++++ b/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/mp/mp_region.c b/mp/mp_region.c +index e6cece9..ddbe906 100644 +--- a/mp/mp_region.c ++++ b/mp/mp_region.c +@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID : + mtx_base + i; + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/mutex/mut_method.c b/mutex/mut_method.c +index 2588763..5c6d516 100644 +--- a/mutex/mut_method.c ++++ b/mutex/mut_method.c +@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c +index f3922e0..e40fcdf 100644 +--- a/mutex/mut_tas.c ++++ b/mutex/mut_tas.c +@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 0a0993da13e1..1cfb13ca8e68 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -16,7 +16,7 @@ index 6a858f7..9f338dc 100644 #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ - __atomic_compare_exchange((p), (o), (n)) -+ __atomic_compare_exchange_db((p), (o), (n)) ++ __atomic_compare_exchange_int((p), (o), (n)) static inline int __atomic_inc(db_atomic_t *p) { int temp; @@ -25,7 +25,7 @@ index 6a858f7..9f338dc 100644 * which configure could be changed to use. */ -static inline int __atomic_compare_exchange( -+static inline int __atomic_compare_exchange_db( ++static inline int __atomic_compare_exchange_int( db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch new file mode 100644 index 000000000000..5c1e8f506c4e --- /dev/null +++ b/pkgs/development/libraries/db/clang-6.0.patch @@ -0,0 +1,136 @@ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index e4420aa..4799b5f 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -225,7 +225,7 @@ static inline int __atomic_compare_exchange_int( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc_int(env, p) + #define atomic_dec(env, p) __atomic_dec_int(env, p) +diff --git a/src/dbinc/db.in b/src/dbinc/db.in +index 3c2ad9b..3e46f02 100644 +--- a/src/dbinc/db.in ++++ b/src/dbinc/db.in +@@ -2999,7 +2999,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 59fe9fe..fa4ced7 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -654,7 +654,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -969,7 +969,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 83c4d72..0a47202 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -440,7 +440,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4d95e4f..e97459c 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + mtx_base = mtx_prev = MUTEX_INVALID; +@@ -332,7 +332,7 @@ no_prealloc: + DB_MUTEX_SHARED, &hp->mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 72b34de..a9f9868 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -501,7 +501,7 @@ __atomic_compare_exchange_int(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 7899c4b..d9420fa 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -643,7 +643,7 @@ was_not_locked: + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch deleted file mode 100644 index 3f9d658b5dac..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c -*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005 ---- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006 -*************** -*** 36,41 **** ---- 36,50 ---- - - DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - #ifdef HAVE_FCNTL - fl.l_start = offset; - fl.l_len = 1; diff --git a/pkgs/development/libraries/db/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch deleted file mode 100644 index 3f0ee78a7085..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c -*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200 ---- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200 -*************** -*** 30,35 **** ---- 30,44 ---- - - DB_ASSERT(dbenv, F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(dbenv, offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - fl.l_start = offset; - fl.l_len = 1; - fl.l_type = acquire ? F_WRLCK : F_UNLCK; -Only in db-4.5.20/os: os_flock.c~ diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 40869a865ae5..bce91e5a9401 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -2,8 +2,9 @@ import ./generic.nix (args // rec { version = "4.8.30"; - extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - branch = "4.8"; - drvArgs = { hardeningDisable = [ "format" ]; }; + extraPatches = [ ./clang-4.8.patch ]; + + drvArgs.hardeningDisable = [ "format" ]; + drvArgs.doCheck = false; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 91adfa24b58d..d1d3c953fc9f 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,9 +3,6 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - branch = "5.3"; - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store + license = stdenv.lib.licenses.agpl3; extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 716cad9ab074..b7c5667b883e 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; - branch = "6.0"; + extraPatches = [ ./clang-6.0.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fdc828effdfb..a6f9c676bba0 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -4,9 +4,8 @@ # Options from inherited versions , version, sha256 -, extraPatches ? [ ] +, patchSrc ? "src", extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat -, branch ? null , drvArgs ? {} }: @@ -36,11 +35,16 @@ stdenv.mkDerivation (rec { rm -rf $out/docs ''; + doCheck = true; + + checkPhase = '' + make examples_c examples_cxx + ''; + meta = with stdenv.lib; { homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; platforms = platforms.unix; - branch = branch; }; } // drvArgs) diff --git a/pkgs/development/libraries/db/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch deleted file mode 100644 index bb05c966e5bd..000000000000 --- a/pkgs/development/libraries/db/register-race-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -rc db-4.5.20-orig/env/env_register.c db-4.5.20/env/env_register.c -*** db-4.5.20-orig/env/env_register.c 2006-09-09 16:29:04.000000000 +0200 ---- db-4.5.20/env/env_register.c 2007-05-16 21:13:27.000000000 +0200 -*************** -*** 255,260 **** ---- 255,262 ---- - buf[nr - 1] = '\0'; - } - -+ //sleep(3); -+ - pos = (off_t)lcnt * PID_LEN; - if (REGISTRY_LOCK(dbenv, pos, 1) == 0) { - if ((ret = REGISTRY_UNLOCK(dbenv, pos)) != 0) -*************** -*** 361,366 **** ---- 363,392 ---- - if (recovery_failed) - goto err; - -+ //sleep(5); -+ -+ /* -+ * Acquire an exclusive lock to prevent a race like this: -+ * -+ * 1) Process X is about to exit and process Y is just -+ * starting. -+ * 2) Process Y reads X's slot. -+ * 3) Process X clears its slot. -+ * 4) Process Y sees that X's slot isn't cleared yet (since it -+ * just read the old value). -+ * 5) Process X closes the registry, releases the lock on its -+ * slot. -+ * 6) Process Y tries to acquire X's slot and succeeds, so it -+ * concludes that X died and recovery is needed. -+ * -+ * A more efficient solution to this problem would be to let -+ * __envreg_add acquire the lock on a slot first, and *then* -+ * read the slot (instead of the other way around). Then we -+ * wouldn't need the exclusive lock here. -+ */ -+ if ((ret = REGISTRY_EXCL_LOCK(dbenv, 0)) != 0) -+ goto err; -+ - /* - * Why isn't an exclusive lock necessary to discard a DB_ENV handle? - * diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 049a799c44fa..c6f7684ecf39 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.0.1"; name = "double-conversion-${version}"; + version = "2.0.1"; src = fetchFromGitHub { owner = "google"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/google/double-conversion; + homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index af8b1cb87373..1e070ca25995 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016.08.08.00"; + version = "2016.11.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087"; + sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = https://github.com/facebook/folly; + homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 4135c451eebc..6737e059b212 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,16 +9,20 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 9a73b82f8884..17847695f973 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation rec { name = "giblib-1.2.4"; - + src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - - buildInputs = [xlibsWrapper imlib2]; + + buildInputs = [ xlibsWrapper ]; + propagatedBuildInputs = [ imlib2 ]; meta = { homepage = http://linuxbrit.co.uk/giblib/; + description = "wrapper library for imlib2, and other stuff"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix new file mode 100644 index 000000000000..3cf429ab1d73 --- /dev/null +++ b/pkgs/development/libraries/git2/0.23.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: + +stdenv.mkDerivation (rec { + version = "0.23.2"; + name = "libgit2-${version}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/libgit2/libgit2/tarball/v${version}"; + sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; + }; + + cmakeFlags = "-DTHREADSAFE=ON"; + + nativeBuildInputs = [ cmake python pkgconfig ]; + buildInputs = [ zlib libssh2 openssl http-parser ]; + + meta = { + description = "the Git linkable library"; + homepage = http://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index c4487dca5977..2bd500b9efbc 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.2"; + version = "0.24.3"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1"; + sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 3b015532ca8b..feb769229c02 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.2.1"; name = "glfw-${version}"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = "${version}"; - sha256 = "0knqf40jij2z1mia091xqyky5r11r4qyh7b8172blrmgm9q23sl9"; + sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a91acdbb0086..4e18e4d16b2c 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.8.2"; + name = "gst-plugins-bad-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"; + sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 00aa893bd33e..319f7c75a750 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.8.2"; + name = "gst-plugins-base-1.10.1"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d"; + sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index da6a8c7a74a4..55da05c4c971 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.8.2"; + name = "gstreamer-1.10.1"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341"; + sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 5f60b9c03a31..06776de9340c 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.8.2"; + name = "gstreamer-editing-services-1.10.1"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae"; + sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a44bdbcd08c4..ba6f79c138ab 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.8.2"; + name = "gst-plugins-good-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944"; + sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 176e19000e91..a1e28efbff46 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: let - ver_maj = "1.4"; - ver_min = "3"; + ver_maj = "1.8"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; - sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi"; + sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 788aacf03ec6..7ae10f50c4d6 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.8.2"; + name = "gst-libav-1.10.1"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a"; + sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9d6fa94cf3ae..78127e3ce98a 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -6,14 +6,14 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { - name = "gst-python-1.8.2"; + name = "gst-python-1.10.1"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g"; + sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index ab6e1f9f4f17..df5b682a2371 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.8.2"; + name = "gst-plugins-ugly-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac"; + sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 9972468f1b7f..f18b9fc214dc 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm -, libvpx +, libvpx, python }: stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "0.7.0"; + version = "1.10.1"; src = fetchurl { - url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; - sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; + url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; + sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkgconfig bzip2 ]; buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev - xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx + xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM + xorg.libICE mesa nasm libvpx python ]; preConfigure = " @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = "http://www.freedesktop.org"; + homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 2de3955ab06a..2f5ba2372ce7 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection +, python, gobjectIntrospection, json_glib }: stdenv.mkDerivation rec { - name = "gst-validate-1.8.2"; + name = "gst-validate-1.10.1"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe"; + sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python + python json_glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 119e3f77f670..1ec2a7cd6f0d 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 8b2383f33cce..49055f6b4a95 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ epoxy ]; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7bf4af99fb3..ba8fe038ffac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation ({ outputs = [ "out" "dev" ]; outputBin = "dev"; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CXXFLAGS=-headerpad_max_install_names"; - # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 85e9979ebb07..a6ad33d842c9 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig +, freetype +, x11Support ? true, xlibsWrapper ? null }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "imlib2-1.4.9"; @@ -8,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x"; }; - buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +26,14 @@ stdenv.mkDerivation rec { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors - configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null; + configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + ++ optional (!x11Support) "--without-x"; + + outputs = [ "out" "bin" "dev" ]; + + postInstall = '' + moveToOutput bin/imlib2-config "$dev" + ''; meta = { description = "Image manipulation library"; @@ -34,8 +46,8 @@ stdenv.mkDerivation rec { easily, without sacrificing speed. ''; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ spwhitt ]; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ spwhitt ]; }; } diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 895d72dd7a0a..9568d9bbb3bc 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.21"; + name = "jasper-1.900.28"; src = fetchurl { + # You can find this code on Github at https://github.com/mdadams/jasper + # however note at https://www.ece.uvic.ca/~frodo/jasper/#download + # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79"; + sha256 = "0nsiblsfpfa0dahsk6hw9cd18fp9c8sk1z5hdp19m33c0bf92ip9"; }; # newer reconf to recognize a multiout flag diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix deleted file mode 100644 index 9453aa0635c7..000000000000 --- a/pkgs/development/libraries/java/shared-objects/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, jdk}: - -stdenv.mkDerivation { - name = "shared-objects-1.4"; - src = fetchurl { - url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz; - md5 = "c1f2c58bd1a07be32da8a6b89354a11f"; - }; - buildInputs = [stdenv jdk]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index a332487d4edf..84638bc01ea6 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-4.1.1"; + name = "jemalloc-${version}"; + version = "4.3.1"; src = fetchurl { - url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8"; + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; meta = with stdenv.lib; { - homepage = http://www.canonware.com/jemalloc/index.html; + homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; longDescription = '' malloc(3)-compatible memory allocator that emphasizes fragmentation diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 4b214c37a698..397d59f8b246 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -56,20 +56,15 @@ let } // (args.meta or {}); }); - kdeEnv = import ./kde-env.nix { - inherit (pkgs) stdenv lib; - inherit (pkgs.xorg) lndir; - }; - kdeWrapper = import ./kde-wrapper.nix { inherit (pkgs) stdenv lib makeWrapper; - inherit kdeEnv; }; attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; + # FIXME: this collides with the "ecm" package. ecm = let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: makeSetupHook diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix deleted file mode 100644 index 5ddf89a0129f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, lndir }: - -drv: pkgs: - -stdenv.mkDerivation { - name = "kde-env-${drv.name}"; - nativeBuildInputs = [ lndir ]; - envPkgs = builtins.map lib.getBin ([drv] ++ pkgs); - unpackPhase = "true"; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "true"; - installPhase = '' - runHook preInstall - - propagated="" - for i in $envPkgs; do - findInputs $i propagated propagated-user-env-packages - done - - for tgt in bin etc/xdg lib/libexec lib/qt5 share; do - mkdir -p "$out/$tgt" - for p in $propagated; do - if [ -d "$p/$tgt" ]; then - lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1 - fi - done - done - - runHook postInstall - ''; -} diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 153ca31fd625..3591e20d11fb 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -1,17 +1,14 @@ -{ stdenv, lib, makeWrapper, kdeEnv }: +{ stdenv, lib, makeWrapper }: drv: { targets, paths ? [] }: -let - env = kdeEnv drv paths; -in stdenv.mkDerivation { - inherit (drv) name; + inherit (drv) name meta; - drv = lib.getBin drv; - inherit env targets; + paths = builtins.map lib.getBin ([drv] ++ paths); + inherit drv targets; passthru = { unwrapped = drv; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,16 +18,36 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = '' + propagated= + for p in $drv $paths; do + findInputs $p propagated propagated-user-env-packages + done + + wrap_PATH="$out/bin" + wrap_XDG_DATA_DIRS= + wrap_XDG_CONFIG_DIRS= + wrap_QML_IMPORT_PATH= + wrap_QML2_IMPORT_PATH= + wrap_QT_PLUGIN_PATH= + for p in $propagated; do + addToSearchPath wrap_PATH "$p/bin" + addToSearchPath wrap_XDG_DATA_DIRS "$p/share" + addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg" + addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports" + addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml" + addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins" + done + for t in $targets; do if [ -a "$drv/$t" ]; then makeWrapper "$drv/$t" "$out/$t" \ --argv0 '"$0"' \ - --suffix PATH : "$out/bin:$env/bin" \ - --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ - --prefix XDG_DATA_DIRS : "$env/share" \ - --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ - --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ - --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" + --suffix PATH : "$wrap_PATH" \ + --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \ + --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \ + --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH" else echo "no such file or directory: $drv/$t" exit 1 diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c279d698e129..883625e551a7 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; + outputs = [ "out" "dev" ]; + patches = [ ./perl-5.22-compat.patch ]; postPatch = '' @@ -19,6 +21,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; + postInstall = '' + moveToOutput "bin/ldns-config" "$dev" + ''; + meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index c67b3701ec91..20531adcd1c7 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: stdenv.mkDerivation rec { - name = "libLAS-1.8.0"; + name = "libLAS-1.8.1"; src = fetchurl { url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; - md5 = "599881281d45db4ce9adb2d75458391e"; + sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; meta = { diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 229eca5e5972..fc27f3a2c6b5 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -7,15 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay -let baseName = "libaacs"; - version = "0.8.1"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libaacs-${version}"; + version = "0.8.1"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"; }; @@ -24,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index b2b007765820..3ee35e5bf576 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,11 +10,11 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; + sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 1f47e5f8dcd4..4531546f33fd 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -7,16 +7,12 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay - -let baseName = "libbdplus"; - version = "0.1.2"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "libbdplus-${version}"; + version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; @@ -25,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbdplus.html; + homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 729fc27a0d37..c5bf7fd7f982 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -18,12 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - baseName = "libbluray"; + name = "libbluray-${version}"; version = "0.9.2"; - name = "${baseName}-${version}"; src = fetchurl { - url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index cedc376972b6..5738245a0bd1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "053x1sj6r5pj5396g007v6l0s7942cy2mh5fd3caqx0jdw6h9xqv"; + sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; }; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 3b63ba98f572..68bd72f3e0f5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig - -, OpenGL +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +, libX11, pkgconfig, OpenGL }: stdenv.mkDerivation rec { - name ="libdevil-${version}"; + name = "libdevil-${version}"; version = "1.7.8"; src = fetchurl { @@ -14,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + outputs = [ "out" "dev" ]; + + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ./il_endian.h.patch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix new file mode 100644 index 000000000000..23ab36fe09f0 --- /dev/null +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libdivecomputer-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = [ maintainers.mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index f2174470becf..a0923a15d4ad 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: +{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.71"; + name = "libdrm-2.4.73"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8"; + sha256 = "0kayvwqqrjm45y6dk9q2b4gmjdasci0y28jzv4bq05py8a9d7gwn"; }; outputs = [ "out" "dev" ]; @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess ]; # libdrm as of 2.4.70 does not actually do anything with udev. - #++ stdenv.lib.optional stdenv.isLinux udev; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-freedreno" "--disable-valgrind" ] - ++ stdenv.lib.optional stdenv.isLinux "--enable-udev" ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; @@ -30,7 +28,6 @@ stdenv.mkDerivation rec { homepage = http://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 364ff28f9a62..17aeb1d4377f 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, openssl, findutils }: +{ stdenv, fetchurl, openssl, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -12,7 +12,6 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 2158f26f2859..61fb8f2ffd86 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "1lyxlras357p17vbwfhwny69izjx74xncaxpyk1n4d2jbsvjspfr"; + url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; + sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a3b011629141..f0257ed8a44b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -17,11 +17,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0708259k2qpdyi8z8n74d2pprjdvivmqkskjkq7s7ypchn9mb5js"; + sha256 = "d4f63933b0967bd691735af5e3919e2d29c2121d4e05867cc4e10ff3ae8e2dd8"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 85e32cc1af1f..8885092d0e7d 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "1zdx56k847c80ds5yf40hh0a26lkqrc0v11r589dqlm6xvzg0614"; + sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; }; buildInputs = [ attr zlib ]; propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix new file mode 100644 index 000000000000..e5406d3a2a58 --- /dev/null +++ b/pkgs/development/libraries/libktorrent/5.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, ecm +, karchive, kcrash, ki18n, kio, solid +, boost, gmp, qca-qt5, libgcrypt +}: + +stdenv.mkDerivation rec { + name = "libktorrent-2.0.1"; + + src = fetchurl { + url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz; + sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ecm ]; + buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; + + propagatedBuildInputs = [ gmp boost ]; + + enableParallelBuilding = true; + + meta = { + description = "A BitTorrent library used by KTorrent"; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index db07775d45ed..9e7fb0a0b3d5 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A BiTtorrent library used by KTorrent"; + description = "A BitTorrent library used by KTorrent"; homepage = http://ktorrent.pwsp.net; inherit (kdelibs.meta) platforms; }; diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix new file mode 100644 index 000000000000..1d6c54134393 --- /dev/null +++ b/pkgs/development/libraries/libmarble-ssrf/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }: + +stdenv.mkDerivation rec { + name = "libmarble-ssrf-${version}"; + version = "2016-11-09"; + + src = fetchgit { + sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; + url = "git://git.subsurface-divelog.org/marble"; + rev = "4325da93b7516abb6f93a1417adc10593dacd794"; + }; + + buildInputs = [ qtbase qtscript qtquick1 ]; + nativeBuildInputs = [ doxygen pkgconfig cmake ]; + + enableParallelBuilding = true; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \ + -DQTONLY=TRUE -DQT5BUILD=ON \ + -DBUILD_MARBLE_TESTS=NO \ + -DWITH_DESIGNER_PLUGIN=NO \ + -DBUILD_MARBLE_APPS=NO" + ''; + + meta = with stdenv.lib; { + description = "Qt library for a slippy map with patches from the Subsurface project"; + homepage = "http://subsurface-divelog.org"; + license = licenses.lgpl21; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index ea6e1e50035d..a20bc7e5f3c5 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.23"; - sha256 = "1wb2j8sba6g2h4vmv4pwsp93q74qw4gyqqs4b7vfjmpcv9xix4kd"; + version = "1.6.26"; + sha256 = "1ybkgcqqsd4iiiyv60pxjfi1csszb50bd2cxxsy3sv4q4sil6rr6"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "1lvsn1kmarzpn269zgykjfmxq16zrdhpd1a75nzgclx97436x408"; + sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 4c9733c6a5e5..97929d29b377 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +, dbus, networkmanager, spidermonkey_1_8_5 }: stdenv.mkDerivation rec { - name = "libproxy-0.4.11"; - src = fetchurl { - url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; - sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; + name = "libproxy-${version}"; + version = "0.4.13"; + + src = fetchFromGitHub { + owner = "libproxy"; + repo = "libproxy"; + rev = version; + sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; - propagatedBuildInputs = [ zlib ] - # now some optional deps, but many more are possible - ++ [ glib ]; - meta = { - platforms = stdenv.lib.platforms.linux; + buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.lgpl21; + homepage = "http://libproxy.github.io/libproxy/"; + description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e4cb2e61eeb0..be77b383cd92 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -11,14 +11,14 @@ let owner = "publicsuffix"; }; - libVersion = "0.14.0"; + libVersion = "0.15.0"; in stdenv.mkDerivation rec { name = "libpsl-${version}"; version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { - sha256 = "1nqawm41rxaxddrqnwhxw1cgcpf74q6jw756sh0x8zbsjc73mbfq"; + sha256 = "1n8vg8pslpgin84ygb0s0nqfljml32l5bv5fyc8ysnpbdsj6gxkb"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 394e6c2c170f..49fddd06c171 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.6"; - debversion = "3"; + version = "4.0.7"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; + sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -20,54 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ - (fetchurl { - url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; - sha256 = "0qiiqpbbsf01b59x01z38cg14pmg1ggcsqm9n1gsld6rr5wm3ryz"; - }) - (fetchurl { - url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; - sha256 = "1ph057w302i2s94rhdw6ksyvpsmg1nlanvc0251x01s23gkdbakv"; - }) - (fetchurl { - url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; - sha256 = "1nhjg2gdvyzi4wa2g7nwmzm7nssz9dpdfkwms1rp8i1034qdlgc6"; - }) - (fetchurl { - url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; - sha256 = "0n47yk9wcvc9j72yvm5bhpaqq0yfz8jnq9zxbnzx5id9gdxmrkn3"; - }) - (fetchurl { - url = "${p}/05-CVE-2016-6223.patch"; - sha256 = "0r80hil9k6scdjppgyljhm0s2z6c8cm259f0ic0xvxidfaim6g2r"; - }) - (fetchurl { - url = "${p}/06-CVE-2016-5321.patch"; - sha256 = "1aacymlqv6cam8i4nbma9v05r3v3xjpagns7q0ii268h0mhzq6qg"; - }) - (fetchurl { - url = "${p}/07-CVE-2016-5323.patch"; - sha256 = "1xr5hy2fxa71j3fcc1l998pxyblv207ygzyhibwb1lia5zjgblch"; - }) - (fetchurl { - url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; - sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; - }) - (fetchurl { - url = "${p}/09-CVE-2016-5652.patch"; - sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; - }) - (fetchurl { - url = "${p}/10-CVE-2016-3658.patch"; - sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; - }) - ]; - doCheck = true; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://www.remotesensing.org/libtiff/; + homepage = http://download.osgeo.org/libtiff; license = licenses.libtiff; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 8065df5c5b52..ae2492beba6b 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "i-rinat"; repo = "libvdpau-va-gl"; rev = "v${version}"; - sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k"; + sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; meta = with stdenv.lib; { - homepage = https://github.com/i-rinat/libvdpau-va-gl; + homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 0d7115144449..96e2ca872850 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = http://sourceforge.net/projects/libxls/; + homepage = "http://sourceforge.net/projects/libxls/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 4831f150f45b..80354b10f3b9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch -, supportPython ? (! stdenv ? cross) }: +, pythonSupport ? (! stdenv ? cross) }: let python = python2; @@ -28,10 +28,10 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "doc" ] - ++ lib.optional supportPython "py"; - propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; + ++ lib.optional pythonSupport "py"; + propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; - buildInputs = lib.optional supportPython python + buildInputs = lib.optional pythonSupport python # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib findXMLCatalogs ]; - configureFlags = lib.optional supportPython "--with-python=${python}" + configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; @@ -55,9 +55,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs libiconv ]; }; - preInstall = lib.optionalString supportPython + preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString supportPython + installFlags = lib.optionalString pythonSupport ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; postFixup = '' @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" ''; - passthru = { inherit version; pythonSupport = supportPython; }; + passthru = { inherit version; pythonSupport = pythonSupport; }; meta = { homepage = http://xmlsoft.org/; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index e9b08609f23c..646fdfbac4f3 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libxml++-${maj_ver}.${min_ver}"; maj_ver = "3.0"; - min_ver = "0"; + min_ver = "1"; src = fetchurl { url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; - sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg"; + sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 2afbfc2fe997..df0543194791 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }: +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs +, pythonSupport ? true, python2 +}: + +assert pythonSupport -> python2 != null; +assert pythonSupport -> libxml2.pythonSupport; stdenv.mkDerivation rec { name = "libxslt-1.1.29"; @@ -10,26 +15,33 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; - buildInputs = [ libxml2 ]; + buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; propagatedBuildInputs = [ findXMLCatalogs ]; configureFlags = [ - "--without-python" "--without-crypto" "--without-debug" "--without-mem-debug" "--without-debugger" - ]; + ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" + '' + stdenv.lib.optionalString pythonSupport '' + mkdir -p $py/nix-support + echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs + moveToOutput lib/python2.7 "$py" ''; + passthru = { + inherit pythonSupport; + }; + meta = with stdenv.lib; { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1df9cf0492dc..e5845fee3041 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -24,7 +24,31 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - scons configure PREFIX="$out" + scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \ + BOOST_LIBS="${boost.out}/lib" \ + CAIRO_INCLUDES="${cairo.dev}/include" \ + CAIRO_LIBS="${cairo.out}/lib" \ + FREETYPE_INCLUDES="${freetype.dev}/include" \ + FREETYPE_LIBS="${freetype.out}/lib" \ + GDAL_CONFIG="${gdal}/bin/gdal-config" \ + HB_INCLUDES="${harfbuzz.dev}/include" \ + HB_LIBS="${harfbuzz.out}/lib" \ + ICU_INCLUDES="${icu.dev}/include" \ + ICU_LIBS="${icu.out}/lib" \ + JPEG_INCLUDES="${libjpeg.dev}/include" \ + JPEG_LIBS="${libjpeg.out}/lib" \ + PNG_INCLUDES="${libpng.dev}/include" \ + PNG_LIBS="${libpng.out}/lib" \ + PROJ_INCLUDES="${proj}/include" \ + PROJ_LIBS="${proj}/lib" \ + SQLITE_INCLUDES="${sqlite.dev}/include" \ + SQLITE_LIBS="${sqlite.out}/lib" \ + TIFF_INCLUDES="${libtiff.dev}/include" \ + TIFF_LIBS="${libtiff.out}/lib" \ + WEBP_INCLUDES="${libwebp}/include" \ + WEBP_LIBS="${libwebp}/lib" \ + XML2_INCLUDES="${libxml2.dev}/include" \ + XML2_LIBS="${libxml2.out}/lib" ''; buildPhase = false; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index b6d187e7a0ed..9b2fd805c319 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, libfm-extra }: -let name = "menu-cache-1.0.1"; +let name = "menu-cache-1.0.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa"; + sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5ff884fd3c1d..2b31405980b0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, systemd, openssl +, file, expat, libdrm, xorg, wayland, openssl , llvmPackages, libffi, libomxil-bellagio, libva , libelf, libvdpau, python2 , grsecEnabled ? false @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "12.0.3"; + version = "13.0.1"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; + sha256 = "0cd7axwihwsay0i9fvcw14cldbxyvf8b8rd5sh53plvppyr2z5ki"; }; prePatch = "patchShebangs ."; @@ -51,11 +51,7 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ] ++ optional stdenv.isLinux - (substituteAll { - src = ./dlopen-absolute-paths.diff; - libudev = systemd.lib; - }); + ]; postPatch = '' substituteInPlace src/egl/main/egldriver.c \ @@ -116,7 +112,7 @@ stdenv.mkDerivation { libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ (python2.withPackages (ps: [ ps.Mako ])) - ] ++ optional stdenv.isLinux systemd; + ]; enableParallelBuilding = true; @@ -136,12 +132,17 @@ stdenv.mkDerivation { $out/lib/vdpau \ $out/lib/bellagio \ $out/lib/libxatracker* \ - $out/lib/libvulkan_* \ + $out/lib/libvulkan_* # move share/vulkan/icd.d/ mv $out/share/ $drivers/ + # Update search path used by Vulkan (it's pointing to $out but + # drivers are in $drivers) + for js in $drivers/share/vulkan/icd.d/*.json; do + substituteInPlace "$js" --replace "$out" "$drivers" + done - mv $out/lib/dri/* $drivers/lib/dri + mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" # move libOSMesa to $osmesa, as it's relatively big diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff deleted file mode 100644 index 9a5226572239..000000000000 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/loader.c b/loader.c -index 4fdf3c2..69ea22d 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -112,7 +112,7 @@ static void *udev_handle = NULL; - static void * - udev_dlopen_handle(void) - { -- char name[80]; -+ char name[256]; - unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY; - int version; - -@@ -126,7 +126,7 @@ udev_dlopen_handle(void) - /* First try opening an already linked libudev, then try loading one */ - do { - for (version = 1; version >= 0; version--) { -- snprintf(name, sizeof(name), "libudev.so.%d", version); -+ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version); - udev_handle = dlopen(name, flags); - if (udev_handle) - return udev_handle; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 53b2b6358649..35f675a305af 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf hdf5 curl gfortran ]; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = "http://www.unidata.ucar.edu/software/netcdf/"; - license = stdenv.lib.licenses.free; - maintainers = stdenv.lib.maintainers.bzizou; - platforms = stdenv.lib.platforms.unix; + homepage = http://www.unidata.ucar.edu/software/netcdf/; + license = licenses.free; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 632cc418425c..9e4be3bf282e 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -1,8 +1,7 @@ -diff --git a/nss/cmd/shlibsign/shlibsign.c b/nss/cmd/shlibsign/shlibsign.c -index 63a4836..a128c1d 100644 ---- a/nss/cmd/shlibsign/shlibsign.c -+++ b/nss/cmd/shlibsign/shlibsign.c -@@ -862,6 +862,8 @@ int main(int argc, char **argv) +diff -ru -x '*~' nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.27.1/nss/cmd/shlibsign/shlibsign.c +--- nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/cmd/shlibsign/shlibsign.c 2016-11-15 16:28:07.308117900 +0100 +@@ -871,6 +871,8 @@ libname = PR_GetLibraryName(NULL, "softokn3"); assert(libname != NULL); lib = PR_LoadLibrary(libname); @@ -11,22 +10,20 @@ index 63a4836..a128c1d 100644 assert(lib != NULL); PR_FreeLibraryName(libname); -diff --git a/nss/coreconf/config.mk b/nss/coreconf/config.mk -index 61d757b..b58a98b 100644 ---- a/nss/coreconf/config.mk -+++ b/nss/coreconf/config.mk -@@ -205,3 +205,6 @@ $(error Setting NSS_ENABLE_TLS_1_3 and NSS_DISABLE_ECC isn't a good idea.) - endif - DEFINES += -DNSS_ENABLE_TLS_1_3 +diff -ru -x '*~' nss-3.27.1-orig/nss/coreconf/config.mk nss-3.27.1/nss/coreconf/config.mk +--- nss-3.27.1-orig/nss/coreconf/config.mk 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/coreconf/config.mk 2016-11-15 16:28:07.308117900 +0100 +@@ -217,3 +217,6 @@ + ifdef NSS_NO_PKCS11_BYPASS + DEFINES += -DNO_PKCS11_BYPASS endif + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" -diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c -index 5c5d2ca..026e528 100644 ---- a/nss/lib/pk11wrap/pk11load.c -+++ b/nss/lib/pk11wrap/pk11load.c -@@ -429,6 +429,13 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) { +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c nss-3.27.1/nss/lib/pk11wrap/pk11load.c +--- nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/pk11wrap/pk11load.c 2016-11-15 16:28:07.308117900 +0100 +@@ -429,6 +429,13 @@ * unload the library if anything goes wrong from here on out... */ library = PR_LoadLibrary(mod->dllName); @@ -40,11 +37,10 @@ index 5c5d2ca..026e528 100644 mod->library = (void *)library; if (library == NULL) { -diff --git a/nss/lib/util/secload.c b/nss/lib/util/secload.c -index eb8a9ec..f94f67d 100644 ---- a/nss/lib/util/secload.c -+++ b/nss/lib/util/secload.c -@@ -69,9 +69,14 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c +--- nss-3.27.1-orig/nss/lib/util/secload.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/util/secload.c 2016-11-15 16:29:50.482259746 +0100 +@@ -70,9 +70,14 @@ /* Remove the trailing filename from referencePath and add the new one */ c = strrchr(referencePath, PR_GetDirectorySeparator()); @@ -55,12 +51,12 @@ index eb8a9ec..f94f67d 100644 + } if (c) { size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1); +- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); + fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); if (fullName) { memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -81,6 +86,11 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + strcpy(fullName + referencePathSize, name); +@@ -82,6 +87,11 @@ #endif libSpec.type = PR_LibSpec_Pathname; libSpec.value.pathname = fullName; @@ -71,9 +67,9 @@ index eb8a9ec..f94f67d 100644 + strcpy(fullName + referencePathSize, name); dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL #ifdef PR_LD_ALT_SEARCH_PATH - /* allow library's dependencies to be found in the same directory -@@ -88,6 +98,10 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) - | PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -89,6 +99,10 @@ + | PR_LD_ALT_SEARCH_PATH #endif ); + if (! dlh) { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 841795383805..ff8b0fec0a12 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.26"; + version = "3.27.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz"; - sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i"; + url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz"; + sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index aa2a1660d6fa..0c69e21c8dc4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ] - ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; + ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7f4b5ba2e328..f412346456c6 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -2,7 +2,9 @@ , perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-2.10.3"; + name = "opendkim-${version}"; + version = "2.10.3"; + src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://www.opendkim.org/; + homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 6850c13b44e9..b99498f2013e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index ab1943b85909..ff67ff8a1bbf 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey +{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412 , useSystemd ? stdenv.isLinux, systemd }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin buildInputs = - [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] + [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix index a06d4cef968a..26b829669b8e 100644 --- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix +++ b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0-beta-2"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; } diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index 16a39daf7907..f80acf462b85 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; } diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix new file mode 100644 index 000000000000..91ef87512c84 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.1.0"; + sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; +} diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix new file mode 100644 index 000000000000..5a3738564d7a --- /dev/null +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook, zlib, gmock +, version, sha256 +, ... +}: + +stdenv.mkDerivation rec { + name = "protobuf-${version}"; + + # make sure you test also -A pythonPackages.protobuf + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; + + postPatch = '' + rm -rf gmock + cp -r ${gmock.source} gmock + chmod -R a+w gmock + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + buildInputs = [ autoreconfHook zlib ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "Google's data interchange format"; + longDescription = + ''Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 8f886421d55b..5aa1d0350fc7 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://qpdf.sourceforge.net/; + homepage = "http://qpdf.sourceforge.net/"; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 0e40a7ac96d2..8b4e924a7339 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -106,7 +106,7 @@ let qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebsockets qtx11extras qtxmlpatterns + qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh index b5b76d3e6740..3aa539cda033 100644 --- a/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh @@ -1,3 +1,3 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.1/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/ \ + http://download.qt.io/community_releases/5.6/5.6.2/ \ -A '*.tar.xz' ) 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 bb245548d5b9..cb63f0b50f53 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation { -widgets -opengl desktop -qml-debug - -nis -iconv -icu -pch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index dba3611683e3..e5d7d0d4372c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -30,7 +30,12 @@ qtSubmodule { --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo - + + # hardcode paths for which default path resolution does not work in nix + sed -i -e 's,\(static QString potentialResourcesPath =\).*,\1 QLatin1String("'$out'/resources");,' src/core/web_engine_library_info.cpp + sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp + sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix index c6deca1150dc..3f6c3ae66997 100644 --- a/pkgs/development/libraries/qt-5/5.6/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix @@ -1,269 +1,261 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { - qtwebkit = { - version = "5.6.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz"; - sha256 = "1akjqvjavl0vn8a8hnmvqc26mf4ljvwjdm07x6dmmdnjzajvzkzm"; - name = "qtwebkit-opensource-src-5.6.1.tar.xz"; - }; - }; qt3d = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qt3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1nxpcjsarcp40m4y18kyy9a5md56wnafll03j8c6q19rba9bcwbf"; - name = "qt3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz"; + sha256 = "0hg91j3brsbh75why6j0527z5myk1r9s7q9z45q6qp0gdvdqc5x2"; + name = "qt3d-opensource-src-5.6.2.tar.xz"; }; }; qtactiveqt = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtactiveqt-opensource-src-5.6.1-1.tar.xz"; - sha256 = "00bj9c0x3ax34gpibaap3wpchkv4wapsydiz01fb0xzs1fy94nbf"; - name = "qtactiveqt-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtactiveqt-opensource-src-5.6.2.tar.xz"; + sha256 = "1a3mai3d0l2a8gyjkjng1r7y9y27yppxc5rdzxsgc4kq58rflghw"; + name = "qtactiveqt-opensource-src-5.6.2.tar.xz"; }; }; qtandroidextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtandroidextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0xhm4053y9hqnz5y3y4rwycniq0mb1al1rds3jx636211y039xhk"; - name = "qtandroidextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtandroidextras-opensource-src-5.6.2.tar.xz"; + sha256 = "164mkmzswqwjzhs9cwdq361yb60bx6is37740jglrjxgss1phmhr"; + name = "qtandroidextras-opensource-src-5.6.2.tar.xz"; }; }; qtbase = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij"; - name = "qtbase-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz"; + sha256 = "11z73qgzbyj1cwjdkng94cz46wam8frsw0bs705gx0nrqn9swvig"; + name = "qtbase-opensource-src-5.6.2.tar.xz"; }; }; qtcanvas3d = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "13127xws6xfkkk1x617bgdzl96l66nd0v82dibdnxnpfa702rl44"; - name = "qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz"; + sha256 = "1bd01ag2p1445ffckyyi3sxi4vssflp95kmbrj99dy83dc04sn6p"; + name = "qtcanvas3d-opensource-src-5.6.2.tar.xz"; }; }; qtconnectivity = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtconnectivity-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi"; - name = "qtconnectivity-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz"; + sha256 = "1ygdmd7fh2fhhyv58zxl1lglr85iajs9gv6c0pv64gbhw0ijjrqv"; + name = "qtconnectivity-opensource-src-5.6.2.tar.xz"; }; }; qtdeclarative = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-opensource-src-5.6.1-1.tar.xz"; - sha256 = "094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw"; - name = "qtdeclarative-opensource-src-5.6.1-1.tar.xz"; - }; - }; - qtdeclarative-render2d = { - version = "5.6.1-1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kqmb3792rg9fx12m64x87ahcrh0g9krg77mv0ssx3g4gvsgcibc"; - name = "qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz"; + sha256 = "1nh989jp2gdp5bxa62n3g1whs2pzrl44sh4ca6x9icrnpj3ak1h0"; + name = "qtdeclarative-opensource-src-5.6.2.tar.xz"; }; }; qtdoc = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdoc-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1yf3g3h72ndrp88h8g21mzgqdz2ixwkvpav03i3jnrgy2pf7nssp"; - name = "qtdoc-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtdoc-opensource-src-5.6.2.tar.xz"; + sha256 = "0s78c5bpj4lcx63x2y5a6scxv6sszvs4dlj4qy86jkwmm7m1wsgn"; + name = "qtdoc-opensource-src-5.6.2.tar.xz"; }; }; qtenginio = { - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtenginio-opensource-src-1.6.1.tar.xz"; - sha256 = "17hsrhzy9zdvpbzja45aac6jr7jzzjl206vma96b9w73rbgxa50f"; - name = "qtenginio-opensource-src-1.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz"; + sha256 = "1hywpl1x9lbpqqjdw5wwwhx0gg0j7y260iqaz47anxaa466w7zwh"; + name = "qtenginio-opensource-src-1.6.2.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b"; - name = "qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz"; + sha256 = "0pp71gqfgbl5ra15jp8kr4p3sl9gs7cv4x6vjv9i5a3j5jn0z7qy"; + name = "qtgraphicaleffects-opensource-src-5.6.2.tar.xz"; }; }; qtimageformats = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc"; - name = "qtimageformats-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz"; + sha256 = "1r27s5dy9c016ia5xgpbs7nfvmmrnd051dmsrv5r7hyscaz57cag"; + name = "qtimageformats-opensource-src-5.6.2.tar.xz"; }; }; qtlocation = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtlocation-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69"; - name = "qtlocation-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz"; + sha256 = "0fnj51f6fll1z1xsfp3g73al70hsg993gh1k7aa0y8nhdqh9b2bs"; + name = "qtlocation-opensource-src-5.6.2.tar.xz"; }; }; qtmacextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmacextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "07j26d5g7av4c6alggg5hssqpvdh555zmn1cpr8xrhx1hpbdnaas"; - name = "qtmacextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtmacextras-opensource-src-5.6.2.tar.xz"; + sha256 = "05chq7dqgvlfzpqf1y9inxp0kx6hfzwbc5kswpp6gsnsyfln6ll5"; + name = "qtmacextras-opensource-src-5.6.2.tar.xz"; }; }; qtmultimedia = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmultimedia-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f"; - name = "qtmultimedia-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz"; + sha256 = "1bwcpc1s6yjvgpqbn22k4mdfjy9lhs89bbzwlgj5psy0qskp16nb"; + name = "qtmultimedia-opensource-src-5.6.2.tar.xz"; }; }; - qtquickcontrols2 = { - version = "5.6.1-1"; + qtquickcontrols = { + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols2-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0wfa2xcqsvx3zihd5nb9f9qhq0xn14c03sw1qdymzfsryqwmk4ac"; - name = "qtquickcontrols2-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz"; + sha256 = "0b0h8svlzvq23kcmam7ng697bzcq4x3haymmn7gj40p15clz5l2y"; + name = "qtquickcontrols-opensource-src-5.6.2.tar.xz"; }; }; - qtquickcontrols = { - version = "5.6.1-1"; + qtquickcontrols2 = { + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0cjzf844r7wi32ssc9vbw1a2m9hnr8c0i1p7yyljy962ifplf401"; - name = "qtquickcontrols-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz"; + sha256 = "1hgydll95by0rvfpv3sprxq0hkdrpacynaaq2jzaw0a7m881gp09"; + name = "qtquickcontrols2-opensource-src-5.6.2.tar.xz"; }; }; qtscript = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtscript-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx"; - name = "qtscript-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz"; + sha256 = "03hi2j64l0mgs8p0w1jaz53zsa4lfpbgskydaxxiiqnaf6rgcvp0"; + name = "qtscript-opensource-src-5.6.2.tar.xz"; }; }; qtsensors = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsensors-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r"; - name = "qtsensors-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz"; + sha256 = "09rl0njijl3cgh6l3pfij2rhnsg10axkl37llkbz1wmlma0r1057"; + name = "qtsensors-opensource-src-5.6.2.tar.xz"; }; }; qtserialbus = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialbus-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0li4g70s5vfb517ag0d6405ymsknvvny1c8x66w7qs8a8mnk1jq5"; - name = "qtserialbus-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz"; + sha256 = "09pqr9f6kl3wq4858vksbzxnrrnqxblivmayjf126lwi2q4n14mk"; + name = "qtserialbus-opensource-src-5.6.2.tar.xz"; }; }; qtserialport = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialport-opensource-src-5.6.1-1.tar.xz"; - sha256 = "135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52"; - name = "qtserialport-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz"; + sha256 = "0xpkjkn6w0g3p7hmm12b2c96f7q98rmk2dcn321x4arcmldjhxmg"; + name = "qtserialport-opensource-src-5.6.2.tar.xz"; }; }; qtsvg = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsvg-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw"; - name = "qtsvg-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz"; + sha256 = "0kmwr3fphs7ddgxmqzy53f8p2hbp1gfmjdaig5vswc8vcszn38zp"; + name = "qtsvg-opensource-src-5.6.2.tar.xz"; }; }; qttools = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttools-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip"; - name = "qttools-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz"; + sha256 = "1dz1i5wwhgb9li095mnmc33mwpbd8nf7sdrc2x3pl9c6hwqv8ayv"; + name = "qttools-opensource-src-5.6.2.tar.xz"; }; }; qttranslations = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttranslations-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03sdzci4pgq6lmxwn25v8x0z5x8g7zgpq2as56dqgj7vp6cvhn8m"; - name = "qttranslations-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qttranslations-opensource-src-5.6.2.tar.xz"; + sha256 = "08d4xyk7njkdbd3m48dzmvdm8ma3s4x8h4jm1ip20wqngi23nybx"; + name = "qttranslations-opensource-src-5.6.2.tar.xz"; }; }; qtwayland = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwayland-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4"; - name = "qtwayland-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz"; + sha256 = "11kciqnqfyzjfnx1m666g35v98jdazsg083h9fv2g5kiyjck2p03"; + name = "qtwayland-opensource-src-5.6.2.tar.xz"; }; }; qtwebchannel = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz"; - sha256 = "10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7"; - name = "qtwebchannel-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz"; + sha256 = "0lhskzqcijz9x6h8p80ff5dd6ni7zqm23nzljdqbggaibzpzs3kh"; + name = "qtwebchannel-opensource-src-5.6.2.tar.xz"; }; }; qtwebengine = { - version = "5.6.1-1"; + version = "5.6.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebengine-opensource-src-5.6.2.tar.xz"; + sha256 = "0h4pyc7r2fx8qsiw3663jd1hg1fid5yv7wil06njpcm8w541c2ig"; + name = "qtwebengine-opensource-src-5.6.2.tar.xz"; + }; + }; + qtwebkit = { + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0k708a34zwkj6hwx3vv5kdvnv3lfgb0iad44zaim5gdpgcir03n8"; - name = "qtwebengine-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/community_releases/5.6/5.6.2/qtwebkit-opensource-src-5.6.2.tar.xz"; + sha256 = "0rirszy092pmdvy4vzqkk4p9wwxv8qx4zkp84rxkd5ah3j5np2jj"; + name = "qtwebkit-opensource-src-5.6.2.tar.xz"; }; }; qtwebsockets = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebsockets-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil"; - name = "qtwebsockets-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz"; + sha256 = "0ddsnnp3sn423ryqqa1060cqlbdcp7ncj3zhabifaswfzyxx9n9w"; + name = "qtwebsockets-opensource-src-5.6.2.tar.xz"; }; }; qtwebview = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebview-opensource-src-5.6.1-1.tar.xz"; - sha256 = "19954snfw073flxn0qk5ayxyzk5x6hwhpg4kn4nrl1zygsw3y49l"; - name = "qtwebview-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwebview-opensource-src-5.6.2.tar.xz"; + sha256 = "1mjix4w71x1w86ykcdhsl7gg7xv9dn2pw6yiaxrp6pxvvk73cyjs"; + name = "qtwebview-opensource-src-5.6.2.tar.xz"; }; }; qtwinextras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwinextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03zkwqrix2nfqkwfn8lsrpgahzx1hv6p1qbvhkqymzakkzjjncgg"; - name = "qtwinextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtwinextras-opensource-src-5.6.2.tar.xz"; + sha256 = "1s375b1bf8cqs73mg8chwvj0npr01hpyrwv75srqnxkp61avi1gr"; + name = "qtwinextras-opensource-src-5.6.2.tar.xz"; }; }; qtx11extras = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtx11extras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y"; - name = "qtx11extras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz"; + sha256 = "1v8cnhas3rynqz7b8wryry2qhblrnmnd3v39gdki1hzfz8fdxzvi"; + name = "qtx11extras-opensource-src-5.6.2.tar.xz"; }; }; qtxmlpatterns = { - version = "5.6.1-1"; + version = "5.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1"; - name = "qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz"; + sha256 = "1k428wj8iffm6rrbvwbw0hksr99xqsxww8iahbk8r38qpzpg6vbw"; + name = "qtxmlpatterns-opensource-src-5.6.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix new file mode 100644 index 000000000000..0820897b81db --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, requireFile +, cudatoolkit +, fetchurl +}: + +stdenv.mkDerivation rec { + version = "5.1"; + cudatoolkit_version = "8.0"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = fetchurl { + url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz"; + sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8"; + }; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = with stdenv.lib; { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9ea3a54f2b0b..5e16fcb1b547 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.6"; name = "ipopt-${version}"; + version = "3.12.6"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = https://projects.coin-or.org/Ipopt; + homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 3893875a2347..e0e8c2686296 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -11,11 +11,12 @@ let blas64_ = blas64; in let local = config.openblas.preferLocalBuild or false; binary = { i686-linux = "32"; + armv7l-linux = "32"; x86_64-linux = "64"; x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = - [ "DYNAMIC_ARCH=1" + [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}" "NUM_THREADS=64" ]; localFlags = config.openblas.flags or @@ -65,7 +66,9 @@ stdenv.mkDerivation { "BINARY=${binary}" "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" "INTERFACE64=${if blas64 then "1" else "0"}" - ]; + ] + ++ + optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"]; doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index a55173a62b3c..c4db48248f33 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }: +{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }: stdenv.mkDerivation rec { name = "slang-2.3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e "s|-ltermcap|-lncurses|" ./configure ''; configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}"; - buildInputs = [ pcre libpng zlib readline ]; + buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; postInstall = '' diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index d6dd61db83c0..2beaa616f2d8 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.7.5"; name = "Vc-${version}"; + version = "0.7.5"; src = fetchFromGitHub { owner = "VcDevel"; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index aff0795daec0..c37ff7331118 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "1.2.0"; name = "Vc-${version}"; + version = "1.3.0"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "0qlfvcxv3nmf5drz5bc9kynaljr513pbn7snwgvghm150skmkpfl"; + sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 59fadbbbc1f8..9e85ad7413d0 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vcg.isti.cnr.it/vcglib/install.html; + homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix deleted file mode 100644 index 7187f9b575fd..000000000000 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib -, python ? null, sphinx ? null, php ? null, ruby ? null }: - -assert (python != null) -> (sphinx != null); - -let inherit (composableDerivation) wwf; in - -composableDerivation.composableDerivation {} rec { - - name = "xapian-bindings-${version}"; - version = (builtins.parseDrvName xapian.name).version; - - src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz"; - sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s"; - }; - - buildInputs = [ xapian pkgconfig zlib ]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = - wwf { - name = "python"; - enable = { - buildInputs = [ python sphinx ]; - - # Our `sphinx-build` binary is a shell wrapper around - # `sphinx-build` python code. Makefile tries to execute it - # using python2 and fails. Fixing that here. - patchPhase = '' - for a in python/Makefile* ; do - substituteInPlace $a \ - --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)' - done - ''; - - # export same env vars as in pythonNew - preConfigure = '' - export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - // wwf { - name = "php"; - enable = { - buildInputs = [ php ]; - preConfigure = '' - export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now - ''; - }; - } - // wwf { - name = "ruby"; - enable = { - buildInputs = [ ruby ]; - preConfigure = '' - export RUBY_LIB=$out/${ruby.libPath} - export RUBY_LIB_ARCH=$RUBY_LIB - mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - - # note: see configure --help to get see which env vars can be used - # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};} - # // wwf { name = "csharp"; } - # // wwf { name = "java"; } - ; - - cfg = { - pythonSupport = true; - phpSupport = false; - rubySupport = true; - }; - - meta = { - description = "Bindings for the Xapian library"; - homepage = xapian.meta.homepage; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 3a45447119ca..44f57cae7e11 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - version = "2.5.0"; name = "xlslib-${version}"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://sourceforge.net/projects/xlslib/; + homepage = "http://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 879e1ccaec3f..bb6af73356de 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 , intltool, libtool, python, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }: +, gtk3, json_glib, librdf_raptor2, python2Packages, dbus_glib }: stdenv.mkDerivation rec { version = "0.9.15"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib - gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ]; + gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 0e4de5f6bb71..e6c31441967e 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "os-homedir-1.0.2" = { @@ -868,13 +868,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.15.2" = { + "moment-2.16.0" = { name = "moment"; packageName = "moment"; - version = "2.15.2"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"; - sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"; + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; "ms-rest-1.15.2" = { @@ -1102,13 +1102,13 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "jws-3.1.3" = { + "jws-3.1.4" = { name = "jws"; packageName = "jws"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; - sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; }; }; "node-uuid-1.4.7" = { @@ -1138,184 +1138,31 @@ let sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; }; }; - "base64url-1.0.6" = { + "base64url-2.0.0" = { name = "base64url"; packageName = "base64url"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; - sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; + url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; + sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "jwa-1.1.3" = { + "jwa-1.1.4" = { name = "jwa"; packageName = "jwa"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; - sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; - }; - }; - "concat-stream-1.4.10" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - }; - "meow-2.0.0" = { - name = "meow"; - packageName = "meow"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "camelcase-keys-1.0.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - }; - "indent-string-1.2.2" = { - name = "indent-string"; - packageName = "indent-string"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; - sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; + sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1462,6 +1309,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1480,6 +1345,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1831,6 +1705,15 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1948,13 +1831,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.12" = { + "mime-types-2.1.13" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; - sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; + sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; }; }; "oauth-sign-0.8.2" = { @@ -2020,13 +1903,13 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "lodash-4.16.6" = { + "lodash-4.17.2" = { name = "lodash"; packageName = "lodash"; - version = "4.16.6"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz"; - sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; + sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; }; }; "chalk-1.1.3" = { @@ -2353,13 +2236,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.24.0" = { + "mime-db-1.25.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; - sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; + sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; }; }; "punycode-1.4.1" = { @@ -2443,6 +2326,15 @@ let sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; }; }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2524,13 +2416,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "bower-1.7.9" = { + "bower-1.8.0" = { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2776,13 +2668,13 @@ let sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; "timed-out-2.0.0" = { @@ -2803,13 +2695,13 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "stream-shift-1.0.0" = { @@ -2866,6 +2758,24 @@ let sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; "normalize-package-data-2.3.5" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -3145,6 +3055,33 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -3199,22 +3136,22 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.2.0" = { + "debug-2.3.3" = { name = "debug"; packageName = "debug"; - version = "2.2.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "ms-0.7.1" = { + "ms-0.7.2" = { name = "ms"; packageName = "ms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; "rimraf-2.2.8" = { @@ -3505,13 +3442,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.4.1" = { + "stream-http-2.5.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz"; - sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; + sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; }; }; "subarg-1.0.0" = { @@ -3883,13 +3820,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.1" = { + "asn1.js-4.9.0" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; - sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; + sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; }; }; "ripemd160-1.0.1" = { @@ -3901,13 +3838,13 @@ let sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; }; }; - "sha.js-2.4.5" = { + "sha.js-2.4.8" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.5"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; - sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; + sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; "miller-rabin-4.0.0" = { @@ -4486,6 +4423,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -4594,13 +4540,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.0" = { + "mdns-js-0.5.1" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; - sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; + sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; }; }; "plist-2.0.1" = { @@ -4612,13 +4558,13 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "mdns-js-packet-0.2.0" = { - name = "mdns-js-packet"; - packageName = "mdns-js-packet"; - version = "0.2.0"; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; - sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; "semver-5.1.1" = { @@ -4738,13 +4684,13 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.4" = { + "magnet-uri-5.1.5" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz"; - sha1 = "225db1f8670a944db87a5fbe27e2d90350513403"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; + sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; "parse-torrent-file-4.0.0" = { @@ -5089,6 +5035,15 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -5728,13 +5683,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.16" = { + "big-integer-1.6.17" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.16"; + version = "1.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; - sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; + sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; "sax-0.3.5" = { @@ -6070,6 +6025,15 @@ let sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "on-headers-1.0.1" = { name = "on-headers"; packageName = "on-headers"; @@ -6097,6 +6061,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6277,13 +6250,13 @@ let sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -6340,22 +6313,22 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.0" = { + "http-errors-1.5.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"; - sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; + sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; }; }; - "setprototypeof-1.0.1" = { + "setprototypeof-1.0.2" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"; - sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; + sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; }; }; "media-typer-0.3.0" = { @@ -6736,6 +6709,15 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; "realize-package-specifier-3.0.3" = { name = "realize-package-specifier"; packageName = "realize-package-specifier"; @@ -7294,13 +7276,13 @@ let sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; - "request-2.78.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.78.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "uuid-2.0.3" = { @@ -7456,13 +7438,22 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; - "form-data-2.1.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "2.1.1"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + }; + }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"; - sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; "asynckit-0.4.0" = { @@ -7492,6 +7483,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -8135,13 +8135,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.8.1" = { + "verror-1.9.0" = { name = "verror"; packageName = "verror"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz"; - sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029"; + url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; + sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; }; }; "extsprintf-1.3.0" = { @@ -8234,13 +8234,13 @@ let sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "basic-auth-1.0.4" = { + "basic-auth-1.1.0" = { name = "basic-auth"; packageName = "basic-auth"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; "cors-2.8.1" = { @@ -8486,13 +8486,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "ltgt-2.1.2" = { + "ltgt-2.1.3" = { name = "ltgt"; packageName = "ltgt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz"; - sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; "pull-level-2.0.3" = { @@ -8738,13 +8738,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "got-6.6.1" = { + "got-6.6.3" = { name = "got"; packageName = "got"; - version = "6.6.1"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.6.1.tgz"; - sha1 = "542d7a0e34676060e561b1b90d103876eefabed2"; + url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; + sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; }; }; "lodash.debounce-4.0.8" = { @@ -8909,13 +8909,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.12.0" = { + "globals-9.14.0" = { name = "globals"; packageName = "globals"; - version = "9.12.0"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"; - sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d"; + url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; + sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; "ignore-3.2.0" = { @@ -8945,13 +8945,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.6.1" = { + "js-yaml-3.7.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "json-stable-stringify-1.0.1" = { @@ -8999,13 +8999,13 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; - "require-uncached-1.0.2" = { + "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"; - sha1 = "67dad3b733089e77030124678a459589faf6a7ec"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; "strip-bom-3.0.0" = { @@ -9323,13 +9323,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.8.2" = { + "ajv-4.9.0" = { name = "ajv"; packageName = "ajv"; - version = "4.8.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz"; - sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; + sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; }; }; "ajv-keywords-1.1.1" = { @@ -9890,13 +9890,13 @@ let sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; }; }; - "npmlog-4.0.0" = { + "npmlog-4.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz"; - sha1 = "e094503961c70c1774eb76692080e8d578a9f88f"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; + sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; }; }; "tar-pack-3.3.0" = { @@ -9917,13 +9917,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.6.0" = { + "gauge-2.7.1" = { name = "gauge"; packageName = "gauge"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; - sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; + sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; }; }; "set-blocking-2.0.0" = { @@ -10125,13 +10125,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.20" = { + "clean-css-3.4.21" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.20"; + version = "3.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; - sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; + sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; }; }; "commander-2.6.0" = { @@ -10305,6 +10305,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -10422,22 +10431,22 @@ let sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; }; }; - "orchestrator-0.3.7" = { + "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; - sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "pretty-hrtime-1.0.2" = { + "pretty-hrtime-1.0.3" = { name = "pretty-hrtime"; packageName = "pretty-hrtime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"; - sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8"; + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; "tildify-1.2.0" = { @@ -10476,13 +10485,13 @@ let sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "beeper-1.1.0" = { + "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"; - sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; "dateformat-1.0.12" = { @@ -11295,13 +11304,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "handlebars-4.0.5" = { + "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz"; + sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; "supports-color-3.1.2" = { @@ -11961,6 +11970,15 @@ let sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; }; }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; "connect-2.30.2" = { name = "connect"; packageName = "connect"; @@ -12105,13 +12123,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -12150,22 +12168,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -12204,22 +12222,13 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; - }; - }; - "base64-url-1.2.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; "rndm-1.2.0" = { @@ -12240,13 +12249,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -12789,6 +12798,15 @@ let sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; }; }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -13311,49 +13329,49 @@ let sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; }; }; - "node-red-node-feedparser-0.1.6" = { + "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz"; - sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz"; + sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.11" = { + "node-red-node-email-0.1.12" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.11"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz"; - sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; + sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; }; }; - "node-red-node-twitter-0.1.7" = { + "node-red-node-twitter-0.1.9" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.7"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; - sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; + sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; }; }; - "node-red-node-rbe-0.1.5" = { + "node-red-node-rbe-0.1.6" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz"; - sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; + sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.0" = { + "node-red-node-serialport-0.4.1" = { name = "node-red-node-serialport"; packageName = "node-red-node-serialport"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz"; - sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe"; + url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; + sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; }; }; "bcrypt-0.8.7" = { @@ -13509,13 +13527,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.7" = { + "moment-timezone-0.5.9" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz"; - sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; + sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; }; }; "retry-0.6.1" = { @@ -13527,13 +13545,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.1" = { + "cookies-0.6.2" = { name = "cookies"; packageName = "cookies"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz"; - sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; + sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; }; }; "i18next-client-1.10.3" = { @@ -13617,13 +13635,13 @@ let sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; }; }; - "websocket-stream-3.3.0" = { + "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.0"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz"; - sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; + sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; }; }; "leven-1.0.2" = { @@ -13896,13 +13914,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "uue-3.0.0" = { + "uue-3.1.0" = { name = "uue"; packageName = "uue"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz"; - sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; + sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; "utf7-1.0.2" = { @@ -13923,13 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.4" = { + "serialport-4.0.6" = { name = "serialport"; packageName = "serialport"; - version = "4.0.4"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.4.tgz"; - sha1 = "93e55ad75e0451fcdeabb939c08da01da138a74a"; + url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; + sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; }; }; "lie-3.1.0" = { @@ -14202,13 +14220,13 @@ let sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "buffer-crc32-0.2.5" = { + "buffer-crc32-0.2.6" = { name = "buffer-crc32"; packageName = "buffer-crc32"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"; + sha1 = "612b318074fc6c4c30504b297247a1f91641253b"; }; }; "fresh-0.1.0" = { @@ -14517,13 +14535,13 @@ let sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }; }; - "raw-socket-1.5.0" = { + "raw-socket-1.5.1" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"; - sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; + sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; "argparse-0.1.16" = { @@ -14607,6 +14625,15 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14616,6 +14643,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "npm-registry-client-7.3.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; + sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -14643,13 +14679,22 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.75.0" = { + "request-2.78.0" = { name = "request"; packageName = "request"; - version = "2.75.0"; + version = "2.78.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; - sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; + "sorted-union-stream-2.1.3" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; "unique-filename-1.1.0" = { @@ -14697,13 +14742,40 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "form-data-2.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.0.0"; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; - sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "stream-each-1.2.0" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; + sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + }; + }; + "stream-iterate-1.2.0" = { + name = "stream-iterate"; + packageName = "stream-iterate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; }; }; "unique-slug-2.0.0" = { @@ -14931,13 +15003,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.9" = { + "npm-3.10.10" = { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; "npmi-2.0.1" = { @@ -14985,6 +15057,24 @@ let sha1 = "27c90519196dc15015be02a34ea52986feab8877"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -15129,15 +15219,6 @@ let sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; }; }; - "bunyan-1.8.4" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz"; - sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73"; - }; - }; "connect-busboy-0.0.2" = { name = "connect-busboy"; packageName = "connect-busboy"; @@ -15147,13 +15228,14 @@ let sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; }; }; - "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"; + "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.1"; + src = fetchgit { + url = "https://github.com/wikimedia/content-type.git"; + rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; "diff-1.4.0" = { @@ -15174,22 +15256,22 @@ let sha1 = "26bc01f739707505c51456af7f59e3373369475d"; }; }; - "express-handlebars-2.0.1" = { + "express-handlebars-3.0.0" = { name = "express-handlebars"; packageName = "express-handlebars"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz"; - sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1"; + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.4.1" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "gelf-stream-0.2.4" = { @@ -15201,22 +15283,23 @@ let sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; }; }; - "html5-1.0.5" = { - name = "html5"; - packageName = "html5"; - version = "1.0.5"; + "mediawiki-title-0.5.6" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz"; - sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848"; + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; + sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; }; }; - "node-txstatsd-0.1.6" = { - name = "node-txstatsd"; - packageName = "node-txstatsd"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz"; - sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04"; + "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/arlolra/negotiator.git"; + rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { @@ -15225,8 +15308,8 @@ let version = "0.8.0"; src = fetchgit { url = "https://github.com/tstarling/pegjs.git"; - rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a"; - sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa"; + rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; + sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; }; "prfun-2.1.4" = { @@ -15238,6 +15321,15 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; + "service-runner-2.1.11" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + }; + }; "simplediff-0.1.1" = { name = "simplediff"; packageName = "simplediff"; @@ -15247,6 +15339,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -15256,13 +15357,103 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "dtrace-provider-0.7.1" = { + "busboy-0.2.13" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; + sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "gelfling-0.2.0" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; + sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; + }; + }; + "bunyan-1.8.5" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + }; + }; + "bunyan-syslog-udp-0.1.0" = { + name = "bunyan-syslog-udp"; + packageName = "bunyan-syslog-udp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; + }; + }; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + }; + }; + "hot-shots-4.3.1" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; + sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + }; + }; + "limitation-0.1.9" = { + name = "limitation"; + packageName = "limitation"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; + sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + }; + }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; + "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz"; - sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; }; }; "mv-2.1.1" = { @@ -15301,139 +15492,167 @@ let sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; - "busboy-0.2.13" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.13"; + "gelfling-0.3.1" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; - sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; + "kad-git+https://github.com/gwicke/kad.git#master" = { + name = "kad"; + packageName = "kad"; + version = "1.3.6"; + src = fetchgit { + url = "https://github.com/gwicke/kad.git"; + rev = "f35971036f43814043245da82b12d035b7bbfd16"; + sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; + }; + }; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; }; }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; }; }; - "handlebars-3.0.3" = { - name = "handlebars"; - packageName = "handlebars"; - version = "3.0.3"; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz"; - sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad"; + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; }; }; - "object.assign-1.1.1" = { - name = "object.assign"; - packageName = "object.assign"; - version = "1.1.1"; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz"; - sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c"; + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; - "uglify-js-2.3.6" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.3.6"; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; - sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; + "msgpack5-3.4.1" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; + sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; }; }; - "opts-1.2.2" = { - name = "opts"; - packageName = "opts"; - version = "1.2.2"; + "dom-storage-2.0.2" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz"; - sha1 = "81782b93014a1cd88d56c226643fd4282473853d"; + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; + sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; - "html5-entities-1.0.0" = { - name = "html5-entities"; - packageName = "html5-entities"; - version = "1.0.0"; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz"; - sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370"; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "jsdom-0.11.1" = { - name = "jsdom"; - packageName = "jsdom"; - version = "0.11.1"; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz"; - sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb"; + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; }; }; - "nwmatcher-1.3.9" = { - name = "nwmatcher"; - packageName = "nwmatcher"; - version = "1.3.9"; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; - sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "xmlhttprequest-1.8.0" = { - name = "xmlhttprequest"; - packageName = "xmlhttprequest"; - version = "1.8.0"; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz"; - sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; - "cssom-0.3.1" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.1"; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; - sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; - "cssstyle-0.2.37" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "0.2.37"; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; - sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "contextify-0.1.15" = { - name = "contextify"; - packageName = "contextify"; - version = "0.1.15"; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz"; - sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; "airplayer-2.0.0" = { @@ -15454,13 +15673,13 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "inquirer-1.2.2" = { + "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz"; - sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; "network-address-1.1.0" = { @@ -15634,13 +15853,13 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.1.0" = { + "dns-packet-1.1.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz"; - sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz"; + sha1 = "2369d45038af045f3898e6fa56862aed3f40296c"; }; }; "external-editor-1.1.1" = { @@ -15715,13 +15934,13 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-0.9.17" = { + "socket.io-1.6.0" = { name = "socket.io"; packageName = "socket.io"; - version = "0.9.17"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; - sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; + sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; }; }; "torrent-stream-0.18.1" = { @@ -16093,13 +16312,121 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "socket.io-client-0.9.16" = { + "engine.io-1.8.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; + sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.6.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "0.9.16"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; + sha1 = "5b668f4f771304dfeed179064708386fa6717853"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; - sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "engine.io-parser-1.3.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; + sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; + }; + }; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "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.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; + sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; }; }; "bittorrent-dht-3.2.6" = { @@ -16859,6 +17186,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "uglify-js-2.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + }; "markdown-it-4.4.0" = { name = "markdown-it"; packageName = "markdown-it"; @@ -17264,6 +17600,15 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17309,31 +17654,22 @@ let sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; }; }; - "longjohn-0.2.9" = { + "longjohn-0.2.11" = { name = "longjohn"; packageName = "longjohn"; - version = "0.2.9"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz"; - sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "node-appc-0.2.31" = { + "node-appc-0.2.39" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; - sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; - }; - }; - "request-2.62.0" = { - name = "request"; - packageName = "request"; - version = "2.62.0"; + version = "0.2.39"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz"; - sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; + sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; "sprintf-0.1.5" = { @@ -17345,22 +17681,22 @@ let sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }; }; - "winston-1.0.2" = { + "winston-1.1.2" = { name = "winston"; packageName = "winston"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; - sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; - "wrench-1.5.8" = { + "wrench-1.5.9" = { name = "wrench"; packageName = "wrench"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; }; }; "source-map-support-0.3.2" = { @@ -17390,85 +17726,58 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "diff-2.1.0" = { + "diff-2.2.1" = { name = "diff"; packageName = "diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; - sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; - }; - }; - "node-uuid-1.4.3" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; + sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; }; }; - "request-2.61.0" = { + "request-2.69.0" = { name = "request"; packageName = "request"; - version = "2.61.0"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz"; - sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; }; }; - "semver-5.0.1" = { + "semver-5.1.0" = { name = "semver"; packageName = "semver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; - sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; - }; - }; - "uglify-js-2.4.24" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; - }; - }; - "har-validator-1.8.0" = { - name = "har-validator"; - packageName = "har-validator"; - version = "1.8.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; }; }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; + "wrench-1.5.8" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }; }; - "yargs-3.5.4" = { - name = "yargs"; - packageName = "yargs"; - version = "3.5.4"; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "qs-5.1.0" = { + "qs-6.0.2" = { name = "qs"; packageName = "qs"; - version = "5.1.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; - sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; "bluebird-3.3.5" = { @@ -17570,13 +17879,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.0" = { + "knockout-3.4.1" = { name = "knockout"; packageName = "knockout"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz"; - sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; + sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; "lodash-4.12.0" = { @@ -17678,13 +17987,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.6.0" = { + "color-convert-1.8.2" = { name = "color-convert"; packageName = "color-convert"; - version = "1.6.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.6.0.tgz"; - sha1 = "7592755faf53938a05b1ea8e5374cab77d6dd190"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; + sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; }; }; "color-string-0.3.0" = { @@ -17723,6 +18032,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17849,22 +18167,22 @@ let sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; }; }; - "editions-1.3.1" = { + "editions-1.3.3" = { name = "editions"; packageName = "editions"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz"; - sha1 = "008425f64dc1401db45ec110e06aa602562419c0"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; + sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.3.0" = { + "typechecker-4.4.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz"; - sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; + sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; }; }; "underscore-1.5.2" = { @@ -18038,24 +18356,6 @@ let sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -18065,15 +18365,6 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "set-blocking-1.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -18083,24 +18374,6 @@ let sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "symbol-0.2.3" = { name = "symbol"; packageName = "symbol"; @@ -18437,7 +18710,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -18491,52 +18764,10 @@ in (sources."adal-node-0.1.21" // { dependencies = [ sources."date-utils-1.2.21" - (sources."jws-3.1.3" // { + (sources."jws-3.1.4" // { dependencies = [ - (sources."base64url-1.0.6" // { - dependencies = [ - (sources."concat-stream-1.4.10" // { - dependencies = [ - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - (sources."meow-2.0.0" // { - dependencies = [ - (sources."camelcase-keys-1.0.0" // { - dependencies = [ - sources."camelcase-1.2.1" - sources."map-obj-1.0.1" - ]; - }) - (sources."indent-string-1.2.2" // { - dependencies = [ - sources."get-stdin-4.0.1" - (sources."repeating-1.1.3" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."minimist-1.2.0" - sources."object-assign-1.0.0" - ]; - }) - ]; - }) - (sources."jwa-1.1.3" // { + sources."base64url-2.0.0" + (sources."jwa-1.1.4" // { dependencies = [ sources."buffer-equal-constant-time-1.0.1" (sources."ecdsa-sig-formatter-1.0.7" // { @@ -18546,6 +18777,7 @@ in }) ]; }) + sources."safe-buffer-5.0.1" ]; }) sources."node-uuid-1.4.7" @@ -18696,7 +18928,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.2" + sources."moment-2.16.0" (sources."ms-rest-1.15.2" // { dependencies = [ sources."duplexer-0.1.1" @@ -18817,7 +19049,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -18901,9 +19133,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -19011,10 +19243,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; buildInputs = globalBuildInputs; meta = { @@ -19038,7 +19270,7 @@ in sources."sprintf-js-1.0.3" ]; }) - sources."bower-1.7.9" + sources."bower-1.8.0" sources."bower-endpoint-parser-0.2.1" (sources."bower-json-0.6.0" // { dependencies = [ @@ -19062,7 +19294,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19087,12 +19319,12 @@ in sources."prepend-http-1.0.4" (sources."read-all-stream-2.2.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -19100,7 +19332,7 @@ in }) ]; }) - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."timed-out-2.0.0" ]; }) @@ -19288,9 +19520,9 @@ in (sources."promised-temp-0.1.0" // { dependencies = [ sources."q-1.4.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."mkdirp-0.5.1" // { @@ -19439,7 +19671,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19470,7 +19702,7 @@ in dependencies = [ sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) sources."create-hmac-1.1.4" @@ -19491,7 +19723,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19597,7 +19829,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19614,7 +19846,7 @@ in sources."jsonify-0.0.0" ]; }) - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) (sources."shell-quote-1.6.1" // { @@ -19626,7 +19858,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.4.1" // { + (sources."stream-http-2.5.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -19762,9 +19994,9 @@ in ]; }) sources."debounced-seeker-1.0.0" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."fs-extended-0.2.1" @@ -19904,9 +20136,9 @@ in dependencies = [ (sources."airplay-js-0.2.16" // { dependencies = [ - (sources."mdns-js-0.5.0" // { + (sources."mdns-js-0.5.1" // { dependencies = [ - (sources."mdns-js-packet-0.2.0" // { + (sources."dns-js-0.2.1" // { dependencies = [ sources."qap-3.1.3" ]; @@ -19958,7 +20190,7 @@ in dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.4" // { + (sources."magnet-uri-5.1.5" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" @@ -20184,7 +20416,7 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20198,7 +20430,7 @@ in }) (sources."simple-websocket-4.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20359,7 +20591,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -20404,7 +20636,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -20623,7 +20855,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20654,7 +20886,7 @@ in dependencies = [ sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) sources."create-hmac-1.1.4" @@ -20675,7 +20907,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20757,7 +20989,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20774,7 +21006,7 @@ in sources."jsonify-0.0.0" ]; }) - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) (sources."shell-quote-1.6.1" // { @@ -20786,7 +21018,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.4.1" // { + (sources."stream-http-2.5.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -20862,9 +21094,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -20873,7 +21105,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -20889,9 +21121,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -20913,7 +21145,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -20938,24 +21170,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -21175,9 +21407,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -21319,7 +21551,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -21394,9 +21626,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -21434,7 +21666,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -21699,7 +21931,7 @@ in }) ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -21711,7 +21943,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -21778,15 +22010,16 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."tough-cookie-2.3.2" // { @@ -21870,7 +22103,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21901,12 +22134,12 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22012,9 +22245,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -22119,7 +22352,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22136,7 +22369,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22153,7 +22386,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22198,9 +22431,9 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."reduce-component-1.0.1" @@ -22249,7 +22482,7 @@ in sources."through-2.3.8" ]; }) - sources."basic-auth-1.0.4" + sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" (sources."cors-2.8.1" // { dependencies = [ @@ -22292,7 +22525,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22351,7 +22584,7 @@ in sources."xtend-3.0.0" ]; }) - sources."ltgt-2.1.2" + sources."ltgt-2.1.3" (sources."pull-level-2.0.3" // { dependencies = [ sources."level-post-1.0.5" @@ -22447,7 +22680,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22509,12 +22742,12 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22562,7 +22795,7 @@ in }) (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) sources."aws4-1.5.0" @@ -22572,7 +22805,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."caseless-0.11.0" @@ -22583,7 +22816,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -22667,12 +22900,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -22682,6 +22914,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; @@ -22714,7 +22947,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."got-6.6.1" // { + (sources."got-6.6.3" // { dependencies = [ (sources."create-error-class-3.0.2" // { dependencies = [ @@ -22901,10 +23134,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.9.1"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.9.1.tgz"; - sha1 = "5a8597706fc6048bc6061ac754d4a211d28f4f5b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; + sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; }; dependencies = [ (sources."babel-code-frame-6.16.0" // { @@ -22944,9 +23177,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."doctrine-1.5.0" // { @@ -23060,7 +23293,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - sources."globals-9.12.0" + sources."globals-9.14.0" sources."ignore-3.2.0" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { @@ -23136,7 +23369,7 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -23157,7 +23390,7 @@ in sources."type-check-0.3.2" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -23176,7 +23409,7 @@ in sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" - (sources."require-uncached-1.0.2" // { + (sources."require-uncached-1.0.3" // { dependencies = [ (sources."caller-path-0.1.0" // { dependencies = [ @@ -23200,7 +23433,7 @@ in sources."strip-json-comments-1.0.4" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.8.2" // { + (sources."ajv-4.9.0" // { dependencies = [ sources."co-4.6.0" ]; @@ -23260,7 +23493,7 @@ in dependencies = [ sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.7.9" + sources."bower-1.8.0" (sources."glob-3.2.11" // { dependencies = [ sources."inherits-2.0.3" @@ -23450,7 +23683,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.10" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23478,12 +23711,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23496,7 +23729,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -23532,7 +23765,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -23544,7 +23777,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -23628,12 +23861,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -23643,6 +23875,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -23944,7 +24177,7 @@ in (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.20" // { + (sources."clean-css-3.4.21" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -24083,7 +24316,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -24133,7 +24366,7 @@ in dependencies = [ sources."array-differ-1.0.0" sources."array-uniq-1.0.3" - sources."beeper-1.1.0" + sources."beeper-1.1.1" (sources."dateformat-1.0.12" // { dependencies = [ sources."get-stdin-4.0.1" @@ -24445,7 +24678,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -24504,7 +24737,7 @@ in ]; }) sources."minimist-1.2.0" - (sources."orchestrator-0.3.7" // { + (sources."orchestrator-0.3.8" // { dependencies = [ (sources."end-of-stream-0.1.5" // { dependencies = [ @@ -24519,7 +24752,7 @@ in sources."stream-consume-0.1.0" ]; }) - sources."pretty-hrtime-1.0.2" + sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" (sources."tildify-1.2.0" // { dependencies = [ @@ -24852,7 +25085,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."handlebars-4.0.5" // { + (sources."handlebars-4.0.6" // { dependencies = [ (sources."optimist-0.6.1" // { dependencies = [ @@ -24917,7 +25150,7 @@ in }) ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -24943,7 +25176,7 @@ in sources."has-flag-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -25093,10 +25326,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -25134,11 +25367,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -25153,12 +25386,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25256,7 +25489,7 @@ in sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25284,12 +25517,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25302,7 +25535,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -25338,7 +25571,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -25350,7 +25583,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -25434,12 +25667,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -25449,6 +25681,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."semver-5.3.0" @@ -25494,7 +25727,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) (sources."connect-3.5.0" // { @@ -25512,7 +25745,7 @@ in sources."ee-first-1.1.1" ]; }) - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -25800,9 +26033,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -25810,7 +26043,7 @@ in }) (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25822,12 +26055,12 @@ in }) (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.3" // { + (sources."csrf-3.0.4" // { dependencies = [ - sources."base64-url-1.2.2" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.1" // { + (sources."uid-safe-2.1.3" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -25840,9 +26073,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -25874,11 +26107,16 @@ in (sources."http-errors-1.3.1" // { dependencies = [ sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."vary-1.1.0" ]; }) @@ -25907,10 +26145,14 @@ in sources."on-headers-1.0.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - (sources."serve-favicon-2.3.0" // { + (sources."response-time-2.3.2" // { dependencies = [ - sources."ms-0.7.1" + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" ]; }) (sources."serve-index-1.7.3" // { @@ -25922,9 +26164,9 @@ in }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25948,12 +26190,12 @@ in }) ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -26050,7 +26292,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -26277,12 +26519,12 @@ in ]; }) sources."object-assign-4.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26448,7 +26690,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -26460,7 +26702,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -26544,12 +26786,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -26559,6 +26800,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."retry-0.8.0" @@ -26594,12 +26836,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26813,12 +27055,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26865,9 +27107,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -26884,7 +27126,7 @@ in }) ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -26896,7 +27138,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -26980,12 +27222,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -26995,6 +27236,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."rimraf-2.5.4" @@ -27005,7 +27247,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27076,7 +27318,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) (sources."meow-3.7.0" // { @@ -27209,18 +27451,18 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."express-4.14.0" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -27231,13 +27473,18 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -27262,24 +27509,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -27323,11 +27570,11 @@ in ]; }) sources."semver-4.3.6" - (sources."serve-favicon-2.3.0" // { + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" sources."fresh-0.3.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."parseurl-1.3.1" ]; }) @@ -27351,17 +27598,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27370,7 +27617,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27398,7 +27645,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -27410,7 +27657,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -27494,12 +27741,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -27509,6 +27755,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -27555,6 +27802,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -27614,17 +27866,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27633,7 +27885,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27661,7 +27913,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -27673,7 +27925,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -27757,12 +28009,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -27772,6 +28023,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -27818,6 +28070,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -27862,7 +28119,7 @@ in }) ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27942,17 +28199,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27961,7 +28218,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27997,7 +28254,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -28009,7 +28266,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -28093,12 +28350,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -28108,6 +28364,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -28310,7 +28567,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.10" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28338,12 +28595,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28356,7 +28613,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -28392,7 +28649,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -28404,7 +28661,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -28488,12 +28745,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -28503,6 +28759,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -28537,6 +28794,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -28567,9 +28829,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."es6-promise-3.3.1" @@ -28703,7 +28965,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28734,12 +28996,12 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -28821,11 +29083,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -28835,11 +29097,11 @@ in ]; }) sources."qs-6.2.0" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -28872,7 +29134,7 @@ in sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28912,9 +29174,9 @@ in }) (sources."cron-1.1.1" // { dependencies = [ - (sources."moment-timezone-0.5.7" // { + (sources."moment-timezone-0.5.9" // { dependencies = [ - sources."moment-2.15.2" + sources."moment-2.16.0" ]; }) ]; @@ -28923,9 +29185,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -28947,7 +29209,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -28972,23 +29234,23 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -28999,9 +29261,9 @@ in }) (sources."follow-redirects-0.2.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."stream-consume-0.1.0" @@ -29053,7 +29315,7 @@ in }) (sources."i18next-1.10.6" // { dependencies = [ - (sources."cookies-0.6.1" // { + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" @@ -29212,7 +29474,7 @@ in (sources."ordered-read-streams-0.3.0" // { dependencies = [ sources."is-stream-1.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29324,7 +29586,7 @@ in }) ]; }) - (sources."websocket-stream-3.3.0" // { + (sources."websocket-stream-3.3.3" // { dependencies = [ (sources."duplexify-3.5.0" // { dependencies = [ @@ -29337,7 +29599,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29384,9 +29646,9 @@ in dependencies = [ sources."uid2-0.0.3" sources."utils-merge-1.0.0" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -29500,12 +29762,12 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) - (sources."node-red-node-feedparser-0.1.6" // { + (sources."node-red-node-feedparser-0.1.7" // { dependencies = [ (sources."feedparser-1.1.3" // { dependencies = [ @@ -29552,7 +29814,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -29636,9 +29898,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -29655,7 +29917,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.11" // { + (sources."node-red-node-email-0.1.12" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -29675,9 +29937,9 @@ in sources."libqp-1.1.0" (sources."needle-0.10.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."iconv-lite-0.4.13" @@ -29689,9 +29951,9 @@ in }) (sources."needle-0.11.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."iconv-lite-0.4.13" @@ -29734,7 +29996,7 @@ in ]; }) sources."mime-1.3.4" - (sources."uue-3.0.0" // { + (sources."uue-3.1.0" // { dependencies = [ sources."extend-3.0.0" ]; @@ -29756,11 +30018,11 @@ in }) ]; }) - (sources."node-red-node-twitter-0.1.7" // { + (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -29772,7 +30034,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -29856,12 +30118,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -29871,14 +30132,15 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; }) - sources."node-red-node-rbe-0.1.5" - (sources."node-red-node-serialport-0.4.0" // { + sources."node-red-node-rbe-0.1.6" + (sources."node-red-node-serialport-0.4.1" // { dependencies = [ - (sources."serialport-4.0.4" // { + (sources."serialport-4.0.6" // { dependencies = [ sources."bindings-1.2.1" (sources."commander-2.9.0" // { @@ -29886,9 +30148,9 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."lie-3.1.0" // { @@ -29904,17 +30166,17 @@ in sources."minimist-0.0.8" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -29923,7 +30185,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -29959,7 +30221,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -29971,7 +30233,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30050,12 +30312,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -30065,6 +30326,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -30111,6 +30373,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -30228,7 +30495,7 @@ in sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.2.5" + sources."buffer-crc32-0.2.6" sources."fresh-0.1.0" sources."methods-0.0.1" (sources."send-0.1.0" // { @@ -30237,9 +30504,9 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -30347,7 +30614,7 @@ in }) (sources."net-ping-1.1.7" // { dependencies = [ - (sources."raw-socket-1.5.0" // { + (sources."raw-socket-1.5.1" // { dependencies = [ sources."nan-2.3.5" ]; @@ -30376,12 +30643,18 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; + sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; }; dependencies = [ + (sources."JSONStream-1.2.1" // { + dependencies = [ + sources."jsonparse-1.2.0" + sources."through-2.3.8" + ]; + }) sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -30485,6 +30758,62 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" + (sources."mississippi-1.2.0" // { + dependencies = [ + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."typedarray-0.0.6" + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.1" + sources."pumpify-1.3.5" + (sources."stream-each-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + sources."xtend-4.0.1" + ]; + }) + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30535,9 +30864,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -30570,7 +30899,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.2.1" // { + (sources."npm-registry-client-7.3.0" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30618,7 +30947,7 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30626,7 +30955,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" @@ -30703,23 +31032,10 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.75.0" // { + (sources."request-2.78.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30728,7 +31044,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.0.0" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30803,14 +31119,14 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -30826,6 +31142,26 @@ in sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + (sources."from2-1.3.0" // { + dependencies = [ + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + ]; + }) + (sources."stream-iterate-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + ]; + }) sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -30846,7 +31182,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -30901,7 +31237,7 @@ in }) (sources."npm-registry-client-0.2.27" // { dependencies = [ - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -30913,7 +31249,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30997,12 +31333,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -31012,6 +31347,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."graceful-fs-2.0.3" @@ -31052,17 +31388,17 @@ in }) sources."retry-0.6.0" sources."couch-login-0.1.20" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -31071,7 +31407,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -31269,9 +31605,9 @@ in sources."jju-1.3.0" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" sources."node-alias-1.0.4" - (sources."npm-3.10.9" // { + (sources."npm-3.10.10" // { dependencies = [ sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -31426,9 +31762,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -31509,7 +31845,7 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -31517,7 +31853,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" @@ -31676,9 +32012,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -31718,7 +32054,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -31855,12 +32191,12 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -31924,10 +32260,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.5.3"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.5.3.tgz"; - sha1 = "f1dea92c78b80f6af02d3652025e31fd8a81efde"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; + sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; }; dependencies = [ sources."async-0.9.2" @@ -31947,11 +32283,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -31966,85 +32302,33 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" - ]; - }) - ]; - }) - ]; - }) - (sources."bunyan-1.8.4" // { - dependencies = [ - (sources."dtrace-provider-0.7.1" // { - dependencies = [ - sources."nan-2.4.0" - ]; - }) - (sources."mv-2.1.1" // { - dependencies = [ - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."ncp-2.0.0" - (sources."rimraf-2.4.5" // { - dependencies = [ - (sources."glob-6.0.4" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) + sources."mime-db-1.25.0" ]; }) ]; }) - sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" ]; }) (sources."compression-1.6.2" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."negotiator-0.6.1" ]; }) sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -32077,7 +32361,8 @@ in }) ]; }) - sources."core-js-1.2.7" + sources."content-type-git+https://github.com/wikimedia/content-type.git#master" + sources."core-js-2.4.1" sources."diff-1.4.0" sources."domino-1.0.27" sources."entities-1.1.1" @@ -32085,12 +32370,11 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."negotiator-0.6.1" ]; }) sources."array-flatten-1.1.1" @@ -32109,7 +32393,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -32134,24 +32418,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -32160,9 +32444,9 @@ in sources."vary-1.1.0" ]; }) - (sources."express-handlebars-2.0.1" // { + (sources."express-handlebars-3.0.0" // { dependencies = [ - (sources."glob-5.0.15" // { + (sources."glob-6.0.4" // { dependencies = [ (sources."inflight-1.0.6" // { dependencies = [ @@ -32188,49 +32472,92 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."graceful-fs-3.0.11" // { - dependencies = [ - sources."natives-1.1.0" - ]; - }) - (sources."handlebars-3.0.3" // { + sources."graceful-fs-4.1.10" + (sources."handlebars-4.0.6" // { dependencies = [ + sources."async-1.5.2" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."source-map-0.1.43" // { + (sources."source-map-0.4.4" // { dependencies = [ sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.3.6" // { + (sources."uglify-js-2.7.4" // { dependencies = [ sources."async-0.2.10" - (sources."optimist-0.3.7" // { + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.10.0" // { dependencies = [ - sources."wordwrap-0.0.3" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" ]; }) ]; }) ]; }) - (sources."object.assign-1.1.1" // { + (sources."object.assign-4.0.4" // { dependencies = [ + sources."function-bind-1.1.0" sources."object-keys-1.0.11" + (sources."define-properties-1.1.2" // { + dependencies = [ + sources."foreach-2.0.5" + ]; + }) ]; }) - (sources."promise-6.1.0" // { + (sources."promise-7.1.1" // { dependencies = [ - sources."asap-1.0.0" + sources."asap-2.0.5" ]; }) ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.1" // { dependencies = [ (sources."debug-2.2.0" // { dependencies = [ @@ -32243,6 +32570,7 @@ in sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -32251,61 +32579,22 @@ in sources."gelfling-0.2.0" ]; }) - (sources."html5-1.0.5" // { + (sources."js-yaml-3.7.0" // { dependencies = [ - sources."opts-1.2.2" - sources."html5-entities-1.0.0" - (sources."jsdom-0.11.1" // { + (sources."argparse-1.0.9" // { dependencies = [ - (sources."htmlparser2-3.9.2" // { - dependencies = [ - sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - ]; - }) - sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."nwmatcher-1.3.9" - sources."xmlhttprequest-1.8.0" - sources."cssom-0.3.1" - sources."cssstyle-0.2.37" - (sources."contextify-0.1.15" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.4.0" - ]; - }) + sources."sprintf-js-1.0.3" ]; }) + sources."esprima-2.7.3" ]; }) - sources."node-txstatsd-0.1.6" + sources."mediawiki-title-0.5.6" + sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.7" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" - (sources."prfun-2.1.4" // { - dependencies = [ - sources."core-js-2.4.1" - ]; - }) - (sources."request-2.78.0" // { + sources."prfun-2.1.4" + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -32317,7 +32606,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -32401,9 +32690,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."oauth-sign-0.8.2" @@ -32415,19 +32704,385 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."semver-5.3.0" - (sources."serve-favicon-2.3.0" // { + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" sources."fresh-0.3.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."parseurl-1.3.1" ]; }) + (sources."service-runner-2.1.11" // { + dependencies = [ + sources."bluebird-3.4.6" + (sources."bunyan-1.8.5" // { + dependencies = [ + (sources."dtrace-provider-0.8.0" // { + dependencies = [ + sources."nan-2.4.0" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ncp-2.0.0" + (sources."rimraf-2.4.5" // { + dependencies = [ + (sources."glob-6.0.4" // { + dependencies = [ + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + ]; + }) + ]; + }) + sources."safe-json-stringify-1.0.3" + sources."moment-2.16.0" + ]; + }) + sources."bunyan-syslog-udp-0.1.0" + sources."extend-3.0.0" + (sources."gelf-stream-1.1.1" // { + dependencies = [ + sources."gelfling-0.3.1" + ]; + }) + sources."hot-shots-4.3.1" + (sources."limitation-0.1.9" // { + dependencies = [ + (sources."kad-git+https://github.com/gwicke/kad.git#master" // { + dependencies = [ + sources."clarinet-0.11.0" + sources."colors-1.1.2" + sources."hat-0.0.3" + sources."kad-fs-0.0.4" + (sources."kad-localstorage-0.0.7" // { + dependencies = [ + sources."dom-storage-2.0.2" + ]; + }) + sources."kad-memstore-0.0.1" + sources."lodash-3.10.1" + sources."merge-1.2.0" + sources."ms-0.7.2" + (sources."msgpack5-3.4.1" // { + dependencies = [ + (sources."bl-1.1.2" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."inherits-2.0.3" + ]; + }) + ]; + }) + (sources."readable-stream-2.2.2" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."yargs-5.0.0" // { + dependencies = [ + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."window-size-0.2.0" + sources."y18n-3.2.1" + (sources."yargs-parser-3.2.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + }) + ]; + }) sources."simplediff-0.1.1" - sources."yargs-1.3.3" + (sources."yargs-4.8.1" // { + dependencies = [ + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."window-size-0.2.0" + sources."y18n-3.2.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -32457,7 +33112,7 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) (sources."concat-stream-1.5.2" // { @@ -32564,9 +33219,10 @@ in }) (sources."multicast-dns-6.1.0" // { dependencies = [ - (sources."dns-packet-1.1.0" // { + (sources."dns-packet-1.1.1" // { dependencies = [ sources."ip-1.1.4" + sources."safe-buffer-5.0.1" ]; }) sources."thunky-0.1.0" @@ -32704,7 +33360,7 @@ in ]; }) sources."clivas-0.2.0" - (sources."inquirer-1.2.2" // { + (sources."inquirer-1.2.3" // { dependencies = [ sources."ansi-escapes-1.4.0" (sources."chalk-1.1.3" // { @@ -32766,7 +33422,7 @@ in sources."object-assign-4.1.0" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" sources."mute-stream-0.0.6" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -32812,7 +33468,7 @@ in dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.4" // { + (sources."magnet-uri-5.1.5" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" @@ -33044,7 +33700,7 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33058,7 +33714,7 @@ in }) (sources."simple-websocket-4.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33085,9 +33741,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."inherits-2.0.3" @@ -33112,10 +33768,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.0.30"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz"; - sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; + sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; }; dependencies = [ (sources."connect-multiparty-1.2.5" // { @@ -33332,30 +33988,133 @@ in sources."xtend-4.0.1" ]; }) - (sources."socket.io-0.9.17" // { + (sources."socket.io-1.6.0" // { dependencies = [ - (sources."socket.io-client-0.9.16" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."uglify-js-1.2.5" - (sources."ws-0.4.32" // { + sources."ms-0.7.2" + ]; + }) + (sources."engine.io-1.8.0" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."base64id-0.1.0" + (sources."engine.io-parser-1.3.1" // { + dependencies = [ + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + (sources."has-binary-0.1.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."wtf-8-1.0.0" + ]; + }) + (sources."ws-1.1.1" // { dependencies = [ - sources."commander-2.1.0" - sources."nan-1.0.0" - sources."tinycolor-0.0.1" sources."options-0.0.6" + sources."ultron-1.0.2" ]; }) - sources."xmlhttprequest-1.4.2" - (sources."active-x-obfuscator-0.0.1" // { + sources."cookie-0.3.1" + ]; + }) + (sources."has-binary-0.1.7" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."object-assign-4.1.0" + sources."socket.io-adapter-0.5.0" + (sources."socket.io-client-1.6.0" // { + dependencies = [ + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.0" // { dependencies = [ - sources."zeparser-0.0.5" + sources."component-inherit-0.0.3" + (sources."engine.io-parser-1.3.1" // { + dependencies = [ + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + (sources."has-binary-0.1.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."wtf-8-1.0.0" + ]; + }) + sources."has-cors-1.1.0" + (sources."parsejson-0.0.3" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."parseqs-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."ws-1.1.1" // { + dependencies = [ + sources."options-0.0.6" + sources."ultron-1.0.2" + ]; + }) + sources."xmlhttprequest-ssl-1.5.3" + sources."yeast-0.1.2" ]; }) + sources."indexof-0.0.1" + sources."object-component-0.0.3" + (sources."parseuri-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + sources."to-array-0.1.4" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."json3-3.3.2" + sources."component-emitter-1.1.2" + sources."isarray-0.0.1" ]; }) - sources."policyfile-0.0.4" - sources."base64id-0.1.0" - sources."redis-0.7.3" ]; }) (sources."torrent-stream-0.18.1" // { @@ -33366,9 +34125,9 @@ in sources."addr-to-ip-port-1.4.2" sources."bencode-0.7.0" sources."buffer-equal-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."inherits-2.0.3" @@ -33403,9 +34162,9 @@ in sources."bencode-0.6.0" sources."bn.js-1.3.0" sources."buffer-equal-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."extend.js-0.0.2" @@ -33547,10 +34306,10 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -33682,15 +34441,15 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -33790,7 +34549,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -33959,9 +34718,9 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -33988,7 +34747,7 @@ in }) (sources."openid-2.0.6" // { dependencies = [ - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -34000,7 +34759,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -34084,12 +34843,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -34099,6 +34857,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; @@ -34108,7 +34867,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -34160,9 +34919,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -34244,12 +35003,12 @@ in }) ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -34290,12 +35049,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -34306,9 +35065,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -34317,7 +35076,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -34334,7 +35093,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -34344,13 +35103,13 @@ in sources."esprima-2.7.3" ]; }) - (sources."cookies-0.6.1" // { + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -34362,7 +35121,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -34441,12 +35200,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -34456,6 +35214,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."async-0.9.2" @@ -34467,9 +35226,9 @@ in sources."sigmund-1.0.1" ]; }) - (sources."bunyan-1.8.4" // { + (sources."bunyan-1.8.5" // { dependencies = [ - (sources."dtrace-provider-0.7.1" // { + (sources."dtrace-provider-0.8.0" // { dependencies = [ sources."nan-2.4.0" ]; @@ -34510,7 +35269,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" + sources."moment-2.16.0" ]; }) (sources."handlebars-2.0.0" // { @@ -34566,7 +35325,7 @@ in }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -34597,11 +35356,11 @@ in ]; }) sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) (sources."readable-stream-1.1.14" // { @@ -34667,12 +35426,12 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -34752,7 +35511,7 @@ in }) ]; }) - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -34838,12 +35597,12 @@ in (sources."sshpk-agent-1.2.1" // { dependencies = [ sources."assert-plus-0.1.5" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -34882,7 +35641,7 @@ in (sources."cmdln-3.2.1" // { dependencies = [ sources."extsprintf-1.3.0" - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -34923,9 +35682,9 @@ in sources."minimist-0.0.8" ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."sax-0.5.8" @@ -35040,13 +35799,17 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; - sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; + sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; }; dependencies = [ - sources."async-1.4.2" + (sources."async-2.1.2" // { + dependencies = [ + sources."lodash-4.17.2" + ]; + }) sources."colors-1.1.2" (sources."fields-0.1.24" // { dependencies = [ @@ -35055,7 +35818,7 @@ in ]; }) sources."humanize-0.0.9" - (sources."longjohn-0.2.9" // { + (sources."longjohn-0.2.11" // { dependencies = [ (sources."source-map-support-0.3.2" // { dependencies = [ @@ -35068,20 +35831,23 @@ in }) ]; }) - sources."moment-2.10.6" - (sources."node-appc-0.2.31" // { + sources."moment-2.16.0" + (sources."node-appc-0.2.39" // { dependencies = [ sources."adm-zip-0.4.7" - sources."diff-2.1.0" - sources."node-uuid-1.4.3" + sources."async-1.5.2" + sources."diff-2.2.1" + sources."node-uuid-1.4.7" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."request-2.61.0" // { + (sources."request-2.69.0" // { dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" (sources."bl-1.0.3" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -35097,57 +35863,24 @@ in ]; }) sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) sources."extend-3.0.0" sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { - dependencies = [ - sources."mime-db-1.24.0" - ]; - }) - sources."qs-4.0.0" - sources."tunnel-agent-0.4.3" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."http-signature-0.11.0" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."isstream-0.1.2" - (sources."har-validator-1.8.0" // { + (sources."har-validator-2.0.6" // { dependencies = [ - sources."bluebird-2.11.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -35182,102 +35915,135 @@ in sources."xtend-4.0.1" ]; }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" ]; }) + sources."oauth-sign-0.8.2" + sources."qs-6.0.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" ]; }) - sources."semver-5.0.1" - (sources."uglify-js-2.4.24" // { + sources."semver-5.1.0" + sources."wrench-1.5.8" + (sources."uglify-js-2.6.1" // { dependencies = [ sources."async-0.2.10" - (sources."source-map-0.1.34" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) + sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.5.4" // { + (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) sources."decamelize-1.2.0" sources."window-size-0.1.0" - sources."wordwrap-0.0.2" ]; }) ]; }) - sources."xmldom-0.1.19" + sources."xmldom-0.1.22" ]; }) - (sources."request-2.62.0" // { + (sources."request-2.78.0" // { dependencies = [ - (sources."bl-1.0.3" // { + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - 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-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) + sources."delayed-stream-1.0.0" ]; }) - sources."caseless-0.11.0" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.1.2" // { - dependencies = [ - sources."lodash-4.16.6" - ]; - }) - ]; - }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { - dependencies = [ - sources."mime-db-1.24.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."qs-5.1.0" - sources."tunnel-agent-0.4.3" - (sources."tough-cookie-2.3.2" // { + (sources."form-data-2.1.2" // { dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."http-signature-0.11.0" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" ]; }) - sources."isstream-0.1.2" - (sources."har-validator-1.8.0" // { + (sources."har-validator-2.0.6" // { dependencies = [ - sources."bluebird-2.11.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -35312,11 +36078,67 @@ in sources."xtend-4.0.1" ]; }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) ]; }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.4.3" ]; }) - sources."semver-5.0.3" + sources."semver-5.3.0" sources."sprintf-0.1.5" (sources."temp-0.8.3" // { dependencies = [ @@ -35324,7 +36146,7 @@ in sources."rimraf-2.2.8" ]; }) - (sources."winston-1.0.2" // { + (sources."winston-1.1.2" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" @@ -35335,7 +36157,7 @@ in sources."stack-trace-0.0.9" ]; }) - sources."wrench-1.5.8" + sources."wrench-1.5.9" ]; buildInputs = globalBuildInputs; meta = { @@ -35348,10 +36170,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz"; - sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; + sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; }; buildInputs = globalBuildInputs; meta = { @@ -35447,11 +36269,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -35466,12 +36288,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -35481,7 +36303,7 @@ in (sources."color-0.11.4" // { dependencies = [ sources."clone-1.0.2" - (sources."color-convert-1.6.0" // { + (sources."color-convert-1.8.2" // { dependencies = [ sources."color-name-1.1.1" ]; @@ -35509,9 +36331,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -35566,12 +36388,12 @@ in sources."statuses-1.2.1" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -35719,8 +36541,8 @@ in (sources."extract-opts-3.3.1" // { dependencies = [ sources."eachr-3.2.0" - sources."editions-1.3.1" - sources."typechecker-4.3.0" + sources."editions-1.3.3" + sources."typechecker-4.4.0" ]; }) ]; @@ -35731,7 +36553,7 @@ in sources."underscore-1.5.2" ]; }) - sources."knockout-3.4.0" + sources."knockout-3.4.1" sources."lodash-4.12.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -35891,9 +36713,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -36095,9 +36917,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.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -36132,7 +36954,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -36210,7 +37032,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -36222,7 +37044,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -36306,12 +37128,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -36321,6 +37142,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."retry-0.8.0" @@ -36330,12 +37152,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -36615,9 +37437,9 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."reduce-component-1.0.1" @@ -36974,15 +37796,15 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -37082,7 +37904,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -37142,12 +37964,12 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -37401,7 +38223,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37424,12 +38246,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37442,7 +38264,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -37478,7 +38300,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -37490,7 +38312,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -37574,12 +38396,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -37589,6 +38410,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index b2202168ef67..6ece606398ac 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -229,13 +229,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "amdefine-1.0.0" = { + "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "wordwrap-0.0.3" = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "os-homedir-1.0.2" = { @@ -418,13 +418,13 @@ let sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a"; }; }; - "azure-arm-commerce-0.1.1" = { + "azure-arm-commerce-0.2.0" = { name = "azure-arm-commerce"; packageName = "azure-arm-commerce"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz"; - sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59"; + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz"; + sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; "azure-arm-compute-0.19.0" = { @@ -436,13 +436,13 @@ let sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e"; }; }; - "azure-arm-hdinsight-0.2.0" = { + "azure-arm-hdinsight-0.2.2" = { name = "azure-arm-hdinsight"; packageName = "azure-arm-hdinsight"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz"; - sha1 = "13d2cff9110485970bf063c7411eefe148e3790f"; + url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; + sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d"; }; }; "azure-arm-hdinsight-jobs-0.1.0" = { @@ -463,13 +463,13 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; - "azure-arm-iothub-0.1.1" = { + "azure-arm-iothub-0.1.4" = { name = "azure-arm-iothub"; packageName = "azure-arm-iothub"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; - sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz"; + sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d"; }; }; "azure-arm-servermanagement-0.1.2" = { @@ -868,13 +868,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.15.2" = { + "moment-2.16.0" = { name = "moment"; packageName = "moment"; - version = "2.15.2"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"; - sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"; + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; "ms-rest-1.15.2" = { @@ -1102,13 +1102,13 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "jws-3.1.3" = { + "jws-3.1.4" = { name = "jws"; packageName = "jws"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; - sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; }; }; "node-uuid-1.4.7" = { @@ -1138,184 +1138,31 @@ let sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; }; }; - "base64url-1.0.6" = { + "base64url-2.0.0" = { name = "base64url"; packageName = "base64url"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; - sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; + url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; + sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "jwa-1.1.3" = { + "jwa-1.1.4" = { name = "jwa"; packageName = "jwa"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; - sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; - }; - }; - "concat-stream-1.4.10" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - }; - "meow-2.0.0" = { - name = "meow"; - packageName = "meow"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "camelcase-keys-1.0.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - }; - "indent-string-1.2.2" = { - name = "indent-string"; - packageName = "indent-string"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; - sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; + sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1462,6 +1309,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1480,6 +1345,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1831,6 +1705,15 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1948,13 +1831,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.12" = { + "mime-types-2.1.13" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; - sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; + sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; }; }; "oauth-sign-0.8.2" = { @@ -2020,13 +1903,13 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "lodash-4.16.4" = { + "lodash-4.17.2" = { name = "lodash"; packageName = "lodash"; - version = "4.16.4"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"; - sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; + sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; }; }; "chalk-1.1.3" = { @@ -2353,13 +2236,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.24.0" = { + "mime-db-1.25.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; - sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; + sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; }; }; "punycode-1.4.1" = { @@ -2416,6 +2299,15 @@ let sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; "http-response-object-1.1.0" = { name = "http-response-object"; packageName = "http-response-object"; @@ -2434,6 +2326,15 @@ let sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; }; }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2497,13 +2398,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "bower-1.7.9" = { + "bower-1.8.0" = { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2749,13 +2650,13 @@ let sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; "timed-out-2.0.0" = { @@ -2776,13 +2677,13 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "stream-shift-1.0.0" = { @@ -2839,6 +2740,24 @@ let sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; "normalize-package-data-2.3.5" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -3028,13 +2947,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.9" = { + "graceful-fs-4.1.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; - sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz"; + sha1 = "f2d720c22092f743228775c75e3612632501f131"; }; }; "parse-json-2.2.0" = { @@ -3118,6 +3037,33 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -3172,22 +3118,22 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.2.0" = { + "debug-2.3.3" = { name = "debug"; packageName = "debug"; - version = "2.2.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "ms-0.7.1" = { + "ms-0.7.2" = { name = "ms"; packageName = "ms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; "rimraf-2.2.8" = { @@ -3262,15 +3208,6 @@ let sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; }; }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -3487,13 +3424,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.4.1" = { + "stream-http-2.5.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz"; - sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; + sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; }; }; "subarg-1.0.0" = { @@ -3865,13 +3802,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.1" = { + "asn1.js-4.9.0" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; - sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; + sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; }; }; "ripemd160-1.0.1" = { @@ -3883,13 +3820,13 @@ let sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; }; }; - "sha.js-2.4.5" = { + "sha.js-2.4.8" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.5"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; - sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; + sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; "miller-rabin-4.0.0" = { @@ -4468,6 +4405,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -4576,13 +4522,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.0" = { + "mdns-js-0.5.1" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; - sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; + sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; }; }; "plist-2.0.1" = { @@ -4594,13 +4540,13 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "mdns-js-packet-0.2.0" = { - name = "mdns-js-packet"; - packageName = "mdns-js-packet"; - version = "0.2.0"; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; - sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; "semver-5.1.1" = { @@ -4720,13 +4666,13 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.4" = { + "magnet-uri-5.1.5" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz"; - sha1 = "225db1f8670a944db87a5fbe27e2d90350513403"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; + sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; "parse-torrent-file-4.0.0" = { @@ -4981,13 +4927,13 @@ let sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; }; }; - "ip-1.1.3" = { + "ip-1.1.4" = { name = "ip"; packageName = "ip"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz"; - sha1 = "12b16294a38925486d618a1103506e4eb4f8b296"; + url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz"; + sha1 = "de8247ffef940451832550fba284945e6e039bfb"; }; }; "magnet-uri-4.2.3" = { @@ -5071,6 +5017,15 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -5557,13 +5512,13 @@ let sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; }; }; - "exit-on-epipe-0.0.1" = { + "exit-on-epipe-0.1.0" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; - version = "0.0.1"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz"; - sha1 = "ea41650007098c8444519a5d48958170c4ad929b"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz"; + sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697"; }; }; "sax-1.2.1" = { @@ -5719,13 +5674,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.16" = { + "big-integer-1.6.17" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.16"; + version = "1.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; - sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; + sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; "sax-0.3.5" = { @@ -6052,13 +6007,22 @@ let sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; }; }; - "compressible-2.0.8" = { + "compressible-2.0.9" = { name = "compressible"; packageName = "compressible"; - version = "2.0.8"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; + sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; - sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; "on-headers-1.0.1" = { @@ -6088,6 +6052,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6268,13 +6241,13 @@ let sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -6331,22 +6304,22 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.0" = { + "http-errors-1.5.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"; - sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; + sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; }; }; - "setprototypeof-1.0.1" = { + "setprototypeof-1.0.2" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"; - sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; + sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; }; }; "media-typer-0.3.0" = { @@ -6727,6 +6700,15 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; "realize-package-specifier-3.0.3" = { name = "realize-package-specifier"; packageName = "realize-package-specifier"; @@ -6952,22 +6934,22 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "request-2.76.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.76.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz"; - sha1 = "be44505afef70360a0436955106be3945d95560e"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; - "form-data-2.1.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"; - sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; "qs-6.3.0" = { @@ -6979,6 +6961,15 @@ let sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; }; }; + "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"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7411,13 +7402,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.1" = { + "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; - sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7483,6 +7474,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -8126,13 +8126,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.8.1" = { + "verror-1.9.0" = { name = "verror"; packageName = "verror"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz"; - sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029"; + url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; + sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; }; }; "extsprintf-1.3.0" = { @@ -8225,13 +8225,13 @@ let sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "basic-auth-1.0.4" = { + "basic-auth-1.1.0" = { name = "basic-auth"; packageName = "basic-auth"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; "cors-2.8.1" = { @@ -8477,13 +8477,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "ltgt-2.1.2" = { + "ltgt-2.1.3" = { name = "ltgt"; packageName = "ltgt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz"; - sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; "pull-level-2.0.3" = { @@ -8495,13 +8495,13 @@ let sha1 = "9500635e257945d6feede185f5d7a24773455b17"; }; }; - "pull-stream-3.4.5" = { + "pull-stream-3.5.0" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.4.5"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz"; - sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; + sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; "typewiselite-1.0.0" = { @@ -8729,13 +8729,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "got-6.5.0" = { + "got-6.6.3" = { name = "got"; packageName = "got"; - version = "6.5.0"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; - sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; + sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; }; }; "lodash.debounce-4.0.8" = { @@ -8810,6 +8810,15 @@ let sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; }; }; + "timed-out-3.0.0" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz"; + sha1 = "ff88de96030ce960eabd42487db61d3add229273"; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -8891,13 +8900,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.12.0" = { + "globals-9.14.0" = { name = "globals"; packageName = "globals"; - version = "9.12.0"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"; - sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d"; + url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; + sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; "ignore-3.2.0" = { @@ -8927,13 +8936,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.6.1" = { + "js-yaml-3.7.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "json-stable-stringify-1.0.1" = { @@ -8981,13 +8990,13 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; - "require-uncached-1.0.2" = { + "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"; - sha1 = "67dad3b733089e77030124678a459589faf6a7ec"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; "strip-bom-3.0.0" = { @@ -9305,13 +9314,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.8.2" = { + "ajv-4.9.0" = { name = "ajv"; packageName = "ajv"; - version = "4.8.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz"; - sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; + sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; }; }; "ajv-keywords-1.1.1" = { @@ -9404,13 +9413,13 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "forever-monitor-1.6.0" = { + "forever-monitor-1.7.1" = { name = "forever-monitor"; packageName = "forever-monitor"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz"; - sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40"; + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; + sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; }; }; "nconf-0.6.9" = { @@ -9512,15 +9521,6 @@ let sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; "ps-tree-0.0.3" = { name = "ps-tree"; packageName = "ps-tree"; @@ -9584,13 +9584,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.14" = { + "fsevents-1.0.15" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz"; - sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz"; + sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44"; }; }; "micromatch-2.3.11" = { @@ -9881,13 +9881,13 @@ let sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; }; }; - "npmlog-4.0.0" = { + "npmlog-4.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz"; - sha1 = "e094503961c70c1774eb76692080e8d578a9f88f"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; + sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; }; }; "tar-pack-3.3.0" = { @@ -9908,13 +9908,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.6.0" = { + "gauge-2.7.1" = { name = "gauge"; packageName = "gauge"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; - sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; + sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; }; }; "set-blocking-2.0.0" = { @@ -10116,13 +10116,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.20" = { + "clean-css-3.4.21" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.20"; + version = "3.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; - sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; + sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; }; }; "commander-2.6.0" = { @@ -10296,6 +10296,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -10413,22 +10422,22 @@ let sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; }; }; - "orchestrator-0.3.7" = { + "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; - sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "pretty-hrtime-1.0.2" = { + "pretty-hrtime-1.0.3" = { name = "pretty-hrtime"; packageName = "pretty-hrtime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"; - sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8"; + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; "tildify-1.2.0" = { @@ -10467,13 +10476,13 @@ let sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "beeper-1.1.0" = { + "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"; - sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; "dateformat-1.0.12" = { @@ -10980,6 +10989,15 @@ let sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; }; }; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + }; "ordered-read-streams-0.1.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -11277,13 +11295,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "handlebars-4.0.5" = { + "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz"; + sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; "supports-color-3.1.2" = { @@ -11943,6 +11961,15 @@ let sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; }; }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; "connect-2.30.2" = { name = "connect"; packageName = "connect"; @@ -12087,13 +12114,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -12132,22 +12159,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -12186,22 +12213,13 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; - }; - }; - "base64-url-1.2.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; "rndm-1.2.0" = { @@ -12222,13 +12240,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -12771,6 +12789,15 @@ let sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; }; }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -13302,49 +13329,49 @@ let sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; }; }; - "node-red-node-feedparser-0.1.6" = { + "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz"; - sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz"; + sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.11" = { + "node-red-node-email-0.1.12" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.11"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz"; - sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; + sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; }; }; - "node-red-node-twitter-0.1.7" = { + "node-red-node-twitter-0.1.9" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.7"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; - sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; + sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; }; }; - "node-red-node-rbe-0.1.5" = { + "node-red-node-rbe-0.1.6" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz"; - sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; + sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.0" = { + "node-red-node-serialport-0.4.1" = { name = "node-red-node-serialport"; packageName = "node-red-node-serialport"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz"; - sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe"; + url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; + sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; }; }; "bcrypt-0.8.7" = { @@ -13500,13 +13527,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.7" = { + "moment-timezone-0.5.9" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz"; - sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; + sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; }; }; "retry-0.6.1" = { @@ -13518,13 +13545,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.1" = { + "cookies-0.6.2" = { name = "cookies"; packageName = "cookies"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz"; - sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; + sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; }; }; "i18next-client-1.10.3" = { @@ -13608,13 +13635,13 @@ let sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; }; }; - "websocket-stream-3.3.0" = { + "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.0"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz"; - sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; + sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; }; }; "leven-1.0.2" = { @@ -13887,13 +13914,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "uue-3.0.0" = { + "uue-3.1.0" = { name = "uue"; packageName = "uue"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz"; - sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; + sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; "utf7-1.0.2" = { @@ -13914,13 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.3" = { + "serialport-4.0.6" = { name = "serialport"; packageName = "serialport"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz"; - sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1"; + url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; + sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; }; }; "lie-3.1.0" = { @@ -14193,13 +14220,13 @@ let sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "buffer-crc32-0.2.5" = { + "buffer-crc32-0.2.6" = { name = "buffer-crc32"; packageName = "buffer-crc32"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"; + sha1 = "612b318074fc6c4c30504b297247a1f91641253b"; }; }; "fresh-0.1.0" = { @@ -14508,13 +14535,13 @@ let sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }; }; - "raw-socket-1.5.0" = { + "raw-socket-1.5.1" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"; - sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; + sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; "argparse-0.1.16" = { @@ -14598,6 +14625,15 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14607,6 +14643,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "npm-registry-client-7.3.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; + sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -14634,13 +14679,22 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.75.0" = { + "request-2.78.0" = { name = "request"; packageName = "request"; - version = "2.75.0"; + version = "2.78.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; - sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; + "sorted-union-stream-2.1.3" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; "unique-filename-1.1.0" = { @@ -14688,13 +14742,40 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "form-data-2.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.0.0"; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; - sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "stream-each-1.2.0" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; + sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + }; + }; + "stream-iterate-1.2.0" = { + name = "stream-iterate"; + packageName = "stream-iterate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; }; }; "unique-slug-2.0.0" = { @@ -14922,13 +15003,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.9" = { + "npm-3.10.10" = { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; "npmi-2.0.1" = { @@ -14976,6 +15057,24 @@ let sha1 = "27c90519196dc15015be02a34ea52986feab8877"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -15075,13 +15174,13 @@ let sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; }; }; - "got-5.6.0" = { + "got-5.7.1" = { name = "got"; packageName = "got"; - version = "5.6.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz"; - sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf"; + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; "registry-auth-token-3.1.0" = { @@ -15102,13 +15201,458 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "unzip-response-1.0.1" = { + "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; + "babybird-0.0.1" = { + name = "babybird"; + packageName = "babybird"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; + sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; + }; + }; + "connect-busboy-0.0.2" = { + name = "connect-busboy"; + packageName = "connect-busboy"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; + sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; + }; + }; + "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + name = "content-type"; + packageName = "content-type"; version = "1.0.1"; + src = fetchgit { + url = "https://github.com/wikimedia/content-type.git"; + rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "domino-1.0.27" = { + name = "domino"; + packageName = "domino"; + version = "1.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; + sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + }; + }; + "express-handlebars-3.0.0" = { + name = "express-handlebars"; + packageName = "express-handlebars"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; + }; + }; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + }; + }; + "gelf-stream-0.2.4" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; + sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; + }; + }; + "mediawiki-title-0.5.6" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; + sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; + }; + }; + "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/arlolra/negotiator.git"; + rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; + }; + }; + "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.8.0"; + src = fetchgit { + url = "https://github.com/tstarling/pegjs.git"; + rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; + sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; + }; + }; + "prfun-2.1.4" = { + name = "prfun"; + packageName = "prfun"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz"; + sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; + }; + }; + "service-runner-2.1.11" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + }; + }; + "simplediff-0.1.1" = { + name = "simplediff"; + packageName = "simplediff"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; + sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; + }; + }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; + "is-arguments-1.0.2" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; + sha1 = "07e30ad79531844179b642d2d8399435182c8727"; + }; + }; + "busboy-0.2.13" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; + sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "gelfling-0.2.0" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; + sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; + }; + }; + "bunyan-1.8.5" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + }; + }; + "bunyan-syslog-udp-0.1.0" = { + name = "bunyan-syslog-udp"; + packageName = "bunyan-syslog-udp"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; - sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; + }; + }; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + }; + }; + "hot-shots-4.3.1" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; + sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + }; + }; + "limitation-0.1.9" = { + name = "limitation"; + packageName = "limitation"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; + sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + }; + }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; + "dtrace-provider-0.8.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + }; + }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "safe-json-stringify-1.0.3" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; + sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + }; + }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; + "gelfling-0.3.1" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; + }; + }; + "kad-git+https://github.com/gwicke/kad.git#master" = { + name = "kad"; + packageName = "kad"; + version = "1.3.6"; + src = fetchgit { + url = "https://github.com/gwicke/kad.git"; + rev = "f35971036f43814043245da82b12d035b7bbfd16"; + sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; + }; + }; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; + }; + }; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; + }; + }; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; + }; + }; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; + }; + }; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + }; + }; + "msgpack5-3.4.1" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; + sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; + }; + }; + "dom-storage-2.0.2" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; + sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + }; + }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; "airplayer-2.0.0" = { @@ -15129,13 +15673,13 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "inquirer-1.2.2" = { + "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz"; - sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; "network-address-1.1.0" = { @@ -15309,13 +15853,13 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.1.0" = { + "dns-packet-1.1.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz"; - sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz"; + sha1 = "2369d45038af045f3898e6fa56862aed3f40296c"; }; }; "external-editor-1.1.1" = { @@ -15390,13 +15934,13 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-0.9.17" = { + "socket.io-1.6.0" = { name = "socket.io"; packageName = "socket.io"; - version = "0.9.17"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; - sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; + sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; }; }; "torrent-stream-0.18.1" = { @@ -15768,13 +16312,121 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "socket.io-client-0.9.16" = { + "engine.io-1.8.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; + sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.6.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "0.9.16"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; + sha1 = "5b668f4f771304dfeed179064708386fa6717853"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "engine.io-parser-1.3.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; + sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; + }; + }; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; - sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "engine.io-client-1.8.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; + sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; }; }; "bittorrent-dht-3.2.6" = { @@ -16390,15 +17042,6 @@ let sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; }; }; - "bunyan-1.8.4" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz"; - sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73"; - }; - }; "handlebars-2.0.0" = { name = "handlebars"; packageName = "handlebars"; @@ -16543,51 +17186,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "dtrace-provider-0.7.1" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz"; - sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04"; - }; - }; - "mv-2.1.1" = { - name = "mv"; - packageName = "mv"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; - sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; - }; - }; - "safe-json-stringify-1.0.3" = { - name = "safe-json-stringify"; - packageName = "safe-json-stringify"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; - }; - }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "rimraf-2.4.5" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; - }; - }; "uglify-js-2.3.6" = { name = "uglify-js"; packageName = "uglify-js"; @@ -17002,6 +17600,15 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17047,31 +17654,22 @@ let sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; }; }; - "longjohn-0.2.9" = { + "longjohn-0.2.11" = { name = "longjohn"; packageName = "longjohn"; - version = "0.2.9"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz"; - sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "node-appc-0.2.31" = { + "node-appc-0.2.39" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.31"; + version = "0.2.39"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; - sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; - }; - }; - "request-2.62.0" = { - name = "request"; - packageName = "request"; - version = "2.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz"; - sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; + sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; "sprintf-0.1.5" = { @@ -17083,22 +17681,22 @@ let sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }; }; - "winston-1.0.2" = { + "winston-1.1.2" = { name = "winston"; packageName = "winston"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; - sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; - "wrench-1.5.8" = { + "wrench-1.5.9" = { name = "wrench"; packageName = "wrench"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; }; }; "source-map-support-0.3.2" = { @@ -17128,85 +17726,58 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "diff-2.1.0" = { + "diff-2.2.1" = { name = "diff"; packageName = "diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; - sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; - }; - }; - "node-uuid-1.4.3" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; + sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; }; }; - "request-2.61.0" = { + "request-2.69.0" = { name = "request"; packageName = "request"; - version = "2.61.0"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz"; - sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; }; }; - "semver-5.0.1" = { + "semver-5.1.0" = { name = "semver"; packageName = "semver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; - sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; - }; - }; - "uglify-js-2.4.24" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; - }; - }; - "har-validator-1.8.0" = { - name = "har-validator"; - packageName = "har-validator"; - version = "1.8.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; }; }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; + "wrench-1.5.8" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }; }; - "yargs-3.5.4" = { - name = "yargs"; - packageName = "yargs"; - version = "3.5.4"; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "qs-5.1.0" = { + "qs-6.0.2" = { name = "qs"; packageName = "qs"; - version = "5.1.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; - sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; "bluebird-3.3.5" = { @@ -17227,13 +17798,13 @@ let sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; - "color-0.11.3" = { + "color-0.11.4" = { name = "color"; packageName = "color"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz"; - sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6"; + url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz"; + sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; }; }; "crossroads-0.12.2" = { @@ -17308,13 +17879,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.0" = { + "knockout-3.4.1" = { name = "knockout"; packageName = "knockout"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz"; - sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; + sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; "lodash-4.12.0" = { @@ -17416,13 +17987,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.5.0" = { + "color-convert-1.8.2" = { name = "color-convert"; packageName = "color-convert"; - version = "1.5.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; - sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; + sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; }; }; "color-string-0.3.0" = { @@ -17596,22 +18167,22 @@ let sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; }; }; - "editions-1.3.1" = { + "editions-1.3.3" = { name = "editions"; packageName = "editions"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz"; - sha1 = "008425f64dc1401db45ec110e06aa602562419c0"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; + sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.3.0" = { + "typechecker-4.4.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz"; - sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; + sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; }; }; "underscore-1.5.2" = { @@ -17785,24 +18356,6 @@ let sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -17812,15 +18365,6 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "set-blocking-1.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -17830,24 +18374,6 @@ let sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "symbol-0.2.3" = { name = "symbol"; packageName = "symbol"; @@ -17884,6 +18410,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.30" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; + sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -18149,7 +18684,7 @@ in sources."async-0.2.10" sources."optimist-0.3.7" sources."uglify-to-browserify-1.0.2" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."wordwrap-0.0.3" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { @@ -18165,7 +18700,7 @@ in }) sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.11" + sources."which-1.2.12" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" @@ -18184,10 +18719,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz"; - sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz"; + sha1 = "48e59f6be202122c0d71153efab4f924065da586"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18204,12 +18739,12 @@ in }) sources."azure-arm-authorization-2.0.0" sources."azure-arm-cdn-0.2.1" - sources."azure-arm-commerce-0.1.1" + sources."azure-arm-commerce-0.2.0" sources."azure-arm-compute-0.19.0" - sources."azure-arm-hdinsight-0.2.0" + sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - sources."azure-arm-iothub-0.1.1" + sources."azure-arm-iothub-0.1.4" sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" @@ -18250,7 +18785,6 @@ in sources."readable-stream-2.0.6" sources."validator-3.22.2" sources."xml2js-0.2.7" - sources."isarray-1.0.0" ]; }) sources."azure-arm-batch-0.3.0" @@ -18275,7 +18809,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.2" + sources."moment-2.16.0" sources."ms-rest-1.15.2" (sources."ms-rest-azure-1.15.2" // { dependencies = [ @@ -18299,7 +18833,11 @@ in sources."colors-0.6.2" ]; }) - sources."readable-stream-1.0.34" + (sources."readable-stream-1.0.34" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) (sources."request-2.74.0" // { dependencies = [ sources."extend-3.0.0" @@ -18331,32 +18869,12 @@ in sources."xmlbuilder-0.4.3" sources."read-1.0.7" sources."date-utils-1.2.21" - sources."jws-3.1.3" + sources."jws-3.1.4" sources."xmldom-0.1.22" sources."xpath.js-1.0.6" - sources."base64url-1.0.6" - sources."jwa-1.1.3" - (sources."concat-stream-1.4.10" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."meow-2.0.0" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."camelcase-keys-1.0.0" - sources."indent-string-1.2.2" - sources."minimist-1.2.0" - sources."object-assign-1.0.0" - sources."camelcase-1.2.1" - sources."map-obj-1.0.1" - sources."get-stdin-4.0.1" - sources."repeating-1.1.3" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" + sources."base64url-2.0.0" + sources."jwa-1.1.4" + sources."safe-buffer-5.0.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.7" sources."base64-url-1.3.3" @@ -18368,7 +18886,11 @@ in sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.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."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."stack-trace-0.0.9" sources."keypress-0.1.0" @@ -18399,13 +18921,10 @@ in }) sources."deep-equal-1.0.1" sources."i-0.3.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."rimraf-2.5.4" + sources."minimist-0.0.8" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -18423,7 +18942,6 @@ in (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" - sources."isarray-1.0.0" ]; }) sources."caseless-0.11.0" @@ -18446,14 +18964,14 @@ 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.12" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.2.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" @@ -18497,15 +19015,21 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.15" sources."galaxy-0.1.12" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) sources."http-response-object-1.1.0" sources."then-request-2.2.0" + sources."typedarray-0.0.6" sources."http-basic-2.5.1" sources."promise-7.1.1" sources."asap-2.0.5" @@ -18523,10 +19047,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; buildInputs = globalBuildInputs; meta = { @@ -18546,13 +19070,13 @@ in }; dependencies = [ sources."argparse-1.0.4" - sources."bower-1.7.9" + sources."bower-1.8.0" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."lodash-4.2.1" @@ -18586,11 +19110,11 @@ in sources."object-assign-2.1.1" sources."prepend-http-1.0.4" sources."read-all-stream-2.2.0" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -18627,12 +19151,12 @@ in sources."pinkie-2.0.4" (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."parse-json-2.2.0" @@ -18652,12 +19176,12 @@ in sources."natives-1.1.0" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."path-is-absolute-1.0.1" @@ -18673,13 +19197,13 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.4.1" - sources."debug-2.2.0" + sources."debug-2.3.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."ms-0.7.1" + sources."ms-0.7.2" sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; @@ -18738,12 +19262,12 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."resolve-1.1.7" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.4.1" + sources."stream-http-2.5.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -18809,9 +19333,9 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.1" + sources."asn1.js-4.9.0" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" @@ -18868,7 +19392,7 @@ in sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."fs-extended-0.2.1" sources."got-1.2.2" sources."internal-ip-1.2.0" @@ -18907,7 +19431,7 @@ in (sources."xml2js-0.4.17" // { dependencies = [ sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."xtend-4.0.1" @@ -18936,7 +19460,7 @@ in sources."thunky-0.1.0" sources."wrap-fn-0.1.5" sources."co-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."object-assign-1.0.0" (sources."meow-3.7.0" // { dependencies = [ @@ -18970,7 +19494,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -19020,13 +19544,13 @@ in ]; }) sources."windows-no-runnable-0.0.6" - (sources."mdns-js-0.5.0" // { + (sources."mdns-js-0.5.1" // { dependencies = [ sources."semver-5.1.1" ]; }) sources."plist-2.0.1" - sources."mdns-js-packet-0.2.0" + sources."dns-js-0.2.1" sources."qap-3.1.3" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" @@ -19044,7 +19568,7 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.4" + sources."magnet-uri-5.1.5" sources."parse-torrent-file-4.0.0" sources."simple-get-2.3.0" sources."thirty-two-1.0.2" @@ -19091,7 +19615,7 @@ in sources."randombytes-2.0.3" sources."run-parallel-1.1.6" sources."inherits-2.0.3" - sources."ip-1.1.3" + sources."ip-1.1.4" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -19141,13 +19665,13 @@ in sources."run-series-1.1.4" (sources."simple-peer-6.0.7" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) (sources."simple-websocket-4.1.0" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -19198,7 +19722,7 @@ in sources."isarray-1.0.0" ]; }) - sources."exit-on-epipe-0.0.1" + sources."exit-on-epipe-0.1.0" sources."commander-2.9.0" sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" @@ -19254,7 +19778,7 @@ in (sources."insight-0.8.3" // { dependencies = [ sources."async-1.5.2" - sources."request-2.76.0" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -19273,7 +19797,7 @@ in sources."semver-5.3.0" sources."shelljs-0.5.3" sources."unorm-1.4.1" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."sax-0.3.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -19324,9 +19848,11 @@ in sources."glob-7.0.6" sources."nopt-3.0.6" sources."npm-package-arg-4.1.1" + sources."readable-stream-2.1.5" sources."request-2.74.0" sources."semver-5.1.1" sources."tar-2.2.1" + sources."isarray-1.0.0" sources."form-data-1.0.1" ]; }) @@ -19417,7 +19943,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -19425,7 +19951,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.4.1" + sources."stream-http-2.5.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -19488,9 +20014,9 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.1" + sources."asn1.js-4.9.0" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" sources."is-buffer-1.1.4" @@ -19527,13 +20053,13 @@ in sources."ansi-regex-2.0.0" sources."accepts-1.3.3" sources."bytes-2.3.0" - sources."compressible-2.0.8" + sources."compressible-2.0.9" sources."debug-2.2.0" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.6.1" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -19556,21 +20082,17 @@ in sources."range-parser-1.2.0" sources."send-0.14.1" sources."serve-static-1.11.1" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."utils-merge-1.0.0" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."http-errors-1.5.1" sources."mime-1.3.4" - sources."setprototypeof-1.0.1" + sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."npm-package-arg-4.2.0" sources."promzard-0.3.0" @@ -19586,7 +20108,7 @@ in sources."mute-stream-0.0.6" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -19633,7 +20155,7 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."request-2.76.0" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -19654,7 +20176,7 @@ in sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.11" + sources."which-1.2.12" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" @@ -19678,18 +20200,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."commander-2.9.0" @@ -19747,9 +20269,10 @@ in sources."isarray-1.0.0" ]; }) + sources."node-uuid-1.4.7" (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."isexe-1.1.2" @@ -19762,12 +20285,15 @@ in }) sources."bplist-creator-0.0.4" sources."stream-buffers-0.2.6" - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."inquirer-0.10.1" sources."lodash.debounce-3.1.1" sources."object-assign-4.1.0" sources."os-name-1.0.3" - sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" @@ -19783,7 +20309,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."lodash._getnative-3.9.1" @@ -19927,9 +20453,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -19953,7 +20479,7 @@ in }) sources."binaryheap-0.0.3" sources."buffercursor-0.0.12" - sources."verror-1.8.1" + sources."verror-1.9.0" sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" sources."extsprintf-1.3.0" @@ -19998,7 +20524,7 @@ in }; dependencies = [ sources."JSONStream-0.8.4" - sources."basic-auth-1.0.4" + sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" sources."cors-2.8.1" sources."docker-parse-image-3.0.1" @@ -20055,7 +20581,7 @@ in sources."readable-stream-2.0.6" ]; }) - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -20079,7 +20605,7 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -20090,9 +20616,9 @@ in sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" - sources."ltgt-2.1.2" + sources."ltgt-2.1.3" sources."pull-level-2.0.3" - sources."pull-stream-3.4.5" + sources."pull-stream-3.5.0" sources."typewiselite-1.0.0" sources."bytewise-core-1.2.3" sources."typewise-1.0.3" @@ -20149,10 +20675,10 @@ in sources."async-2.0.1" sources."aws4-1.5.0" sources."optimist-0.6.1" - sources."request-2.76.0" + sources."request-2.79.0" sources."jsonparse-1.2.0" sources."through-2.3.8" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" @@ -20160,20 +20686,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -20223,7 +20749,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" ]; buildInputs = globalBuildInputs; @@ -20244,7 +20770,7 @@ in }; dependencies = [ sources."chalk-1.1.3" - sources."got-6.5.0" + sources."got-6.6.3" sources."has-ansi-2.0.0" sources."lodash.debounce-4.0.8" sources."log-update-1.0.2" @@ -20263,7 +20789,7 @@ in sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" sources."node-status-codes-2.0.1" - sources."timed-out-2.0.0" + sources."timed-out-3.0.0" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" @@ -20302,7 +20828,7 @@ in sources."path-exists-2.1.0" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -20327,16 +20853,16 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.9.0"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz"; - sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; + sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; }; dependencies = [ sources."babel-code-frame-6.16.0" sources."chalk-1.1.3" sources."concat-stream-1.5.2" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."doctrine-1.5.0" sources."escope-3.6.0" sources."espree-3.3.2" @@ -20344,23 +20870,23 @@ in sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" - sources."globals-9.12.0" + sources."globals-9.14.0" sources."ignore-3.2.0" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.15.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.2" sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."require-uncached-1.0.2" + sources."require-uncached-1.0.3" sources."shelljs-0.7.5" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" @@ -20387,7 +20913,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."es6-map-0.1.4" sources."es6-weak-map-2.0.1" (sources."esrecurse-4.1.0" // { @@ -20411,7 +20937,7 @@ in sources."flat-cache-1.2.1" sources."circular-json-0.3.1" sources."del-2.2.2" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."write-0.2.1" sources."globby-5.0.0" sources."is-path-cwd-1.0.0" @@ -20445,7 +20971,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" sources."number-is-nan-1.0.1" @@ -20471,7 +20997,7 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.1.7" - sources."ajv-4.8.2" + sources."ajv-4.9.0" sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -20511,7 +21037,7 @@ in dependencies = [ sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.7.9" + sources."bower-1.8.0" sources."glob-3.2.11" sources."inherits-2.0.3" sources."minimatch-0.3.0" @@ -20528,10 +21054,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz"; - sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9"; + url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz"; + sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2"; }; dependencies = [ (sources."cliff-0.1.10" // { @@ -20546,7 +21072,7 @@ in sources."optimist-0.6.0" ]; }) - sources."forever-monitor-1.6.0" + sources."forever-monitor-1.7.1" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -20591,7 +21117,7 @@ in sources."revalidator-0.1.8" sources."mute-stream-0.0.6" sources."chokidar-1.6.1" - sources."minimatch-2.0.10" + sources."minimatch-3.0.3" sources."ps-tree-0.0.3" sources."anymatch-1.3.0" sources."async-each-1.0.1" @@ -20599,12 +21125,8 @@ in sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - (sources."readdirp-2.1.0" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) - sources."fsevents-1.0.14" + sources."readdirp-2.1.0" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -20639,12 +21161,9 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.9" - sources."readable-stream-2.1.5" + sources."graceful-fs-4.1.10" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" @@ -20658,25 +21177,26 @@ in ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."object-assign-4.1.0" ]; @@ -20690,7 +21210,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -20703,20 +21223,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -20764,13 +21284,9 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" - (sources."glob-7.1.1" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) + sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" @@ -20778,13 +21294,12 @@ in sources."block-stream-0.0.9" sources."fstream-1.0.10" sources."debug-2.2.0" - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) + sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { dependencies = [ sources."optimist-0.2.8" @@ -20883,7 +21398,7 @@ in sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.20" // { + (sources."clean-css-3.4.21" // { dependencies = [ sources."commander-2.8.1" ]; @@ -20913,7 +21428,7 @@ in }) sources."source-map-0.4.4" sources."graceful-readlink-1.0.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."acorn-2.7.0" sources."is-promise-2.1.0" sources."promise-6.1.0" @@ -20948,7 +21463,7 @@ in sources."weak-map-1.0.5" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."nan-2.4.0" ]; buildInputs = globalBuildInputs; @@ -20974,8 +21489,8 @@ in sources."interpret-1.0.1" sources."liftoff-2.3.0" sources."minimist-1.2.0" - sources."orchestrator-0.3.7" - sources."pretty-hrtime-1.0.2" + sources."orchestrator-0.3.8" + sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" sources."tildify-1.2.0" sources."v8flags-2.0.11" @@ -20997,7 +21512,7 @@ in sources."ansi-regex-2.0.0" sources."array-differ-1.0.0" sources."array-uniq-1.0.3" - sources."beeper-1.1.0" + sources."beeper-1.1.1" sources."dateformat-1.0.12" sources."fancy-log-1.2.0" sources."gulplog-1.0.0" @@ -21048,7 +21563,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -21142,7 +21657,7 @@ in sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.11" + sources."which-1.2.12" sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" @@ -21319,12 +21834,12 @@ in sources."escodegen-1.8.1" sources."esprima-2.7.3" sources."glob-5.0.15" - (sources."handlebars-4.0.5" // { + (sources."handlebars-4.0.6" // { dependencies = [ sources."source-map-0.4.4" ]; }) - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21334,7 +21849,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.1.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -21345,7 +21860,7 @@ in sources."type-check-0.3.2" sources."levn-0.3.0" sources."fast-levenshtein-2.0.5" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."minimatch-3.0.3" @@ -21500,10 +22015,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; dependencies = [ sources."argparse-1.0.9" @@ -21533,7 +22048,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."connect-3.5.0" @@ -21549,7 +22064,7 @@ in ]; }) sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."http-proxy-1.15.2" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" @@ -21574,21 +22089,21 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -21596,7 +22111,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -21631,7 +22146,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21642,25 +22157,29 @@ in sources."node-pre-gyp-0.6.31" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."request-2.76.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; }) sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.3.0" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."readable-stream-2.1.5" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -21671,7 +22190,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -21684,18 +22203,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -21911,9 +22430,11 @@ in }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + sources."debug-2.3.3" sources."vary-1.1.0" + sources."ms-0.7.2" ]; }) sources."morgan-1.6.1" @@ -21921,8 +22442,16 @@ in sources."on-headers-1.0.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - sources."serve-favicon-2.3.0" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) (sources."serve-index-1.7.3" // { dependencies = [ sources."escape-html-1.0.3" @@ -21936,7 +22465,7 @@ in sources."statuses-1.2.1" ]; }) - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."vhost-3.0.2" sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" @@ -21949,20 +22478,20 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.8" - sources."mime-types-2.1.12" + sources."compressible-2.0.9" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" - sources."csrf-3.0.3" - sources."base64-url-1.2.2" + sources."csrf-3.0.4" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.1.1" + sources."uid-safe-2.1.3" sources."random-bytes-1.0.0" sources."crc-3.3.0" sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" @@ -21984,7 +22513,7 @@ in sources."uid2-0.0.3" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22024,7 +22553,7 @@ in sources."isarray-0.0.1" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" @@ -22211,7 +22740,7 @@ in sources."nijs-0.0.23" sources."chownr-1.0.1" sources."concat-stream-1.5.2" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" (sources."npm-package-arg-4.2.0" // { @@ -22220,7 +22749,7 @@ in ]; }) sources."once-1.4.0" - sources."request-2.76.0" + sources."request-2.79.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" @@ -22248,20 +22777,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22311,7 +22840,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -22333,7 +22862,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."config-chain-1.1.11" @@ -22377,18 +22906,18 @@ in dependencies = [ sources."fstream-1.0.10" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-3.1.2" sources."osenv-0.1.3" sources."path-array-1.0.1" - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -22405,7 +22934,7 @@ in sources."gauge-2.6.0" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -22420,16 +22949,16 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" @@ -22439,20 +22968,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22500,7 +23029,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."isexe-1.1.2" @@ -22524,17 +23053,22 @@ in dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.2.0" - sources."express-4.14.0" + sources."debug-2.3.3" + (sources."express-4.14.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" sources."rc-1.1.6" sources."semver-4.3.6" - sources."serve-favicon-2.3.0" + sources."serve-favicon-2.3.2" sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" - sources."which-1.2.11" + sources."which-1.2.12" sources."ws-1.1.1" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -22572,7 +23106,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -22600,7 +23134,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -22613,7 +23147,7 @@ in sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22624,7 +23158,12 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + (sources."finalhandler-0.5.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -22634,24 +23173,29 @@ in sources."proxy-addr-1.1.2" sources."qs-6.2.0" sources."range-parser-1.2.0" - sources."send-0.14.1" + (sources."send-0.14.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."serve-static-1.11.1" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."vary-1.1.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.6.1" - sources."mime-db-1.24.0" - sources."statuses-1.3.0" + sources."mime-db-1.25.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."mime-1.3.4" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" @@ -22673,8 +23217,8 @@ in ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.0" - (sources."request-2.76.0" // { + sources."npmlog-4.0.1" + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; @@ -22682,18 +23226,21 @@ in sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."once-1.3.3" + sources."readable-stream-2.1.5" sources."rimraf-2.5.4" + sources."ms-0.7.1" sources."glob-7.1.1" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -22705,7 +23252,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.0.0" sources."aws-sign2-0.6.0" @@ -22714,18 +23261,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22805,33 +23352,34 @@ in dependencies = [ sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22843,7 +23391,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -22856,20 +23404,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22917,7 +23465,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -22931,7 +23479,7 @@ in sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."debug-2.2.0" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" @@ -22955,7 +23503,11 @@ in }; dependencies = [ sources."chokidar-1.6.1" - sources."debug-2.2.0" + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" @@ -22976,7 +23528,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -23011,8 +23563,8 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.9" - sources."readable-stream-2.1.5" + sources."graceful-fs-4.1.10" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23023,26 +23575,28 @@ in sources."node-pre-gyp-0.6.31" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -23053,7 +23607,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -23066,20 +23620,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -23127,7 +23681,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23161,7 +23715,11 @@ in sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."is-npm-1.0.0" sources."latest-version-1.0.1" sources."repeating-1.1.3" @@ -23169,7 +23727,6 @@ in sources."string-length-1.0.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.3" - sources."uuid-2.0.3" sources."write-file-atomic-1.2.0" sources."xdg-basedir-2.0.0" sources."os-homedir-1.0.2" @@ -23255,17 +23812,17 @@ in sources."when-3.7.7" sources."ws-0.8.1" sources."xml2js-0.4.17" - sources."node-red-node-feedparser-0.1.6" - sources."node-red-node-email-0.1.11" - (sources."node-red-node-twitter-0.1.7" // { + sources."node-red-node-feedparser-0.1.7" + sources."node-red-node-email-0.1.12" + (sources."node-red-node-twitter-0.1.9" // { dependencies = [ - sources."request-2.76.0" - sources."form-data-2.1.1" + sources."request-2.79.0" + sources."form-data-2.1.2" sources."qs-6.3.0" ]; }) - sources."node-red-node-rbe-0.1.5" - sources."node-red-node-serialport-0.4.0" + sources."node-red-node-rbe-0.1.6" + sources."node-red-node-serialport-0.4.1" (sources."bcrypt-0.8.7" // { dependencies = [ sources."nan-2.3.5" @@ -23275,18 +23832,18 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -23313,7 +23870,7 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23323,8 +23880,8 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."vary-1.1.0" - sources."moment-timezone-0.5.7" - sources."moment-2.15.2" + sources."moment-timezone-0.5.9" + sources."moment-2.16.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -23349,7 +23906,7 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."stream-consume-0.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -23365,7 +23922,7 @@ in sources."concat-map-0.0.1" sources."async-0.1.22" sources."retry-0.6.1" - sources."cookies-0.6.1" + sources."cookies-0.6.2" sources."i18next-client-1.10.3" sources."json5-0.2.0" sources."keygrip-1.0.1" @@ -23393,7 +23950,7 @@ in sources."pump-1.0.1" sources."reinterval-1.1.0" sources."split2-2.1.0" - (sources."websocket-stream-3.3.0" // { + (sources."websocket-stream-3.3.3" // { dependencies = [ sources."ws-1.1.1" ]; @@ -23525,7 +24082,7 @@ in sources."nan-2.4.0" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" (sources."feedparser-1.1.3" // { dependencies = [ sources."sax-0.6.1" @@ -23649,17 +24206,23 @@ in ]; }) sources."encoding-0.1.12" - sources."uue-3.0.0" + sources."uue-3.1.0" sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" + sources."uuid-3.0.0" sources."asynckit-0.4.0" - sources."serialport-4.0.3" + (sources."serialport-4.0.6" // { + dependencies = [ + sources."debug-2.3.3" + sources."ms-0.7.2" + ]; + }) sources."lie-3.1.0" (sources."node-pre-gyp-0.6.31" // { dependencies = [ - sources."request-2.76.0" - sources."form-data-2.1.1" + sources."request-2.79.0" + sources."form-data-2.1.2" sources."qs-6.3.0" ]; }) @@ -23670,17 +24233,18 @@ in sources."minimist-0.0.8" ]; }) - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" sources."rc-1.1.6" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -23690,7 +24254,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."deep-extend-0.4.1" @@ -23762,14 +24326,14 @@ in sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.2.5" + sources."buffer-crc32-0.2.6" sources."fresh-0.1.0" sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."qs-0.5.1" @@ -23821,7 +24385,7 @@ in sources."xoauth2-0.1.8" sources."wordwrap-0.0.3" sources."minimist-0.0.10" - (sources."raw-socket-1.5.0" // { + (sources."raw-socket-1.5.1" // { dependencies = [ sources."nan-2.3.5" ]; @@ -23841,12 +24405,13 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; + sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; }; dependencies = [ + sources."JSONStream-1.2.1" sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -23864,7 +24429,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -23882,6 +24447,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" + sources."mississippi-1.2.0" sources."mkdirp-0.5.1" (sources."node-gyp-3.4.0" // { dependencies = [ @@ -23894,13 +24460,17 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.2.1" // { + (sources."npm-registry-client-7.3.0" // { dependencies = [ sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.0" + (sources."npmlog-4.0.1" // { + dependencies = [ + sources."gauge-2.7.1" + ]; + }) sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.3" @@ -23916,13 +24486,20 @@ in sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" - sources."request-2.75.0" + sources."request-2.78.0" sources."retry-0.10.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + sources."from2-1.3.0" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -23931,7 +24508,7 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" @@ -23945,6 +24522,8 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" + sources."jsonparse-1.2.0" + sources."through-2.3.8" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" @@ -23959,6 +24538,40 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + sources."end-of-stream-1.0.0" + sources."once-1.3.3" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.1" + sources."pumpify-1.3.5" + sources."stream-each-1.2.0" + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."stream-shift-1.0.0" + sources."xtend-4.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" sources."are-we-there-yet-1.1.2" @@ -23971,29 +24584,18 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" @@ -24003,26 +24605,21 @@ in sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.0.0" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -24040,7 +24637,6 @@ in sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.0" - sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -24073,8 +24669,9 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.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."builtins-0.0.7" @@ -24131,7 +24728,7 @@ in sources."coffee-script-1.11.1" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.76.0" + sources."request-2.79.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -24139,27 +24736,27 @@ in sources."rimraf-2.5.4" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -24209,7 +24806,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -24224,10 +24821,10 @@ in sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -24241,7 +24838,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" (sources."config-chain-1.1.11" // { @@ -24298,9 +24895,9 @@ in sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."json-parse-helpfulerror-1.0.3" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."node-alias-1.0.4" - sources."npm-3.10.9" + sources."npm-3.10.10" (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" @@ -24340,7 +24937,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -24376,7 +24973,11 @@ in ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.0" + (sources."npmlog-4.0.1" // { + dependencies = [ + sources."gauge-2.7.1" + ]; + }) sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.3" @@ -24405,7 +25006,7 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" @@ -24444,13 +25045,13 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" @@ -24490,7 +25091,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.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -24535,7 +25136,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" @@ -24562,12 +25163,11 @@ in sources."uuid-2.0.3" sources."is-obj-1.0.1" sources."package-json-2.4.0" - sources."got-5.6.0" + sources."got-5.7.1" sources."registry-auth-token-3.1.0" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" - sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" @@ -24575,8 +25175,8 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."timed-out-2.0.0" - sources."unzip-response-1.0.1" + sources."timed-out-3.0.0" + sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."error-ex-1.3.0" @@ -24598,6 +25198,357 @@ in }; production = true; }; + parsoid = nodeEnv.buildNodePackage { + name = "parsoid"; + packageName = "parsoid"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; + sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + }; + dependencies = [ + sources."async-0.9.2" + sources."babybird-0.0.1" + (sources."body-parser-1.15.2" // { + dependencies = [ + sources."content-type-1.0.2" + ]; + }) + (sources."compression-1.6.2" // { + dependencies = [ + sources."bytes-2.3.0" + ]; + }) + 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."diff-1.4.0" + sources."domino-1.0.27" + sources."entities-1.1.1" + (sources."express-4.14.0" // { + dependencies = [ + sources."content-type-1.0.2" + sources."finalhandler-0.5.0" + ]; + }) + sources."express-handlebars-3.0.0" + sources."finalhandler-0.5.1" + sources."gelf-stream-0.2.4" + sources."js-yaml-3.7.0" + sources."mediawiki-title-0.5.6" + sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" + sources."node-uuid-1.4.7" + sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" + sources."prfun-2.1.4" + (sources."request-2.79.0" // { + dependencies = [ + sources."qs-6.3.0" + ]; + }) + sources."semver-5.3.0" + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + (sources."service-runner-2.1.11" // { + dependencies = [ + sources."gelf-stream-1.1.1" + sources."yargs-5.0.0" + sources."gelfling-0.3.1" + sources."cliui-3.2.0" + sources."window-size-0.2.0" + ]; + }) + sources."simplediff-0.1.1" + (sources."yargs-4.8.1" // { + dependencies = [ + sources."cliui-3.2.0" + sources."window-size-0.2.0" + sources."yargs-parser-2.4.1" + sources."camelcase-3.0.0" + ]; + }) + sources."asap-2.0.5" + sources."is-arguments-1.0.2" + sources."bytes-2.4.0" + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."http-errors-1.5.1" + sources."iconv-lite-0.4.13" + sources."on-finished-2.3.0" + sources."qs-6.2.0" + sources."raw-body-2.1.7" + sources."type-is-1.6.14" + sources."ms-0.7.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" + sources."accepts-1.3.3" + sources."compressible-2.0.9" + sources."on-headers-1.0.1" + sources."vary-1.1.0" + sources."busboy-0.2.13" + sources."dicer-0.2.5" + sources."readable-stream-1.1.14" + sources."streamsearch-0.1.2" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."fresh-0.3.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.2" + sources."range-parser-1.2.0" + sources."send-0.14.1" + sources."serve-static-1.11.1" + sources."utils-merge-1.0.0" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.1.1" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."glob-6.0.4" + sources."graceful-fs-4.1.10" + (sources."handlebars-4.0.6" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."object.assign-4.0.4" + sources."promise-7.1.1" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."optimist-0.6.1" + sources."source-map-0.4.4" + (sources."uglify-js-2.7.4" // { + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.5.6" + sources."yargs-3.10.0" + ]; + }) + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + 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.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."function-bind-1.1.0" + sources."object-keys-1.0.11" + sources."define-properties-1.1.2" + sources."foreach-2.0.5" + sources."gelfling-0.2.0" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.2" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + 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.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."bluebird-3.4.6" + sources."bunyan-1.8.5" + sources."bunyan-syslog-udp-0.1.0" + sources."hot-shots-4.3.1" + (sources."limitation-0.1.9" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."dtrace-provider-0.8.0" + sources."mv-2.1.1" + sources."safe-json-stringify-1.0.3" + sources."moment-2.16.0" + sources."nan-2.4.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ncp-2.0.0" + sources."rimraf-2.4.5" + sources."kad-git+https://github.com/gwicke/kad.git#master" + sources."clarinet-0.11.0" + sources."colors-1.1.2" + sources."hat-0.0.3" + (sources."kad-fs-0.0.4" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."kad-localstorage-0.0.7" + (sources."kad-memstore-0.0.1" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."lodash-3.10.1" + sources."merge-1.2.0" + (sources."msgpack5-3.4.1" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."buffer-shims-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."dom-storage-2.0.2" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + sources."string-width-1.0.2" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-3.2.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + sources."lcid-1.0.0" + 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."load-json-file-1.1.0" + sources."normalize-package-data-2.3.5" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."hosted-git-info-2.1.5" + 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."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Mediawiki parser for the VisualEditor."; + homepage = "https://github.com/wikimedia/parsoid#readme"; + license = "GPL-2.0+"; + }; + production = true; + }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -24609,9 +25560,9 @@ in dependencies = [ sources."airplayer-2.0.0" sources."clivas-0.2.0" - (sources."inquirer-1.2.2" // { + (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."keypress-0.2.1" @@ -24657,7 +25608,7 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" @@ -24686,7 +25637,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" sources."string-width-1.0.2" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-flatten-2.1.0" @@ -24695,9 +25646,10 @@ in sources."dns-txt-2.0.2" sources."multicast-dns-6.1.0" sources."multicast-dns-service-types-1.1.0" - sources."dns-packet-1.1.0" + sources."dns-packet-1.1.1" sources."thunky-0.1.0" - sources."ip-1.1.3" + sources."ip-1.1.4" + sources."safe-buffer-5.0.1" sources."meow-3.7.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -24727,7 +25679,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -24759,7 +25711,7 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.4" + sources."magnet-uri-5.1.5" sources."parse-torrent-file-4.0.0" sources."simple-get-2.3.0" sources."thirty-two-1.0.2" @@ -24833,7 +25785,7 @@ in sources."bencode-0.8.0" ]; }) - sources."debug-2.2.0" + sources."debug-2.3.3" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" @@ -24858,7 +25810,7 @@ in sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" sources."ultron-1.0.2" - sources."ms-0.7.1" + sources."ms-0.7.2" ]; buildInputs = globalBuildInputs; meta = { @@ -24871,10 +25823,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.0.30"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz"; - sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; + sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; }; dependencies = [ sources."connect-multiparty-1.2.5" @@ -24889,7 +25841,11 @@ in sources."pump-1.0.1" sources."range-parser-1.2.0" sources."read-torrent-1.3.0" - sources."socket.io-0.9.17" + (sources."socket.io-1.6.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) (sources."torrent-stream-0.18.1" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -25022,32 +25978,84 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - sources."socket.io-client-0.9.16" - sources."policyfile-0.0.4" + (sources."engine.io-1.8.0" // { + dependencies = [ + sources."debug-2.3.3" + sources."cookie-0.3.1" + ]; + }) + sources."has-binary-0.1.7" + sources."object-assign-4.1.0" + (sources."socket.io-adapter-0.5.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-client-1.6.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."component-emitter-1.1.2" + sources."ms-0.7.1" + ]; + }) + sources."ms-0.7.2" + (sources."accepts-1.3.3" // { + dependencies = [ + sources."mime-types-2.1.13" + sources."negotiator-0.6.1" + sources."mime-db-1.25.0" + ]; + }) sources."base64id-0.1.0" - sources."redis-0.7.3" - sources."uglify-js-1.2.5" - (sources."ws-0.4.32" // { + (sources."engine.io-parser-1.3.1" // { dependencies = [ - sources."commander-2.1.0" + sources."has-binary-0.1.6" ]; }) - sources."xmlhttprequest-1.4.2" - sources."active-x-obfuscator-0.0.1" - sources."nan-1.0.0" - sources."tinycolor-0.0.1" + sources."ws-1.1.1" + sources."after-0.8.1" + 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."zeparser-0.0.5" + sources."ultron-1.0.2" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + sources."indexof-0.0.1" + sources."object-component-0.0.3" + 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."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.2.0" + sources."debug-2.3.3" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.2.0" + sources."debug-2.3.3" ]; }) sources."bncode-0.5.3" @@ -25056,7 +26064,7 @@ in sources."ip-0.3.3" (sources."ip-set-1.0.1" // { dependencies = [ - sources."ip-1.1.3" + sources."ip-1.1.4" ]; }) sources."peer-wire-swarm-0.9.2" @@ -25071,9 +26079,8 @@ in sources."run-parallel-1.1.6" sources."simple-get-1.4.3" sources."string2compact-1.2.2" - sources."ms-0.7.1" sources."ip-regex-1.0.3" - sources."unzip-response-1.0.1" + sources."unzip-response-1.0.2" sources."ipaddr.js-1.2.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" @@ -25098,7 +26105,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."isexe-1.1.2" ]; buildInputs = globalBuildInputs; @@ -25125,7 +26132,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" @@ -25141,7 +26148,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -25164,7 +26171,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.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -25179,8 +26186,8 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" + sources."lodash-4.17.2" + sources."mime-db-1.25.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" (sources."sshpk-1.10.1" // { @@ -25257,7 +26264,7 @@ in sources."commander-2.9.0" sources."detective-4.3.2" sources."glob-5.0.15" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."iconv-lite-0.4.13" sources."mkdirp-0.5.1" sources."private-0.1.6" @@ -25280,7 +26287,7 @@ in sources."source-map-0.5.6" sources."ast-types-0.8.15" sources."base62-0.1.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -25340,7 +26347,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -25356,13 +26363,12 @@ in sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.76.0" - sources."node-uuid-1.4.7" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -25376,7 +26382,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" (sources."har-validator-2.0.6" // { dependencies = [ sources."commander-2.9.0" @@ -25387,11 +26393,12 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -25440,7 +26447,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -25494,13 +26501,13 @@ in ]; }) sources."commander-2.9.0" - sources."js-yaml-3.6.1" - (sources."cookies-0.6.1" // { + sources."js-yaml-3.7.0" + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" ]; }) - (sources."request-2.76.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; @@ -25509,7 +26516,7 @@ in sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.4" + sources."bunyan-1.8.5" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -25518,11 +26525,10 @@ in sources."JSONStream-1.2.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) (sources."readable-stream-1.1.14" // { @@ -25573,12 +26579,12 @@ in sources."http-errors-1.3.1" ]; }) - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."vary-1.0.1" sources."utils-merge-1.0.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -25593,7 +26599,7 @@ in sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.8" + sources."compressible-2.0.9" sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" sources."argparse-1.0.9" @@ -25606,18 +26612,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -25668,10 +26674,10 @@ in sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.7.1" + sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" + sources."moment-2.16.0" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -25694,7 +26700,7 @@ in }) sources."wordwrap-0.0.3" sources."source-map-0.1.43" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."markdown-it-4.4.0" sources."sanitize-html-1.13.0" sources."entities-1.1.1" @@ -25703,7 +26709,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" ]; }) sources."regexp-quote-0.0.0" @@ -25751,17 +26757,17 @@ in sources."readdirp-2.1.0" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."minimatch-3.0.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -25846,7 +26852,7 @@ in sources."semver-4.3.6" sources."spdy-1.32.5" sources."tunnel-agent-0.4.3" - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25896,7 +26902,7 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -25925,12 +26931,12 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" sources."minimist-0.0.8" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -25941,7 +26947,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -25993,13 +26999,13 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; - sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; + sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; }; dependencies = [ - sources."async-1.4.2" + sources."async-2.1.2" sources."colors-1.1.2" (sources."fields-0.1.24" // { dependencies = [ @@ -26007,68 +27013,71 @@ in ]; }) sources."humanize-0.0.9" - sources."longjohn-0.2.9" - sources."moment-2.10.6" - (sources."node-appc-0.2.31" // { + sources."longjohn-0.2.11" + sources."moment-2.16.0" + (sources."node-appc-0.2.39" // { dependencies = [ - sources."request-2.61.0" - sources."semver-5.0.1" + sources."async-1.5.2" + sources."request-2.69.0" + sources."semver-5.1.0" + sources."wrench-1.5.8" ]; }) - (sources."request-2.62.0" // { + (sources."request-2.78.0" // { dependencies = [ - sources."qs-5.1.0" + sources."form-data-2.1.2" + sources."qs-6.3.0" + sources."tough-cookie-2.3.2" ]; }) - sources."semver-5.0.3" + sources."semver-5.3.0" sources."sprintf-0.1.5" sources."temp-0.8.3" - (sources."winston-1.0.2" // { + (sources."winston-1.1.2" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" ]; }) - sources."wrench-1.5.8" + sources."wrench-1.5.9" + sources."lodash-4.17.2" sources."keypress-0.2.1" sources."source-map-support-0.3.2" sources."source-map-0.1.32" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."adm-zip-0.4.7" - sources."diff-2.1.0" - sources."node-uuid-1.4.3" + sources."diff-2.2.1" + sources."node-uuid-1.4.7" sources."optimist-0.6.1" - (sources."uglify-js-2.4.24" // { + (sources."uglify-js-2.6.1" // { dependencies = [ sources."async-0.2.10" - sources."source-map-0.1.34" + sources."source-map-0.5.6" ]; }) - sources."xmldom-0.1.19" + sources."xmldom-0.1.22" sources."wordwrap-0.0.3" sources."minimist-0.0.10" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" sources."bl-1.0.3" sources."caseless-0.11.0" + sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.1.2" - ]; - }) + sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."qs-4.0.0" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.3.2" - sources."http-signature-0.11.0" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" - sources."hawk-3.1.3" - sources."aws-sign2-0.5.0" + sources."qs-6.0.2" sources."stringstream-0.0.5" - sources."combined-stream-1.0.5" - sources."isstream-0.1.2" - sources."har-validator-1.8.0" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" sources."inherits-2.0.3" @@ -26076,21 +27085,11 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" - sources."punycode-1.4.1" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" sources."delayed-stream-1.0.0" - sources."bluebird-2.11.0" sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -26103,15 +27102,58 @@ in sources."jsonpointer-4.0.0" sources."xtend-4.0.1" sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.25.0" sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.5.4" // { + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { dependencies = [ sources."wordwrap-0.0.2" ]; }) - sources."camelcase-1.2.1" 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.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."asynckit-0.4.0" + sources."punycode-1.4.1" sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" sources."cycle-1.0.3" @@ -26130,10 +27172,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz"; - sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; + sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; }; buildInputs = globalBuildInputs; meta = { @@ -26191,7 +27233,7 @@ in sources."bluebird-3.3.5" sources."blueimp-md5-2.3.1" sources."body-parser-1.15.2" - sources."color-0.11.3" + sources."color-0.11.4" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-1.2.0" @@ -26210,7 +27252,7 @@ in sources."getmac-1.2.1" sources."hasher-1.2.0" sources."keen.io-0.1.3" - sources."knockout-3.4.0" + sources."knockout-3.4.1" sources."lodash-4.12.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -26238,11 +27280,11 @@ in }) (sources."npm-registry-client-7.1.2" // { dependencies = [ - sources."request-2.76.0" + sources."request-2.79.0" sources."retry-0.8.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -26313,23 +27355,23 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."clone-1.0.2" - sources."color-convert-1.5.0" + sources."color-convert-1.8.2" sources."color-string-0.3.0" sources."color-name-1.1.1" sources."cookie-0.3.1" @@ -26440,8 +27482,8 @@ in }) sources."extract-opts-3.3.1" sources."eachr-3.2.0" - sources."editions-1.3.1" - sources."typechecker-4.3.0" + sources."editions-1.3.3" + sources."typechecker-4.4.0" sources."underscore-1.5.2" sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -26463,7 +27505,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -26526,7 +27568,7 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -26657,6 +27699,7 @@ in ]; }) sources."typedarray-0.0.6" + sources."uuid-3.0.0" sources."asynckit-0.4.0" sources."punycode-1.4.1" sources."passport-strategy-1.0.0" @@ -26768,7 +27811,7 @@ in sources."is-utf8-0.2.1" sources."read-pkg-1.1.0" sources."path-type-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" ]; @@ -26798,7 +27841,7 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.29" + sources."tmp-0.0.30" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.11" // { dependencies = [ @@ -26824,7 +27867,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -26838,7 +27881,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -26859,7 +27902,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.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -26874,8 +27917,8 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" + sources."lodash-4.17.2" + sources."mime-db-1.25.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" (sources."sshpk-1.10.1" // { @@ -26980,18 +28023,18 @@ in sources."source-map-0.4.4" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."json5-0.5.0" sources."object-assign-4.1.0" sources."errno-0.1.4" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27069,7 +28112,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -27108,25 +28151,26 @@ in sources."nan-2.4.0" sources."node-pre-gyp-0.6.31" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -27136,7 +28180,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -27149,20 +28193,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" (sources."chalk-1.1.3" // { @@ -27213,7 +28257,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -27226,7 +28270,7 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" sources."source-list-map-0.1.6" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 544db9e0d78b..feeb94a5c462 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,32 +1,39 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in -let version = "0.1.2"; in +buildOcaml rec { + name = "asn1-combinators"; + version = "0.1.3"; -stdenv.mkDerivation { - name = "ocaml-asn1-combinators-${version}"; + minimumSupportedOcamlVersion = "4.01"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz"; - sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5"; + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-asn1-combinators"; + rev = "v${version}"; + sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; }; - buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml findlib ounit topkg opam ]; + propagatedBuildInputs = [ result cstruct zarith ]; createFindlibDestdir = true; - configureFlags = "--enable-tests"; + buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true"; + + installPhase = '' + opam-installer --script --prefix=$out | sh + ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib + ''; + doCheck = true; - checkTarget = "test"; + checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; description = "Combinators for expressing ASN.1 grammars in OCaml"; - platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd2; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 }; } diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 904a214c34f5..d24c61745104 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: -let version = "2.5.2"; in +let version = "2.5.3"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; + sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index dd6cffb979c5..8c1aac4d83b2 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,5 +1,5 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools -, async_p4 ? null, lwt ? null, camlp4 +{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools +, async ? null, lwt ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.01"; @@ -22,10 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ]; + configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ]; - propagatedBuildInputs = [ ocplib-endian sexplib_p4 ]; + buildInputs = [ ocaml findlib ppx_tools lwt async ]; + propagatedBuildInputs = [ ocplib-endian sexplib ]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix new file mode 100644 index 000000000000..a7290c8bb98f --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -0,0 +1,29 @@ +{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }: + +buildOcaml rec { + version = "0.3"; + name = "erm_xmpp"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xmpp"; + rev = "eee18bd3dd343550169969c0b45548eafd51cfe1"; + sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ erm_xml nocrypto ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + buildPhase = "ocaml setup.ml -build"; + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/hannesm/xmpp; + description = "OCaml based XMPP implementation (fork)"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 839a49615cd8..9592e9a68d81 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20160526" then "1i6yqxhs29n6qcvi6c5qbg5mh8752ywsyv1dr6x1qcv0ncqpxhns" + else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index fab048a9a9f8..d7f7ae0e3655 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib +, lwt ? null}: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +with stdenv.lib; +let withLwt = lwt != null; in -stdenv.mkDerivation rec { - name = "ocaml-nocrypto-${version}"; - version = "0.5.1"; +buildOcaml rec { + name = "nocrypto"; + version = "0.5.3"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; - sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-nocrypto"; + rev = "v${version}"; + sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; }; - buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; + + configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; - configureFlags = "--enable-tests"; doCheck = true; checkTarget = "test"; createFindlibDestdir = true; @@ -22,7 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix new file mode 100644 index 000000000000..3178789c3993 --- /dev/null +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib +, result, uucp, uuseg, uutf +, lwt ? null }: + +with stdenv.lib; + +let withLwt = lwt != null; in + +buildOcaml rec { + version = "0.1.1"; + name = "notty"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "pqwy"; + repo = "notty"; + rev = "v${version}"; + sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01"; + }; + + buildInputs = [ findlib ]; + propagatedBuildInputs = [ result uucp uuseg uutf ] ++ + optional withLwt [ lwt ]; + + configureFlags = [ "--enable-unix" ] ++ + (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]); + + configurePhase = "./configure --prefix $out $configureFlags"; + + meta = { + inherit (src.meta) homepage; + description = "Declarative terminal graphics for OCaml"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix new file mode 100644 index 000000000000..4ce3ac6dff30 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib }: + +let + pname = "ocplib-simplex"; + version = "0.3"; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "OCamlPro-Iguernlala"; + repo = pname; + rev = version; + sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; + }; + + buildInputs = [ autoreconfHook ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; + homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix new file mode 100644 index 000000000000..dfee365cd750 --- /dev/null +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -0,0 +1,43 @@ +{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, + ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}: + +let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in + +buildOcaml rec { + name = "otr"; + version = "0.3.3"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "ocaml-otr"; + rev = "${version}"; + sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; + }; + + buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ]; + propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ]; + + buildPhase = '' + ocaml ${ocamlFlags} pkg/pkg.ml build \ + --tests true + ''; + + installPhase = '' + opam-installer --prefix=$out --script | sh + ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + doCheck = true; + checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/ocaml-otr; + description = "Off-the-record messaging protocol, purely in OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix new file mode 100644 index 000000000000..b38138c55731 --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis +, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit +, lwt ? null}: + +with stdenv.lib; + +let withLwt = lwt != null; in + +buildOcaml rec { + version = "0.7.1"; + name = "tls"; + + minimunSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-tls"; + rev = "${version}"; + sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; + }; + + buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ]; + propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + optional withLwt lwt; + + configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ + optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; + + doCheck = true; + checkTarget = "test"; + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/mirleft/ocaml-tls; + description = "TLS in pure OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index c44ccb18982a..ab82f6abdcbb 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,32 @@ -{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }: +{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: -let version = "0.5.0"; in +buildOcaml rec { + name = "x509"; + version = "0.5.3"; -stdenv.mkDerivation { - name = "ocaml-x509-${version}"; + mininimumSupportedOcamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz"; - sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn"; + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-x509"; + rev = "${version}"; + sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; propagatedBuildInputs = [ asn1-combinators nocrypto ]; configureFlags = "--enable-tests"; + configurePhase = "./configure --prefix $out $configureFlags"; + doCheck = true; checkTarget = "test"; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = licenses.bsd2; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index a55e1993ac37..42a7401b09d6 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -28,7 +28,6 @@ in buildPythonPackage rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py - sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 0fd6c1873b53..ed8bbab29a7a 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -6,8 +6,8 @@ let sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; setuptools_source = fetchurl { - url = "https://files.pythonhosted.org/packages/3b/c7/e9724e6f81c96248fba5876054418c11d327b3093d075790903cd66fad44/setuptools-26.1.1-py2.py3-none-any.whl"; - sha256 = "226c9ce65e76c6069e805982b036f36dc4b227b37dd87fc219aef721ec8604ae"; + url = "https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl"; + sha256 = "2e59d06ac798efce29c567ee0e0687514efca529a665b8f364cf497cd10d21b2"; }; argparse_source = fetchurl { url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl"; @@ -15,11 +15,11 @@ let }; in stdenv.mkDerivation rec { name = "${python.libPrefix}-bootstrapped-pip-${version}"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl"; - sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34"; + url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl"; + sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix new file mode 100644 index 000000000000..65d5c95114db --- /dev/null +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, python +, llvm +, pythonOlder +, isPyPy +, enum34 +}: + +buildPythonPackage rec { + pname = "llvmlite"; + name = "${pname}-${version}"; + version = "0.14.0"; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8"; + }; + + propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + patchPhase = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${llvm}/bin/llvm-config + ''; + checkPhase = '' + ${python.executable} runtests.py + ''; + + __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + + passthru.llvm = llvm; + + meta = { + description = "A lightweight LLVM python binding for writing JIT compilers"; + homepage = "http://llvmlite.pydata.org/"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix new file mode 100644 index 000000000000..1feb9e009e27 --- /dev/null +++ b/pkgs/development/python-modules/numba/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchurl +, python +, buildPythonPackage +, isPy27 +, isPy33 +, isPy3k +, numpy +, llvmlite +, argparse +, funcsigs +, singledispatch +, libcxx +}: + +buildPythonPackage rec { + version = "0.29.0"; + name = "numba-${version}"; + + src = fetchurl { + url = "mirror://pypi/n/numba/${name}.tar.gz"; + sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d"; + }; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + + # Copy test script into $out and run the test suite. + checkPhase = '' + cp runtests.py $out/${python.sitePackages}/numba/runtests.py + ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py + ''; + # ImportError: cannot import name '_typeconv' + doCheck = false; + + meta = { + homepage = http://numba.pydata.org/; + license = stdenv.lib.licenses.bsd2; + description = "Compiling Python code using LLVM"; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch new file mode 100644 index 000000000000..d75e09b722bf --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch @@ -0,0 +1,12 @@ +diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py +--- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200 ++++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100 +@@ -105,7 +105,7 @@ + .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html + + """ +-from gpg import gnupg ++import slixmpp.thirdparty.gnupg as gnupg + from slixmpp.xmlstream.stanzabase import JID + + from xml.etree import cElementTree as ET diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch new file mode 100644 index 000000000000..821b9c41588a --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch @@ -0,0 +1,80 @@ +diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py +--- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100 +@@ -34,9 +34,9 @@ + + + """ +-from plugin import BasePlugin +-import tabs +-from decorators import command_args_parser ++from poezio.plugin import BasePlugin ++import poezio.tabs ++from poezio.decorators import command_args_parser + + def move(text, step, spacing): + new_text = text + (" " * spacing) +diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py +--- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100 +@@ -22,11 +22,11 @@ + + + """ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import difflib ++import collections + from functools import wraps +-import tabs +-from config import config ++from poezio.config import config + + shim_message_fields = ('txt nick_color time str_time nickname user identifier' + ' highlight me old_message revisions jid ack') +@@ -61,10 +61,6 @@ + rev -= 1 + return ''.join(acc) + +-Message.__repr__ = repr_message +-Message.__str__ = repr_message +- +- + + def corrections_enabled(func): + @wraps(func) +diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py +--- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100 +@@ -1,4 +1,4 @@ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import tracemalloc + import cProfile, pstats, io + +diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py +--- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100 +@@ -1,6 +1,6 @@ +-from plugin import BasePlugin +-import tabs +-import multiuserchat as muc ++from poezio.plugin import BasePlugin ++import poezio.tabs ++import poezio.multiuserchat as muc + + class Plugin(BasePlugin): + def init(self): +diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py +--- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100 +@@ -20,8 +20,7 @@ + .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html + """ + +-from plugin import BasePlugin +-import tabs ++from poezio.plugin import BasePlugin + + class Plugin(BasePlugin): + def init(self): diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index d97a23746fd2..471ffbe6c354 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchurl , fetchFromGitHub , boost , numpy @@ -12,6 +13,7 @@ , mkDerivation , stdenv , pythonOlder +, isPy35 }: let compyte = import ./compyte.nix { @@ -19,22 +21,21 @@ let }; in buildPythonPackage rec { - name = "pycuda-${version}"; - version = "2016.1"; + pname = "pycuda"; + version = "2016.1.2"; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "inducer"; - repo = "pycuda"; - rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11"; - sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7"; - }; + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; + }; preConfigure = '' findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib - + ${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \ --boost-lib-dir=$BOOST_LIBRARYDIR \ --no-use-shipped-boost \ @@ -45,7 +46,12 @@ buildPythonPackage rec { ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte ''; - doCheck = pythonOlder "3.5"; + # Requires access to libcuda.so.1 which is provided by the driver + doCheck = false; + + checkPhase = '' + py.test + ''; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index dfddd7dddbdb..33bb1d5a4cab 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -10,6 +10,8 @@ mkPythonDerivation rec { sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgconfig glib gobjectIntrospection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix new file mode 100644 index 000000000000..d09f38914b5a --- /dev/null +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, Mako +, pytest +, numpy +, cffi +, pytools +, decorator +, appdirs +, six +, opencl-headers +, opencl-icd +}: + +buildPythonPackage rec { + pname = "pyopencl"; + version = "2016.2"; + name = "${pname}-${version}"; + + buildInputs = [ pytest opencl-headers opencl-icd ]; + + propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b"; + }; + + # gcc: error: pygpu_language_opencl.cpp: No such file or directory + doCheck = false; + + meta = { + description = "Python wrapper for OpenCL"; + homepage = https://github.com/pyopencl/pyopencl; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix new file mode 100644 index 000000000000..14ebe52eae9e --- /dev/null +++ b/pkgs/development/python-modules/reikna/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, sphinx +, pytestcov +, pytest +, Mako +, numpy +, funcsigs +, withCuda ? false, pycuda +, withOpenCL ? true, pyopencl +}: + +buildPythonPackage rec { + pname = "reikna"; + name = "${pname}-${version}"; + version = "0.6.7"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62"; + }; + + buildInputs = [ sphinx pytestcov pytest ]; + + propagatedBuildInputs = [ Mako numpy funcsigs ] + ++ stdenv.lib.optional withCuda pycuda + ++ stdenv.lib.optional withOpenCL pyopencl; + + checkPhase = '' + py.test + ''; + + # Requires device + doCheck = false; + + meta = { + description = "GPGPU algorithms for PyCUDA and PyOpenCL"; + homepage = http://github.com/fjarri/reikna; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3a38dee3174f..bba5a6c942b0 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - shortName = "setuptools-${version}"; + pname = "setuptools"; + shortName = "${pname}-${version}"; name = "${python.libPrefix}-${shortName}"; - version = "26.1.1"; # 18.4 and up breaks python34Packages.characteristic and many others + version = "28.8.0"; src = fetchurl { - url = "mirror://pypi/s/setuptools/${shortName}.tar.gz"; - sha256 = "475ce28993d7cb75335942525b9fac79f7431a7f6e8a0079c0f2680641379481"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz"; + sha256 = "432a1ad4044338c34c2d09b0ff75d509b9849df8cf329f4c1c7706d9c2ba3c61"; }; buildInputs = [ python wrapPython ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 21cc80ea6bae..acd04ee3bf5a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy +, libmsgpack, qt48, libsodium, snappy, libossp_uuid }@args: let @@ -202,6 +202,10 @@ in --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; }; + + uuid4r = attrs: { + buildInputs = [ which libossp_uuid ]; + }; xapian-ruby = attrs: { # use the system xapian diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index b481c1e80e5d..91037588552c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.18"; + version = "6.19"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m"; + sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index a67d9b8d42e8..91d4155d093d 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix new file mode 100644 index 000000000000..c8e667722c50 --- /dev/null +++ b/pkgs/development/tools/bloaty/default.nix @@ -0,0 +1,31 @@ +{ stdenv, binutils, fetchgit }: + +stdenv.mkDerivation rec { + version = "2016.11.16"; + name = "bloaty-${version}"; + + src = fetchgit { + url = "https://github.com/google/bloaty.git"; + rev = "d040e4821ace478f9b43360acd6801aefdd323f7"; + sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + configurePhase = '' + sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc + ''; + + installPhase = '' + install -Dm755 {.,$out/bin}/bloaty + ''; + + meta = with stdenv.lib; { + description = "a size profiler for binaries"; + homepage = https://github.com/google/bloaty; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.dtzWill ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b995e76f63ab..c129d4448a9c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: rec { - gradleGen = {name, src} : stdenv.mkDerivation rec { - inherit name src; + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + inherit name src nativeVersion; dontBuild = true; @@ -21,10 +21,10 @@ rec { let arch = if stdenv.is64bit then "amd64" else "i386"; in '' mkdir patching pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-0.11.jar . - mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/ + jar cf native-platform-linux-${arch}-${nativeVersion}.jar . + mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ popd # The scanner doesn't pick up the runtime dependency in the jar. @@ -52,16 +52,18 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.1"; + name = "gradle-3.2.1"; + nativeVersion = "0.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7"; + sha256 = "1286wqycc7xnrkn6n37r5g19ajv6igqhavdh9pjxqmry9mjs6hwq"; }; }; gradle_2_14 = gradleGen rec { name = "gradle-2.14.1"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; @@ -71,6 +73,7 @@ rec { gradle_2_5 = gradleGen rec { name = "gradle-2.5"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 01d1c97ba968..6a752d08cff0 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.13"; + version = "2.33"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p"; + sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 27c9cc7955f8..5305297a27af 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5"; + sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 4a7d1bf87e31..37517f306e82 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,15 +2,26 @@ buildGoPackage rec { name = "doctl-${version}"; - version = "1.3.1"; - rev = "a57555c195d06bc7aa5037af77fde0665ad1231f"; + version = "${major}.${minor}.${patch}"; + major = "1"; + minor = "5"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; + excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; + buildFlagsArray = let t = "${goPackagePath}"; in '' + -ldflags= + -X ${t}.Major=${major} + -X ${t}.Minor=${minor} + -X ${t}.Patch=${patch} + -X ${t}.Label=release + ''; + src = fetchFromGitHub { owner = "digitalocean"; repo = "doctl"; - rev = "${rev}"; - sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma"; + rev = "v${version}"; + sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2"; }; meta = { diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index ddb136ed86ea..837da4a09dc9 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { description = "Print where symbols are defined in Go source code"; homepage = "https://github.com/rogpeppe/godef/"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - licence = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/development/tools/jsduck/Gemfile new file mode 100644 index 000000000000..483fc40ff799 --- /dev/null +++ b/pkgs/development/tools/jsduck/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "jsduck" diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock new file mode 100644 index 000000000000..d3e1556a7b39 --- /dev/null +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + dimensions (1.2.0) + jsduck (5.3.4) + dimensions (~> 1.2.0) + json (~> 1.8.0) + parallel (~> 0.7.1) + rdiscount (~> 2.1.6) + rkelly-remix (~> 0.0.4) + json (1.8.3) + parallel (0.7.1) + rdiscount (2.1.8) + rkelly-remix (0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + jsduck + +BUNDLED WITH + 1.13.6 diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix new file mode 100644 index 000000000000..ef89517966d7 --- /dev/null +++ b/pkgs/development/tools/jsduck/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, bundlerEnv, makeWrapper, }: + +stdenv.mkDerivation rec { + pname = "jsduck"; + name = "${pname}-${version}"; + version = "5.3.4"; + + env = bundlerEnv { + name = "${pname}"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + phases = [ "installPhase" ]; + + buildInputs = [ env makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/jsduck $out/bin/jsduck + ''; + + meta = with lib; { + description = "Simple JavaScript Duckumentation generator."; + homepage = https://github.com/senchalabs/jsduck; + license = with licenses; gpl3; + maintainers = with stdenv.lib.maintainers; [ periklis ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix new file mode 100644 index 000000000000..d80bd70dd728 --- /dev/null +++ b/pkgs/development/tools/jsduck/gemset.nix @@ -0,0 +1,51 @@ +{ + dimensions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0"; + type = "gem"; + }; + version = "1.2.0"; + }; + jsduck = { + dependencies = ["dimensions" "json" "parallel" "rdiscount" "rkelly-remix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr"; + type = "gem"; + }; + version = "5.3.4"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + type = "gem"; + }; + version = "1.8.3"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq"; + type = "gem"; + }; + version = "0.7.1"; + }; + rdiscount = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + type = "gem"; + }; + version = "2.1.8"; + }; + rkelly-remix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; + type = "gem"; + }; + version = "0.0.7"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index d4a2f80599f7..6386d3176a92 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "A set of utilities to handle ELF objects"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; - maintainers = lib.maintainers.eelco; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 212ebd9c967d..d88a06c64048 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -4,13 +4,13 @@ with rustPlatform; buildRustPackage rec { name = "tokei-${version}"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz"; - sha256 = "0xymz52gpasihzhxglzx4wh0312zkraxy4yrpxz694zalf2s5vj5"; + sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68"; }; - depsSha256 = "1syx8qzjn357dk2bf4ndmgc4zvrglmw88qiw117h6s511qyz8z0z"; + depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 4b00e92b4c3c..e73d77f772df 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontStrip = true; - installFlags = "SEMVER=${version} PREFIX=$out"; + installFlags = "SEMVER=${version} PREFIX=$(out)"; meta = with stdenv.lib; { homepage = https://github.com/afiniate/trv; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 9c0d81cf0043..8857e1d1e910 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "uhd-${version}"; - version = "3.9.3"; + version = "3.10.1"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_009_003"; - sha256 = "0nbm8nrjd0l8jj1wq0kkgd8pifzysdyc7pvraq16m0dc01mr638h"; + rev = "release_003_010_001_000"; + sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index a4c61a58b899..57c57969a88b 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.63"; + version = "0.64"; - src = fetchurl { - url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; - sha256 = "1qravjzmips3m7asbsd0qllmprrl1rshjlmnfq68w84d38sb3yyz"; + src = fetchFromGitHub { + owner = product; + repo = product; + rev = name; + sha256 = "0gvgv44aqrh7cmj4ji8dpbhp47cklvajlc3s9d9z24x96dhp2v97"; }; + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = http://uncrustify.sourceforge.net/; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 07cc55465d10..51f4de8eacce 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0"; + name = "xxdiff-4.0.1"; src = fetchurl { url = "mirror://sourceforge/xxdiff/${name}.tar.bz2"; - sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i"; + sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z"; }; nativeBuildInputs = [ flex bison qt4 docutils ]; @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - meta = { - homepage = "http://furius.ca/xxdiff/"; + meta = with stdenv.lib; { + homepage = http://furius.ca/xxdiff/; description = "Graphical file and directories comparator and merge tool"; - license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.linux; - maintainers = []; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3c99c3b9580b..2aa2321ef6ac 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.1"; + "2.5.2"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8"; + "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; }; in diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 7cfb39ebdedc..6f0eb3735ffb 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "jikespg-1.3"; src = fetchurl { - url = mirror://sourceforge/jikes/jikespg-1.3.tar.gz; - md5 = "eba183713d9ae61a887211be80eeb21f"; + url = "mirror://sourceforge/jikes/${name}.tar.gz"; + sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw"; }; sourceRoot = "jikespg/src"; @@ -16,9 +16,11 @@ stdenv.mkDerivation { cp jikespg $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = http://jikes.sourceforge.net/; description = "The Jikes Parser Generator"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.ipl10; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 753c91aa6880..e54d4c540fe2 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ragel-${version}"; - version = "7.0.0.6"; + version = "7.0.0.9"; src = fetchurl { url = "http://www.colm.net/files/ragel/${name}.tar.gz"; - sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs"; + sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr"; }; buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix new file mode 100644 index 000000000000..adecf7f3bd13 --- /dev/null +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages }: + +with rustPlatform; + +# Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself. + +buildRustPackage rec { + name = "rust-bindgen-${version}"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "Yamakaky"; + repo = "rust-bindgen"; + rev = "${version}"; + sha256 = "0pv1vcgp455hys8hb0yj4vrh2k01zysayswkasxq4hca8s2p7qj9"; + }; + + buildInputs = [ llvmPackages.clang-unwrapped ]; + + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" + ''; + + depsSha256 = "0rlmdiqjg9ha9yzhcy33abvhrck6sphczc2gbab9zhfa95gxprv8"; + + doCheck = false; # A test fails because it can't find standard headers in NixOS + + meta = with stdenv.lib; { + description = "C binding generator"; + homepage = https://github.com/Yamakaky/rust-bindgen; + license = with licenses; [ bsd3 ]; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 32a4eafc02c7..335c469e0c1d 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,20 +4,20 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6"; + version = "0.6.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "d022f05f340b9aa4956ca315f5e424a6d3ab3248"; - sha256 = "1w6ll3802061wbggqhk31pmzws423qm7jc4hyxk8a6pf9ksp0nk5"; + rev = "4418fab4f24e6497aa2a1f71bb4cf963c2971a28"; + sha256 = "0x2kg2sqpj4lsqqskcy5p0w3264f0by1irkjj369ch89xax7l52l"; }; - depsSha256 = "13rrhgzxxx5gwpwvyxw03m5xng9c1xyaycmqpi123ma3ps5822jf"; + depsSha256 = "022mwggmy6p9n8dh22y6m3sadrwvwlbpj9w9ki9avmgsm3cj2mhs"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; - homepage = https://github.com/nrc/rustfmt; + homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.globin ]; platforms = platforms.all; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index a53cb4bc0bd0..534f358e5319 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.10"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk"; + sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz"; }; unpackPhase = "tar xvzf $src"; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 062873f0ccd4..40e42d478612 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.8.6"; + version = "1.8.7"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; - "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; - "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr"; + "x86_64-linux" = "10c77b643b73dd3ad7a45a89d8ab95b58b79dc10e0cf6e760fe24abc436b2fdb"; + "i686-linux" = "9d2a70f34ab65d8d2cb013917f221835432aa63cd4ef781c9fd1404cfcfe7898"; + "x86_64-darwin" = "14d68f599a620cf421838ed037f0a1c4467e1b67475deeff62330a21fda4937b"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index e313672aea3f..1393034ff205 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO }: +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }: let googletest = fetchFromGitHub { @@ -16,13 +16,13 @@ let }; in stdenv.mkDerivation rec { name = "xcbuild-${stdenv.lib.substring 0 8 version}"; - version = "49f8a5923f1381f87ac03ad4c1b138d1d2b74369"; + version = "0ab861abcc11185a17d59608f96a015752a6fadc"; src = fetchFromGitHub { owner = "facebook"; repo = "xcbuild"; rev = version; - sha256 = "0l107xkh7dab2xc58dqyrrhpd1gp12cpzh0wrx0i9jbh0idbwnk0"; + sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26"; }; prePatch = '' @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { rmdir $out/usr ''; - buildInputs = [ cmake zlib libxml2 libpng CoreServices CoreGraphics ImageIO ]; -} \ No newline at end of file + buildInputs = [ cmake zlib libxml2 libpng ninja ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; +} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix new file mode 100644 index 000000000000..0b03d4120e85 --- /dev/null +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -0,0 +1,152 @@ +{ stdenv, sdk, writeText, platformName, xcbuild }: + +let + + Info = { + CFBundleIdentifier = platformName; + Type = "Platform"; + Name = "macosx"; + }; + + Version = { + ProjectName = "OSXPlatformSupport"; + }; + + # These files are all based off of Xcode spec fies found in + # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/Speciications/. + + # Based off of the MacOSX Architectures.xcpsec file. All i386 stuff + # is removed because NixPkgs only supports darwin-x86_64. + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "64-bit Intel"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = "x86_64"; + Type = "Architecture"; + Name = "Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + # Based off of the MacOSX Package Types.xcpsec file. Only keep the + # bare minimum needed. + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + ]; + + # Based off of the MacOSX Product Types.xcpsec file. All + # bundles/wrapper are removed, because we prefer dynamic products in + # NixPkgs. + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + } + ]; + +in + +stdenv.mkDerivation { + name = "nixpkgs.platform"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + cd $out/ + + plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} + plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} + + mkdir -p $out/Developer/Library/Xcode/Specifications/ + cd $out/Developer/Library/Xcode/Specifications/ + plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} + plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} + + mkdir -p $out/Developer/SDKs/ + cd $out/Developer/SDKs/ + ln -s ${sdk} + ''; +} diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix new file mode 100644 index 000000000000..7d587249bf8e --- /dev/null +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -0,0 +1,31 @@ +{ stdenv, writeText, toolchainName, sdkName, xcbuild }: + +let + + SDKSettings = { + CanonicalName = sdkName; + DisplayName = sdkName; + Toolchains = [ toolchainName ]; + Version = "10.10"; + MaximumDeploymentTarget = "10.10"; + isBaseSDK = "YES"; + }; + + SystemVersion = { + ProductName = "Mac OS X"; + ProductVersion = "10.10"; + }; + +in + +stdenv.mkDerivation { + name = "nix.nixpkgs.sdk"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} + + mkdir -p $out/System/Library/CoreServices/ + plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} + ''; +} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh new file mode 100644 index 000000000000..c3b26a6ac796 --- /dev/null +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -0,0 +1,31 @@ +xcbuildBuildPhase() { + export DSTROOT=$out + + runHook preBuild + + echo "running xcodebuild" + + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + + runHook postBuild +} + +xcbuildInstallPhase () { + runHook preInstall + + # not implemented + # xcodebuild install + + runHook postInstall +} + +if [ -z "$dontUseXcbuild" ]; then + buildPhase=xcbuildBuildPhase + if [ -z "$installPhase" ]; then + installPhase=xcbuildInstallPhase + fi +fi + +# if [ -d "*.xcodeproj" ]; then +# buildPhase=xcbuildPhase +# fi diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix new file mode 100644 index 000000000000..386f67a9d631 --- /dev/null +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -0,0 +1,109 @@ +{stdenv, writeText, toolchainName, xcbuild +, llvm, cctools, gcc, bootstrap_cmds, binutils +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: + +let + + ToolchainInfo = { + Identifier = toolchainName; + }; + +in + +stdenv.mkDerivation { + name = "nixpkgs.xctoolchain"; + buildInputs = [ xcbuild makeWrapper ]; + + propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ] + ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ]; + ## cctools should build on Linux but it doesn't currentl + + buildCommand = '' + mkdir -p $out + plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + + mkdir -p $out/usr/include + mkdir -p $out/usr/lib + mkdir -p $out/usr/libexec + mkdir -p $out/usr/share + + mkdir -p $out/usr/bin + cd $out/usr/bin + ln -s ${stdenv.cc}/bin/cpp + ln -s ${stdenv.cc}/bin/c++ + ln -s ${stdenv.cc}/bin/cc + ln -s c++ clang++ + ln -s cc clang + + ln -s ${llvm}/bin/llvm-cov + ln -s ${llvm}/bin/llvm-dsymutil + ln -s ${llvm}/bin/llvm-dwarfdump + ln -s ${llvm}/bin/llvm-nm + ln -s ${llvm}/bin/llvm-objdump + ln -s ${llvm}/bin/llvm-otool + ln -s ${llvm}/bin/llvm-profdata + ln -s ${llvm}/bin/llvm-size + + ln -s ${yacc}/bin/yacc + ln -s ${yacc}/bin/bison + ln -s ${flex}/bin/flex + ln -s ${flex}/bin/flex++ + + ln -s flex lex + + ln -s ${m4}/bin/m4 + ln -s m4 gm4 + + ln -s ${unifdef}/bin/unifdef + ln -s ${unifdef}/bin/unifdefall + + ln -s ${gperf}/bin/gperf + ln -s ${gcc}/bin/gcov + ln -s ${gcc}/bin/mkdep + ln -s ${indent}/bin/indent + ln -s ${ctags}/bin/ctags + '' + stdenv.lib.optionalString stdenv.isDarwin '' + ln -s ${bootstrap_cmds}/bin/mig + ln -s ${binutils}/bin/lipo + + ln -s ${cctools}/bin/ar + ln -s ${cctools}/bin/as + ln -s ${cctools}/bin/nm + ln -s ${cctools}/bin/nmedit + ln -s ${cctools}/bin/ld + ln -s ${cctools}/bin/libtool + ln -s ${cctools}/bin/strings + ln -s ${cctools}/bin/strip + ln -s ${cctools}/bin/install_name_tool + ln -s ${cctools}/bin/bitcode_strip + ln -s ${cctools}/bin/codesign_allocate + ln -s ${cctools}/bin/dsymutil + ln -s ${cctools}/bin/dyldinfo + ln -s ${cctools}/bin/otool + ln -s ${cctools}/bin/unwinddump + ln -s ${cctools}/bin/size + ln -s ${cctools}/bin/segedit + ln -s ${cctools}/bin/pagestuff + ln -s ${cctools}/bin/ranlib + ln -s ${cctools}/bin/redo_prebinding + ''; +} + +# other commands in /bin/ +# asa +# cmpdylib (in cctools) +# ctf_insert (in cctools) +# dwarfdump +# lorder +# rebase +# rpcgen (in developer_cmds) +# what + + +# swift: see #11463 +# swift +# swift-compress +# swift-demangle +# swift-stdlib-tool +# swift-update +# swiftc diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix new file mode 100644 index 000000000000..fc03c273fc58 --- /dev/null +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -0,0 +1,72 @@ +{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics +, cctools, bootstrap_cmds, binutils}: + +let + + toolchainName = "com.apple.dt.toolchain.XcodeDefault"; + platformName = "com.apple.platform.macosx"; + sdkName = "macosx10.10"; + + xcbuild = callPackage ./default.nix { + inherit CoreServices ImageIO CoreGraphics; + }; + + toolchain = callPackage ./toolchain.nix { + inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv; + }; + + sdk = callPackage ./sdk.nix { + inherit toolchainName sdkName xcbuild; + }; + + platform = callPackage ./platform.nix { + inherit sdk platformName xcbuild; + }; + + xcconfig = writeText "nix.xcconfig" '' + SDKROOT=${sdkName} + ''; + +in + +stdenv.mkDerivation { + name = "xcbuild-wrapper"; + + buildInputs = [ xcbuild makeWrapper ]; + + setupHook = ./setup-hook.sh; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cd $out/bin/ + + for file in ${xcbuild}/bin/*; do + ln -s $file + done + + mkdir -p $out/Library/Xcode/ + ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications + + mkdir -p $out/Platforms/ + ln -s ${platform} $out/Platforms/ + + mkdir -p $out/Toolchains/ + ln -s ${toolchain} $out/Toolchains/ + + wrapProgram $out/bin/xcodebuild \ + --add-flags "-xcconfig ${xcconfig}" \ + --add-flags "DERIVED_DATA_DIR=." \ + --set DEVELOPER_DIR "$out" + wrapProgram $out/bin/xcrun \ + --add-flags "-sdk ${sdkName}" \ + --set DEVELOPER_DIR "$out" + ''; + + passthru = { + raw = xcbuild; + }; + + preferLocalBuild = true; +} diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 04ea7086f74c..9a142a89677f 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.6.0"; + version = "4.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; + sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 50bd2cb672e3..b91ec8df6873 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,19 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.8.0"; + version = "6.9.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; + sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b"; }; - patches = nodejs.patches ++ [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; - }) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index 420f2b0412f0..544f438cf86a 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,19 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.0.0"; + version = "7.1.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71"; + sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm"; }; - patches = nodejs.patches ++ [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; - }) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 6b4dface0e1c..68ef1fd53926 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv"; + sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index e4d4e3cb8e4e..f038673f4c0b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 -, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng +, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools @@ -10,17 +10,17 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; buildInputs = [ - spidermonkey_31 boost icu libxml2 libpng libjpeg + spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal mesa xproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools @@ -44,11 +44,16 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + # Workaround invalid pkgconfig name for mozjs + mkdir pkgconfig + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Update Makefiles pushd build/workspaces ./update-workspaces.sh \ --with-system-nvtt \ - --with-system-mozjs31 \ + --with-system-mozjs38 \ ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index bfd79844bcb6..766b633057d3 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,6 +1,6 @@ -diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-src/crawl-ref/source/Makefile ---- crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.18.1-src/crawl-ref/source/Makefile 2016-09-04 17:25:54.310929928 +0300 +diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile +--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300 @@ -285,7 +285,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a @@ -10,27 +10,22 @@ diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-sr else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for -@@ -957,9 +957,9 @@ - SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ - {\ - fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ -- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ -+ for dir in ${dejavu_fonts}/share/fonts;\ - do [ -d $$dir ] && echo $$dir; done;\ -- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) -+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) - ifneq (,$(SYS_PROPORTIONAL_FONT)) - ifeq (,$(COPY_FONTS)) - DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" -@@ -982,9 +982,9 @@ - SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ - {\ - fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ -- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ -+ for dir in ${dejavu_fonts}/share/fonts;\ - do [ -d $$dir ] && echo $$dir; done;\ -- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) -+ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) - ifneq (,$(SYS_MONOSPACED_FONT)) - ifeq (,$(COPY_FONTS)) - DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" +diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font +--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300 +@@ -1,6 +1,6 @@ + #! /bin/sh + +-FONTDIRS="/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts" ++FONTDIRS="${fontsPath}/share/fonts" + + name=$1 + [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; } +@@ -11,6 +11,6 @@ + for dir in $FONTDIRS; do + [ -d "$dir" ] && echo "$dir" + done +- } | xargs -I% find % \( -type f -o -type l \) -iname "$name" -print \ ++ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \ + | head -n1 + } 2>/dev/null diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 2a1e9232c230..dc84b18547bd 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush +{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses +, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp , tileMode ? false }: stdenv.mkDerivation rec { - name = "crawl-${version}" + (if tileMode then "-tiles" else ""); - version = "0.18.1"; + name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; + version = "0.19.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j"; + sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96"; }; patches = [ ./crawl_purify.patch ]; - nativeBuildInputs = [ pkgconfig which perl pngcrush ]; + nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ stdenv.lib.optionals tileMode - [ libpng SDL2 SDL2_image freetype mesa ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ]; preBuild = '' cd crawl-ref/source @@ -33,17 +32,19 @@ stdenv.mkDerivation rec { rm -rf contrib ''; + fontsPath = lib.optionalString tileMode dejavu_fonts; + makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" - "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] - ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" + ] ++ lib.optional tileMode "TILES=y"; - postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else ""; + postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Open-source, single-player, role-playing roguelike game"; - homepage = http://crawl.develz.org/; + homepage = "http://crawl.develz.org/"; longDescription = '' Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting in dungeons filled with dangerous and unfriendly monsters diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 64109279060a..d26258081fcb 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -7,11 +7,8 @@ let self = rec { dwarf-fortress-original = callPackage ./game.nix { }; - dfhack = callPackage_i686 ./dfhack { - inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT; - protobuf = with pkgsi686Linux; protobuf.override { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - }; + dfhack = callPackage ./dfhack { + inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; }; dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 176971920071..74dddbe8df99 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,16 +1,23 @@ { stdenv, fetchgit, cmake, writeScriptBin , perl, XMLLibXML, XMLLibXSLT , zlib -, jsoncpp, protobuf, tinyxml }: let - dfVersion = "0.43.03"; - version = "${dfVersion}-r1"; + dfVersion = "0.43.05"; + # version = "${dfVersion}-r1"; + # rev = "refs/tags/${version}"; + version = "${dfVersion}-alpha2"; + rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb"; + sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5"; - rev = "refs/tags/${version}"; # revision of library/xml submodule - xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0"; + xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b"; + + arch = + if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else throw "Unsupported architecture"; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} @@ -35,17 +42,20 @@ in stdenv.mkDerivation rec { # Beware of submodules src = fetchgit { url = "https://github.com/DFHack/dfhack"; - inherit rev; - sha256 = "0m5kqpaz0ypji4c32w0hhbsicvgvnjh56pqvq7af6pqqnyg1nzcx"; + inherit rev sha256; }; - patches = [ ./use-system-libraries.patch ]; + patches = [ ./skip-ruby.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; - # we can't use native Lua; upstream uses private headers - buildInputs = [ zlib jsoncpp protobuf tinyxml ]; + # We don't use system libraries because dfhack needs old C++ ABI. + buildInputs = [ zlib ]; + + preBuild = '' + export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" + ''; - cmakeFlags = [ "-DEXTERNAL_TINYXML=ON" ]; + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ]; enableParallelBuilding = true; @@ -55,7 +65,7 @@ in stdenv.mkDerivation rec { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; - platforms = [ "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ robbinch a1russell abbradar ]; }; } diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch new file mode 100644 index 000000000000..619060dc2534 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch @@ -0,0 +1,16 @@ +diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt +--- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 ++++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 +@@ -1,3 +1,4 @@ ++IF(FALSE) + IF (APPLE) + SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) + SET(RUBYLIB_INSTALL_NAME "libruby.dylib") +@@ -48,6 +49,7 @@ + "482c1c418f4ee1a5f04203eee1cda0ef") + ENDIF() + ENDIF() ++ENDIF() + + IF (APPLE OR UNIX) + SET(RUBYAUTOGEN ruby-autogen-gcc.rb) diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch deleted file mode 100644 index e33fec9f87ec..000000000000 --- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 956edfc..fb0e6bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -160,8 +160,6 @@ ELSEIF(MSVC) - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od") - ENDIF() - --# use shared libraries for protobuf --ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS) - ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL) - - if(APPLE) -@@ -182,10 +180,8 @@ else() - set(ZLIB_ROOT /usr/lib/i386-linux-gnu) - endif() - find_package(ZLIB REQUIRED) --include_directories(depends/protobuf) - include_directories(depends/lua/include) - include_directories(depends/md5) --include_directories(depends/jsoncpp) - - # Support linking against external tinyxml - # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml" -diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt -index d8442b1..b47dc2a 100644 ---- a/depends/CMakeLists.txt -+++ b/depends/CMakeLists.txt -@@ -1,7 +1,6 @@ - #list depends here. - add_subdirectory(lua) - add_subdirectory(md5) --add_subdirectory(protobuf) - - # Don't build tinyxml if it's being externally linked against. - if(NOT TinyXML_FOUND) -@@ -9,7 +8,6 @@ if(NOT TinyXML_FOUND) - endif() - - add_subdirectory(tthread) --add_subdirectory(jsoncpp) - # build clsocket static and only as a dependency. Setting those options here overrides its own default settings. - OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) - OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) -diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index d3e3480..5d4b572 100644 ---- a/library/CMakeLists.txt -+++ b/library/CMakeLists.txt -@@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS}) - - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} -- COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ -+ COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/ - ${PROJECT_PROTOS} -- DEPENDS protoc-bin ${PROJECT_PROTOS} -+ DEPENDS ${PROJECT_PROTOS} - ) - - # Merge headers into sources -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index c24b940..afeb888 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}") - - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} -- COMMAND protoc-bin -I=${dfhack_SOURCE_DIR}/library/proto/ -+ COMMAND protoc -I=${dfhack_SOURCE_DIR}/library/proto/ - -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ - ${PROJECT_PROTOS} -- DEPENDS protoc-bin ${PROJECT_PROTOS} -+ DEPENDS ${PROJECT_PROTOS} - ) - add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}) - -diff --git a/plugins/stockpiles/CMakeLists.txt b/plugins/stockpiles/CMakeLists.txt -index 713c3d6..dd2d4cb 100644 ---- a/plugins/stockpiles/CMakeLists.txt -+++ b/plugins/stockpiles/CMakeLists.txt -@@ -33,8 +33,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS}) - #Generate sources from our proto files and store them in the source tree - ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} --COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} --DEPENDS protoc-bin ${PROJECT_PROTOS} -+COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} -+DEPENDS ${PROJECT_PROTOS} - ) - - IF(WIN32) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index c13bfd4d3f2d..57610fb1c1c8 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { rm $out/bin/dwarftherapist ''; - meta = { + meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ the-kenny abbradar ]; + license = licenses.mit; + platforms = platforms.linux; homepage = "https://github.com/splintermind/Dwarf-Therapist"; }; } diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 3933d62b1d38..d5b6ac6c6865 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "43.04-v23"; + version = "43.05-v23"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "0a88jkcli9iq0prg5w0xh1cyms0b7dnc9rdahn7wy7fyakyp7s27"; + sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9"; }; installPhase = '' diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 01ae192e75e6..57f00e89b998 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "43.03"; + version = "43.05c"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "1mga5w3mks3bm6qch7azffr51g3q26za7hnas4qmxfs3m56bjav7"; + sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd"; }; installPhase = '' diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 89000115f4ab..4b71b4377050 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -30,11 +30,14 @@ stdenv.mkDerivation { enableParallelBuilding = true; + # Breaks dfhack because of inlining. + hardeningDisable = [ "fortify" ]; + passthru.dfVersion = "0.43.05"; meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; + homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 5493cdb3faf6..15b51631b33b 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -17,17 +17,12 @@ let env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; + paths = pkgs; + pathsToLink = [ "/" "/hack" ]; ignoreCollisions = true; + postBuild = lib.optionalString enableDFHack '' - # #4621 - if [ -L "$out/hack" ]; then - rm $out/hack - mkdir $out/hack - for i in ${dfhack}/hack/*; do - ln -s $i $out/hack - done - fi rm $out/hack/symbols.xml substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \ --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \ diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index d53769ca4b61..c8d8d287403b 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -8,4 +8,4 @@ done cd "$DF_DIR" LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \ - LD_PRELOAD=$env_dir/hack/libdfhack.so exec $env_dir/libs/Dwarf_Fortress "$@" + LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@" diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 9aee664a50eb..9b0ada3f9260 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.3"; + version="6.2.4"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq"; + sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw"; }; buildInputs = [ flex diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix new file mode 100644 index 000000000000..e89d16b788a6 --- /dev/null +++ b/pkgs/games/gogui/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, openjdk, unzip, makeWrapper }: + +let + version = "1.4.9"; +in stdenv.mkDerivation { + name = "gogui-${version}"; + buildInputs = [ unzip makeWrapper ]; + src = fetchurl { + url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; + sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; + }; + dontConfigure = true; + installPhase = '' + mkdir -p $out/share/doc + mv -vi {bin,lib} $out/ + mv -vi doc $out/share/doc/gogui + for x in $out/bin/*; do + wrapProgram $x --prefix PATH ":" ${openjdk}/bin + done + ''; + meta = { + maintainers = [ stdenv.lib.maintainers.cleverca22 ]; + description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; + homepage = http://gogui.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 3cd35c728bfc..8590f9a7420b 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.10.2"; + version = "1.11"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "08bss3laa265aavdgivzsv7asd5s2sdqnlqr767j3yf54y14cpqr"; + sha256 = "10vgvkklv3l66cvin2ikva2nj86gjl6p9ffizd6r89ixv1grcxrj"; }; preferLocalBuild = true; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 2e528a8203fe..00d4fbf84511 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -40,19 +40,19 @@ stdenv.mkDerivation { mkdir -pv $out/bin/jars $out/lib cp -v MultiMC $out/bin/ - cp -v jars/*.jar $out/bin/jars/ + cp -v jars/*.jar $out/bin/jars/ #*/ cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/ ''; - meta = { + meta = with stdenv.lib; { homepage = https://multimc.org/; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = stdenv.lib.maintainers.cleverca22; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.cleverca22 ]; }; } diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index f03b8dde13e8..81077d9461f3 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2016-08-11"; + version = "2016-11-02"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "1cf0b21cda562bade9152958f1525e5ac281ab9c"; - sha256 = "104yrgi9dnfb493pm9wvk2kn80nazcr1nllb5vd7di66jnvcjks0"; + rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd"; + sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1"; }; nativeBuildInputs = [ which pkgconfig ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ioquake3.org/; + homepage = "http://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index be921bf11892..dd4069e1c11c 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lopenal" ]; meta = with stdenv.lib; { - homepage = http://scorched3d.co.uk/; + homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 043861b6166b..bb297c1af4ee 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "supertux-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng"; + sha256 = "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index e07117172ce6..f72307e0172f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = http://powdertoy.co.uk/; + homepage = "http://powdertoy.co.uk/"; platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 46dd24acbb7b..a7352f0a75c4 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index a7e621460b66..0b335812ff03 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.5"; + version = "1.13.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "15hvf06r7086plwmagh89plcxal2zql8k4mg0yf1zgwjvdz284dx"; + sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = http://www.wesnoth.org/; + homepage = "http://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f2..cb78bd3498a9 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f3b12dc48f82..f583fbff231e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.22"; + version = "1.9.23"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; + sha256 = "131nqkwlss24r8la84s3v1qx376wq0016d2i2767bpxkyqkagvz3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; + sha256 = "188svpmaba2x5a7g8rk68cl2mqrv1vhf1si2g5j5lps9r6pgq1c0"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 4e419b6cbb6d..2f20943981a5 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext, libXrandr }: stdenv.mkDerivation rec { - name = "slock-1.3"; + name = "slock-1.4"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "065xa9hl7zn0lv2f7yjxphqsa35rg6dn9hv10gys0sh4ljpa7d5s"; + sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; buildInputs = [ xproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index a278b059d481..eb0209e3502b 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,11 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.47"; + name = "xlockmore-5.49"; src = fetchurl { - url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz"; - sha256 = "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl"; + url = "http://sillycycle.com/xlock/${name}.tar.xz"; + sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3"; + curlOpts = "--user-agent 'Mozilla/5.0'"; }; # Optionally, it can use GTK+. diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2cd10593aeb4..81c8472045b7 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2,6 +2,7 @@ { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf +, python3, boost, icu , Cocoa ? null }: @@ -303,16 +304,14 @@ rec { }; ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2016-09-22"; + name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { url = "git://github.com/JazzCore/ctrlp-cmatcher"; rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; dependencies = []; - buildInputs = [ python ]; - buildPhase = '' patchShebangs . ./install.sh @@ -1503,6 +1502,23 @@ rec { }; + deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-go-2016-11-12"; + src = fetchgit { + url = "git://github.com/zchee/deoplete-go"; + rev = "807b5536e7cebd06d0ce7b7d54c021a82774aee2"; + sha256 = "1ragxnlzpf17f1wdy512hkz6bd673gzl16f14v78873rcyxpiw53"; + }; + dependencies = []; + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; + }; + deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "deoplete-jedi-2016-10-22"; src = fetchgit { @@ -2085,5 +2101,36 @@ rec { }; + vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsdoc-2016-11-05"; + src = fetchgit { + url = "git://github.com/heavenshell/vim-jsdoc"; + rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff"; + sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za"; + }; + dependencies = []; + }; + + cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "cpsm-2016-09-21"; + src = fetchgit { + url = "git://github.com/nixprime/cpsm"; + rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d"; + sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k"; + }; + dependencies = []; + buildInputs = [ + python3 + stdenv + cmake + boost + icu + ]; + buildPhase = '' + patchShebangs . + export PY3=ON + ./install.sh + ''; + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b7e33a71ff83..20f6afec41fe 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -118,6 +118,7 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:zchee/deoplete-jedi" +"github:zchee/deoplete-go" "goyo" "matchit.zip" "pathogen" @@ -169,3 +170,5 @@ "vundle" "github:jiangmiao/auto-pairs" "github:editorconfig/editorconfig-vim" +"github:heavenshell/vim-jsdoc" +"github:nixprime/cpsm" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm new file mode 100644 index 000000000000..ea360765925b --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm @@ -0,0 +1,12 @@ + buildInputs = [ + python3 + stdenv + cmake + boost + icu + ]; + buildPhase = '' + patchShebangs . + export PY3=ON + ./install.sh + ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher new file mode 100644 index 000000000000..bd4a4fa989ba --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher @@ -0,0 +1,5 @@ + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go new file mode 100644 index 000000000000..80cfd9af6538 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go @@ -0,0 +1,7 @@ + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix new file mode 100644 index 000000000000..512ec6253c78 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, appleDerivation, developer_cmds }: + +appleDerivation rec { + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ developer_cmds ]; + + installPhase = '' + export DSTROOT=$out + export SRCROOT=$PWD + export OBJROOT=$PWD + + . ./xcodescripts/install_rpcsvc.sh + + mv $out/usr/* $out + rmdir $out/usr/ + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index aac213bb8047..92c54d9b679e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -56,9 +56,8 @@ appleDerivation rec { # The startup object files cp ${Csu}/lib/* $out/lib - # Narrowly speaking, these would work if we re-exported libsystem_c and libsystem_kernel, - # but we also need to run the original central libsystem constructor (which initializes - # a ton of crap for its consitutent libraries) so we link against the central library here. + # We can't re-exported libsystem_c and libsystem_kernel directly, + # so we link against the central library here. mkdir -p $out/lib/system ld -macosx_version_min 10.7 -arch x86_64 -dylib \ -o $out/lib/system/libsystem_c.dylib \ @@ -70,8 +69,14 @@ appleDerivation rec { /usr/lib/libSystem.dylib \ -reexported_symbols_list ${./system_kernel_symbols} - libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + # The umbrella libSystem also exports some symbols, + # but we don't want to pull in everything from the other libraries. + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/libSystem_internal.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_symbols} + libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then @@ -79,14 +84,13 @@ appleDerivation rec { fi done - ld -macosx_version_min 10.7 \ - -arch x86_64 \ - -dylib \ + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ -o $out/lib/libSystem.B.dylib \ -compatibility_version 1.0 \ -current_version 1226.10.1 \ -reexport_library $out/lib/system/libsystem_c.dylib \ -reexport_library $out/lib/system/libsystem_kernel.dylib \ + -reexport_library $out/lib/libSystem_internal.dylib \ $args ln -s libSystem.B.dylib $out/lib/libSystem.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols new file mode 100644 index 000000000000..75a00acac493 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols @@ -0,0 +1 @@ +_mach_init_routine diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix new file mode 100644 index 000000000000..254b4a231c22 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -0,0 +1,47 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: + +appleDerivation { + + # pkill requires special private headers that are unavailable in + # NixPkgs. These ones are needed: + # - xpc/xpxc.h + # - os/base_private.h + # - _simple.h + # We disable it here for now. TODO: build pkill inside adv_cmds + + # We also disable locale here because of some issues with a missing + # "lstdc++". + patchPhase = '' + substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install adv_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1 8; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + mkdir -p $out/System/Library/LaunchDaemons + install fingerd/finger.plist $out/System/Library/LaunchDaemons + + # from variant_links.sh + # ln -s $out/bin/pkill $out/bin/pgrep + # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 + ''; + + buildInputs = [ xcbuild libcxx ]; + + # temporary fix for iostream issue + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix new file mode 100644 index 000000000000..9e8b78e57d6c --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -0,0 +1,29 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + # These PBXcp calls should be patched in xcbuild to allow them to + # automatically be prefixed. + patchPhase = '' + substituteInPlace basic_cmds.xcodeproj/project.pbxproj \ + --replace "dstPath = /usr/share/man/man1;" "dstPath = $out/share/man/man1;" \ + --replace "dstPath = /usr/share/man/man5;" "dstPath = $out/share/man/man5;" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install basic_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8625ac72c104..c63d7465a13d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -34,6 +34,11 @@ let libutil = "43"; libunwind = "35.3"; + Librpcsvc = "26"; + developer_cmds= "62"; + network_cmds = "481.20.1"; + basic_cmds = "55"; + adv_cmds = "163"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -123,7 +128,14 @@ let }; }; - fetchApple = version: sha256: name: fetchurl { + fetchApple = version: sha256: name: let + # When cross-compiling, fetchurl depends on libiconv, resulting + # in an infinite recursion without this. It's not clear why this + # worked fine when not cross-compiling + fetch = if name == "libiconv" + then fetchurlBoot + else fetchurl; + in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; inherit sha256; }; @@ -214,6 +226,11 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; + adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; + basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; + developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; + network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix new file mode 100644 index 000000000000..67fbf83496ed --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, appleDerivation, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + patchPhase = '' + substituteInPlace rpcgen/rpc_main.c \ + --replace "/usr/bin/cpp" "${stdenv.cc}/bin/cpp" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install developer_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix new file mode 100644 index 000000000000..357a87689a03 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -0,0 +1,43 @@ +{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: + +appleDerivation rec { + buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; + + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; + + # "spray" requires some files that aren't compiling correctly in xcbuild. + # "rtadvd" seems to fail with some missing constants. + # We disable spray and rtadvd here for now. + patchPhase = '' + substituteInPlace network_cmds.xcodeproj/project.pbxproj \ + --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ + --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install network_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1 5; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + # TODO: patch files to load from $out/ instead of /usr/ + + # mkdir -p $out/etc/ + # install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ + + # mkdir -p $out/local/OpenSourceVersions/ + # install network_cmds.plist $out/local/OpenSourceVersions/ + + # mkdir -p $out/System/Library/LaunchDaemons + # install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 000000000000..9aae2be1d033 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector<Token> _allowedClients; ++ std::vector<Token> _allowableClients; + std::vector<Token> _reexportedLibraries; + std::vector<Token> _symbols; + std::vector<Token> _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 2f13277d70c7..41fb090710cb 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -25,6 +25,7 @@ let ] ++ stdenv.lib.optionals stdenv.isDarwin [ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. ./undo-unknown-triple.patch + ./ld-tbd-v2.patch ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix new file mode 100644 index 000000000000..1d26a8b350be --- /dev/null +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -0,0 +1,63 @@ +{ runCommand +, lib +, llvm +, clang +, binutils +, stdenv +, coreutils +, gnugrep +}: + +/* As of this writing, known-good prefix/arch/simulator triples: + * aarch64-apple-darwin14 | arm64 | false + * arm-apple-darwin10 | armv7 | false + * i386-apple-darwin11 | i386 | true + * x86_64-apple-darwin14 | x86_64 | true + */ + +{ prefix, arch, simulator ? false }: let + sdkType = if simulator then "Simulator" else "OS"; + + sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; + + /* TODO: Properly integrate with gcc-cross-wrapper */ + wrapper = import ../../../build-support/cc-wrapper { + inherit stdenv coreutils gnugrep; + nativeTools = false; + nativeLibc = false; + inherit binutils; + libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; + cc = clang; + extraBuildCommands = '' + # ugh + tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp + mv cc-cflags.tmp $out/nix-support/cc-cflags + echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags + + # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust + echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before + ''; + }; +in { + cc = runCommand "${prefix}-cc" {} '' + mkdir -p $out/bin + ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc + mkdir -p $out/nix-support + echo ${llvm} > $out/nix-support/propagated-native-build-inputs + cat > $out/nix-support/setup-hook <<EOF + if test "\$dontSetConfigureCross" != "1"; then + configureFlags="\$configureFlags --host=${prefix}" + fi + EOF + fixupPhase + ''; + + binutils = runCommand "${prefix}-binutils" {} '' + mkdir -p $out/bin + ln -sv ${wrapper}/bin/ld $out/bin/${prefix}-ld + for prog in ar nm ranlib; do + ln -s ${binutils}/bin/$prog $out/bin/${prefix}-$prog + done + fixupPhase + ''; +} diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index a839158d0cfd..b525cbfc261b 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.1"; + name = "alsa-lib-1.1.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "0sa24fy3qf3jg63xxvfb7j8halj1qmdbcak2lyfx8bpd8hqnriwa"; + sha256 = "1mk1v2av6ibyydgr6f2mxrwy7clgnf0c68s9y2zvh1ibi7csr3fk"; }; patches = [ diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 22c3d4647747..7f065a1b9b06 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.0"; + name = "alsa-plugins-1.1.1"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"; + sha256 = "1w81z5jlwqhd1l2m7qrq69lc4k9dnrg1wn52jsl2hrf3hbhd394f"; }; # ToDo: a52, etc.? diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index d47c9fa2c1a1..3c2b53e0e3f1 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" "http://alsa.cybermirror.org/utils/${name}.tar.bz2" ]; - sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1"; + sha256 = "0wcha78c2sm8qqk5r3w83cvm8fp6fb1zpd35kmcm24kxhz007xks"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 885aec52dc79..6a5dced454c0 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l"; + sha256 = "0p8x8m1bdk560d64v010ck7dgm301cy7panxijczcf4p74clh835"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 279261745fbf..4fd022a418bb 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj"; + sha256 = "1ybn2akwj29hsjps6qgvg1ncf238002d3r7fik627ig8cgmx0wi4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 3170569d5634..ce0ef1ad1055 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.3"; in +let base = "batman-adv-2016.4"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf"; + sha256 = "1sshl700gwfnqih95q1kp7sya71svp8px2rn14dbb790hgfkc4mw"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index de318a9474a0..b54298124415 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.40"; + name = "bluez-5.43"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns"; + sha256 = "05cdnpz0w2lwq2x5ba87q1h2wgb4lfnpbnbh6p7499hx59fw1j8n"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c3842959883a..5814c184e660 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { (fetchpatch { name = "linux-4.8.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs"; + sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; }) ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e650b7abc1c7..ab5af38d8b67 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -27,6 +27,8 @@ with stdenv.lib; MODULE_COMPRESS_XZ y ''} + KERNEL_XZ y + # Debugging. DEBUG_KERNEL y TIMER_STATS y diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch new file mode 100644 index 000000000000..275d96fbb29b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch @@ -0,0 +1,12 @@ +diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst +--- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100 ++++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100 +@@ -9,7 +9,7 @@ + + # + +-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) ++__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort) + modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) + + PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e2d184c2c673..0fad9a578eff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.31"; + version = "4.4.34"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03fzi08xs9xp7r7bla6n3ykr81a365n8c5br1x7vwpgpacm63rk6"; + sha256 = "1xrk7adgapr4wpid6l6s05cypy3r28skynajy2h73xciradaqs9b"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index a1f5230ac002..e0e8fbaf95e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.10"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index a1f5230ac002..e0e8fbaf95e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.10"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 199ff9122cbe..a037343751ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -7,7 +7,7 @@ import ./generic.nix (args // rec { extraMeta = { branch = "4.1"; - maintainers = stdenv.lib.maintainers.layus; + maintainers = [ stdenv.lib.maintainers.layus ]; }; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index bb79494e171e..5838d2db1faf 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc4"; - modDirVersion = "4.9.0-rc4"; + version = "4.9-rc5"; + modDirVersion = "4.9.0-rc5"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "09w3milw95916g1mc19phw6w51kma7f1i3dfjar2ijnrcri3hvmx"; + sha256 = "0fpfczs13dwsy6nf0a0838399l34pxwxxljs472scvx9jbarm9j9"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3d4ba5d2b58d..999b9dc260a0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.7"; - grrev = "201611102210"; - sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; + { kver = "4.8.10"; + grrev = "201611232213"; + sha256 = "13v3h6cjd5qz57rf242kpxhz5rk094lg5kyf86a852fk58apk6b6"; }; # This patch relaxes grsec constraints on the location of usermode helpers, @@ -99,6 +99,14 @@ rec { patch = ./grsecurity-nixos-kmod.patch; }; + # A temporary work-around for execvp: arglist too long error during + # module_install. Without this, no modules are installed into the + # resulting output. + grsecurity_modinst = + { name = "grsecurity-modinst"; + patch = ./grsecurity-modinst.patch; + }; + crc_regression = { name = "crc-backport-regression"; patch = ./crc-regression.patch; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index f4e7ad1f2344..8887237b3046 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://archlinux.org/; + homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 42949a3557a6..10383a13e7e3 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - version = "0.7.3.2"; name = "pam_pgsql-${version}"; + version = "0.7.3.2"; src = fetchFromGitHub { owner = "pam-pgsql"; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 65cbf1c45890..1e4373f286c1 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "04hvsizzspfzfq6hhfif7ya9nwsc0cs6z6n2bq1zfh7agd8nqhzm"; + sha256 = "045dxgl4kkmq6205iw6fqyx3565gd607p3xpad5l9scdi3qdp6xv"; }; makeFlags = [ @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.gentoo.org/~vapier/dist/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice joachifm ]; }; } diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index 0c2fd9b6f86c..4611a3c09b77 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paxtest-${version}"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; - sha256 = "0j40h3x42k5mr5gc5np4wvr9cdf9szk2f46swf42zny8rlgxiskx"; + sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c86efe22f6ef..e84c964d675f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; - broken = buildKernel && (kernel.features.grsecurity or false); }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 14974f6d43fc..9a378988608a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -2,17 +2,15 @@ # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; -# module is incompatible with the PaX constification plugin -assert kernel != null -> !(kernel.features.grsecurity or false); let - name = "wireguard-unstable-${version}"; + name = "wireguard-experimental-${version}"; - version = "2016-10-25"; + version = "0.0.20161116.1"; src = fetchurl { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz"; - sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3"; + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; + sha256 = "1393p1fllxvl4j0c8qz35k39crmcwrp8rjwxwn1wyhhrks8rs3bk"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f2cf9eca4dc0..d7e406107b1b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -97,6 +97,9 @@ stdenv.mkDerivation rec { # Fix pkgconfig. ln -s ../share/pkgconfig $out/lib/pkgconfig + + # Remove tests because they add a runtime dependency on gcc + rm -rf $out/share/zfs/zfs-tests ''; meta = { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 7725a7272edd..62814b351b6b 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "07v7c6ippngkq269jmrf3gji389czcmz6phc3qwxn4j14cri9gi4"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz"; + sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr"; }; buildInputs = diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix new file mode 100644 index 000000000000..044d4fa50ab2 --- /dev/null +++ b/pkgs/servers/dante/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation (rec { + name = "dante-${version}"; + version = "1.4.1"; + + src = fetchurl { + url = "https://www.inet.no/dante/files/${name}.tar.gz"; + sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn"; + }; + + configureFlags = [ + "--with-libc=libc.so.6" + ]; + + meta = { + description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; + homepage = "https://www.inet.no/dante/"; + maintainers = [ stdenv.lib.maintainers.arobyn ]; + license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 4cccf237b9e2..1d8507fc4eb3 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python }: +{ stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh"; }; - buildInputs = [ apacheHttpd python ]; + buildInputs = [ apacheHttpd python2 ]; patchPhase = '' sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index cfd608962d85..00a5ac2563a3 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.11.5"; - sha256 = "1xmn5m1wjx1n11lwwlcg71836acb43gwq9ngk088jpx78liqlgr2"; + version = "1.11.6"; + sha256 = "1gc5phrzm2hbpvryaya6rlvasa00vjips4hv5q1rqbcfa6xsnlri"; }) diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix index 1a1ba1ad4486..b972192da7a7 100644 --- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://wiki2.dovecot.org/Plugins/Antispam; + homepage = "http://wiki2.dovecot.org/Plugins/Antispam"; description = "An antispam plugin for the Dovecot IMAP server"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index c4a5b0ebd290..75d12a5f66fe 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "mediatomb-${version}"; version = "0.12.1"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey_1_8_5 taglib libexif curl ffmpeg file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 40f580ffddf5..a29c6e16fa85 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.0.1"; + version = "1.1.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + sha256 = "0i3bmfs54s6m8im5gjm5ccyz31gpvp9cghxjxj46l0g77ncij7dj"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix index 29652a200f1e..c7c2468f9a11 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/aerospike/aerospike-client-go"; - rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; - sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63"; + sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219"; }; } { @@ -194,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "427fb6fc07997f43afa32f35e850833760e489a7"; - sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; }; } { @@ -266,17 +266,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/influxdb"; - rev = "e094138084855d444195b252314dfee9eae34cab"; - sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; - }; - } - { - goPackagePath = "github.com/influxdata/telegraf"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/telegraf"; - rev = "215f1b57d06845708e0867b11b9c853a56b00d81"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae"; + sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq"; }; } { @@ -289,12 +280,12 @@ }; } { - goPackagePath = "github.com/jmespath/go-jmespath"; + goPackagePath = "github.com/influxdata/wlog"; fetch = { type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; - sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; + url = "https://github.com/influxdata/wlog"; + rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; + sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; }; } { @@ -374,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nats"; - rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; - sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165"; + sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1"; }; } { @@ -383,8 +374,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nuid"; - rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; - sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + rev = "a5152d67cf63cbfb5d992a395458722a45194715"; + sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40"; }; } { @@ -406,15 +397,6 @@ }; } { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; @@ -464,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; + sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; }; } { @@ -473,17 +455,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; - sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; - }; - } - { - goPackagePath = "github.com/sparrc/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/sparrc/aerospike-client-go"; - rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; - sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26"; + sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib"; }; } { @@ -554,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; }; } { @@ -568,15 +541,6 @@ }; } { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; - sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; - }; - } - { goPackagePath = "golang.org/x/text"; fetch = { type = "git"; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix new file mode 100644 index 000000000000..439af4da565b --- /dev/null +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: + +stdenv.mkDerivation rec { + name = "riak_cs-2.1.1"; + + buildInputs = [ + which unzip erlang pam git wget + ]; + + src = fetchurl { + url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; + sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; + }; + + + postPatch = '' + sed -i deps/node_package/priv/base/env.sh \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \ + -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ + -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' + + sed -i ./Makefile \ + -e 's@rel: deps compile@rel: deps compile-src@' + ''; + + preBuild = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + make locked-deps + make rel + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + mv rel/riak-cs/etc rel/riak-cs/riak-etc + mkdir -p rel/riak-cs/etc + mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs + mv rel/riak-cs/* $out + + for prog in $out/bin/*; do + substituteInPlace $prog \ + --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ + ". $out/lib/env.sh" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainer = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix new file mode 100644 index 000000000000..5835b7e29c93 --- /dev/null +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: + +stdenv.mkDerivation rec { + name = "stanchion-2.1.1"; + + buildInputs = [ + which unzip erlang pam git wget + ]; + + src = fetchurl { + url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; + sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja"; + }; + + + postPatch = '' + sed -i deps/node_package/priv/base/env.sh \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \ + -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ + -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' + ''; + + preBuild = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + make rel + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + mv rel/stanchion/etc rel/stanchion/riak-etc + mkdir -p rel/stanchion/etc + mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion + mv rel/stanchion/* $out + + for prog in $out/bin/*; do + substituteInPlace $prog \ + --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ + ". $out/lib/env.sh" + done + + runHook postInstall + ''; + + meta = with lib; { + maintainers = with maintainers; [ mdaiter ]; + description = "Manager for Riak CS"; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 28d6295938a2..467f3ffb1d48 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.0.0.2261"; - vsnHash = "a17e99e"; - sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr"; + version = "1.2.7.2987"; + vsnHash = "1bef33a"; + sha256 = "17d1yisbikcp25mgn71rf8w76zhy015f33hxjj93swfm1qrq55hq"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do + for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a86862a14a56..a6f0fb800558 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.4326"; + version = "2.0.0.4389"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r"; + sha256 = "17vvfld6m1wr8yxvm9i7gaxny04ymvq86pizad816a73jk4h16my"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 422715925b88..f50a97afd20d 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.18"; + version = "10.1.19"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp"; + sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv"; }; prePatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c0e97dab8125..d5ffd5361e45 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }: let - common = { version, sha256, psqlSchema } @ args: stdenv.mkDerivation (rec { + common = { version, sha256, psqlSchema } @ args: + let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; src = fetchurl { @@ -14,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl ] + [ zlib readline openssl makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -30,9 +31,9 @@ let ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = - [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) - ./less-is-more.patch - ./hardcode-pgxs-path.patch + [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) + (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch) + (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch) ./specify_pkglibdir_at_runtime.patch ]; @@ -41,10 +42,11 @@ let LC_ALL = "C"; postConfigure = - '' - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "src/bin/pg_config/pg_config.c" --replace HARDCODED_PGXS_PATH $out/lib - ''; + let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in + '' + # Hardcode the path to pgxs so pg_config returns the path in $out + substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib + ''; postInstall = '' @@ -56,6 +58,12 @@ let substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld ''; + postFixup = lib.optionalString (!stdenv.isDarwin) + '' + # initdb needs access to "locale" command from glibc. + wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin + ''; + disallowedReferences = [ stdenv.cc ]; passthru = { @@ -75,34 +83,39 @@ let in { postgresql91 = common { - version = "9.1.23"; + version = "9.1.24"; psqlSchema = "9.1"; - sha256 = "1mgnfm65fspkq62skfy48rjkprnxcfhydw0x3ipp4sdkngl72x3z"; + sha256 = "1lz5ibvgz6cxprxlnd7a8iwv387idr7k53bdsvy4bw9ayglq83fy"; }; postgresql92 = common { - version = "9.2.18"; + version = "9.2.19"; psqlSchema = "9.2"; - sha256 = "1x1mxbwqvgj9s4y8pb4vv6fmmr36z5zl3b2ggb84ckdfhvakganp"; + sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x"; }; postgresql93 = common { - version = "9.3.14"; + version = "9.3.15"; psqlSchema = "9.3"; - sha256 = "1783kl0abf9az90mvs08pdh63d33cv2njc1q515zz89bqkqj4hsw"; + sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59"; }; postgresql94 = common { - version = "9.4.9"; + version = "9.4.10"; psqlSchema = "9.4"; - sha256 = "1jg1l6vrfwhfyqrx07bgcpqxb5zcp8zwm8qd2vcj0k11j0pac861"; + sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh"; }; postgresql95 = common { - version = "9.5.4"; + version = "9.5.5"; psqlSchema = "9.5"; - sha256 = "1l3fqxlpxgl6nrcd4h6lpi2hsiv56yg83n3xrn704rmdch8mfpng"; + sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2"; }; + postgresql96 = common { + version = "9.6.1"; + psqlSchema = "9.6"; + sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475"; + }; } diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch new file mode 100644 index 000000000000..6cd449769baa --- /dev/null +++ b/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.6.1-orig/src/common/config_info.c postgresql-9.6.1/src/common/config_info.c +--- postgresql-9.6.1-orig/src/common/config_info.c 2016-11-22 21:39:29.231929261 +0100 ++++ postgresql-9.6.1/src/common/config_info.c 2016-11-22 23:36:53.685163543 +0100 +@@ -118,7 +118,10 @@ + i++; + + configdata[i].name = pstrdup("PGXS"); ++ strlcpy(path, "HARDCODED_PGXS_PATH", sizeof(path)); ++/* commented out to be able to point to nix $out path + get_pkglib_path(my_exec_path, path); ++*/ + strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); + cleanup_path(path); + configdata[i].setting = pstrdup(path); diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/less-is-more-96.patch new file mode 100644 index 000000000000..f14af9dc2207 --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more-96.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.6.1-orig/src/include/fe_utils/print.h postgresql-9.6.1/src/include/fe_utils/print.h +--- postgresql-9.6.1-orig/src/include/fe_utils/print.h 2016-11-22 21:39:29.148932827 +0100 ++++ postgresql-9.6.1/src/include/fe_utils/print.h 2016-11-22 21:39:36.283626258 +0100 +@@ -18,7 +18,7 @@ + + /* This is not a particularly great place for this ... */ + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index ac2130d2917c..4994894a0388 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.13.1"; + version = "2.0.14"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "0zwdljaljzshrdcqsrr2l2ak2zcmsps4glac2lrg0xmb28phrjif"; + sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 640c200e7cf2..2c27d6483bed 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -823,11 +823,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.7"; + name = "libXi-1.7.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2; - sha256 = "0c70n4aq0ba628wr88ih4740nci9d9f6y3v96sx376vvlm7q6vwr"; + url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2; + sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index b2b5f2dc2366..161d7bda85e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -71,7 +71,7 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 34e67e171f4a..445c6c57bbf1 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02"; + name = "CVE-2013-4342.patch"; + sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v"; + }) + ]; + meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 7fc2a5f7143c..5f850a09ded1 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "16.08"; + version = "16.09"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0dqikg0xgph8xjvaxc9r6cyq7k7c8l5jiqr3kyhricziyak9hmdl"; + sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "040l336570lwxsvlli7kqaa18pz92jbf9105mx394ib62z72vvlp"; + outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf"; }; configureFlags = diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index b7a122b06834..4e76c7aef335 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-${version}"; - version = "2016-11-03"; + version = "2016-11-16"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "0b340bc3a5c58609a07987b296f773eaea17b274"; - sha256 = "1ifflqpbsk2gadbl0aqdmnm18bp21i9zcvjzlpldwma6crnfag68"; + rev = "3477ff25274fa75bd9e6110f391f6ad98ca2af72"; + sha256 = "07fvxg5jbw41j4nrs31hm0dfrwdh01gf5ik21gb4b4ddig2mjhc9"; }; phases = "installPhase"; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index bbad1f8cdf47..8280897c47ae 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "rush-1.7"; + name = "rush-1.8"; src = fetchurl { url = "mirror://gnu/rush/${name}.tar.gz"; - sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm"; + sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz"; }; - patches = [ ./gets.patch ]; + patches = [ ./fix-format-security-error.patch ]; doCheck = true; diff --git a/pkgs/shells/rush/fix-format-security-error.patch b/pkgs/shells/rush/fix-format-security-error.patch new file mode 100644 index 000000000000..ed3ad0aa4c1f --- /dev/null +++ b/pkgs/shells/rush/fix-format-security-error.patch @@ -0,0 +1,12 @@ +diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c +--- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200 ++++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100 +@@ -2330,7 +2330,7 @@ + break; + + default: +- wsp->ws_error (wordsplit_strerror (wsp)); ++ wsp->ws_error ("%s", wordsplit_strerror (wsp)); + } + } + diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 575692ca0126..0cde6a05943e 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -26,4 +26,10 @@ rec { stdenvCross = buildPackages.makeStdenvCross buildPackages.stdenv crossSystem buildPackages.binutilsCross buildPackages.gccCrossStageFinal; + + stdenvCrossiOS = let + inherit (buildPackages.darwin.ios-cross { prefix = crossSystem.config; inherit (crossSystem) arch; simulator = crossSystem.isiPhoneSimulator or false; }) cc binutils; + in buildPackages.makeStdenvCross + buildPackages.stdenv crossSystem + binutils cc; } diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 10086ee6a853..4be34a35acb3 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -38,13 +38,15 @@ rec { inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin; - inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross; + inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross stdenvCrossiOS; inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; # Select the appropriate stdenv for the platform `system'. stdenv = - if crossSystem != null then stdenvCross else + if crossSystem != null then + if crossSystem.useiOSCross or false then stdenvCrossiOS + else stdenvCross else if config ? replaceStdenv then stdenvCustom else if system == "i686-linux" then stdenvLinux else if system == "x86_64-linux" then stdenvLinux else diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index edd5c2785dcf..bd35970e0d12 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -139,7 +139,7 @@ let { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. - b) For `nix-env`, `nix-build` or any other Nix command you can add + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 070152427f29..06a7630c7bc0 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: -let version = "1.5.2"; +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "nitrogen-${version}"; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz"; - sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; + url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr"; }; - buildInputs = [ glib gtkmm2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - NIX_LDFLAGS = "-lX11"; + buildInputs = [ glib gtkmm2 ]; - patchPhase = "patchShebangs data/icon-theme-installer"; + NIX_CXXFLAGS_COMPILE = "-std=c++11"; + + patchPhase = '' + substituteInPlace data/Makefile.in --replace /usr/share $out/share + patchShebangs data/icon-theme-installer + ''; meta = { description = "A wallpaper browser and setter for X11"; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 5707679c03c1..c9530a5cdd98 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l"; + sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 871d5a9dbd8c..4ae367abf612 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages, pkgconfig +{ stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp @@ -8,7 +8,7 @@ with lib; let - inherit (pythonPackages) python cython buildPythonApplication; + inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-0.17.6"; namePrefix = ""; @@ -39,7 +39,7 @@ in buildPythonApplication rec { makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy websockify pygobject3 gst-python ]; diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 80805666a3a4..998b8d2e13de 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pythonPackages, fetchFromGitHub, dialog }: +{ stdenv, python2Packages, fetchFromGitHub, dialog }: -pythonPackages.buildPythonApplication rec { +# Latest version of certbot supports python3 and python3 version of pythondialog + +python2Packages.buildPythonApplication rec { name = "certbot-${version}"; version = "0.6.0"; @@ -11,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ConfigArgParse acme configobj @@ -26,7 +28,7 @@ pythonPackages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index eeefd4d99b5c..d0eb9e8fb15a 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; name = "tigervnc-${version}"; src = fetchgit { url = "https://github.com/TigerVNC/tigervnc/"; - sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij"; - rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3"; + sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3"; + rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf"; }; inherit fontDirectories; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 80c84236b8db..447ef1f623fc 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild + patches = [ ./CVE-2016-6321.patch ]; # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 075f1653adf8..4e035ab67acb 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper -, perl, pandoc, pythonPackages, git +, perl, pandoc, python2Packages, git , par2cmdline ? null, par2Support ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; - buildInputs = [ git pythonPackages.python ]; + buildInputs = [ git python2Packages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; postPatch = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bup \ --prefix PATH : ${git}/bin \ --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with pythonPackages; + (with python2Packages; [ setuptools tornado ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} ''; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index cf616a21e0aa..cc6453e801e6 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://lbzip2.org/; + homepage = "http://lbzip2.org/"; description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 0e7e6fbcdec2..525aa2fec28a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.3"; in +let version = "4.8.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1"; + sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f00a80603f97..8ff100394494 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.43.3"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index edb2978001b2..b207eeeb9c3d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -28,7 +28,6 @@ buildPythonApplication rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { c libudev = "${systemd.lib}/lib/libudev.so.1" diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 3946d6fcef84..bbaad516ebe0 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "10.0"; + version = "11.0"; src = fetchurl { url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p"; + sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh"; }; doCheck = true; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 606e049703df..ccee4f213141 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }: +{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp"; + sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw zlib libjpeg libtiff libpng ]; sourceRoot = "${name}/src"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 255ec2d536f6..32cc283bc3c9 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 9c125433c3a6..a09d60f788c7 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" "--with-cgraph=no" "--with-sparse=no" ] diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix new file mode 100644 index 000000000000..a39b4247109b --- /dev/null +++ b/pkgs/tools/misc/aptly/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }: + +buildGoPackage rec { + name = "aptly-${version}"; + version = "0.9.7"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "smira"; + repo = "aptly"; + sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00"; + }; + + goPackagePath = "github.com/smira/aptly"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + rm $bin/bin/man + wrapProgram "$bin/bin/aptly" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://www.aptly.info; + description = "Debian repository management tool"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix new file mode 100644 index 000000000000..f0163f34ae8b --- /dev/null +++ b/pkgs/tools/misc/aptly/deps.nix @@ -0,0 +1,245 @@ +[ + { + goPackagePath = "github.com/AlekSi/pointer"; + fetch = { + type = "git"; + url = https://github.com/AlekSi/pointer.git; + rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943"; + sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l"; + }; + } + { + goPackagePath = "github.com/awalterschulze/gographviz"; + fetch = { + type = "git"; + url = https://github.com/awalterschulze/gographviz.git; + rev = "20d1f693416d9be045340150094aa42035a41c9e"; + sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = https://github.com/aws/aws-sdk-go.git; + rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b"; + sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = https://github.com/cheggaaa/pb.git; + rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed"; + sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny"; + }; + } + { + goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; + fetch = { + type = "git"; + url = https://github.com/DisposaBoy/JsonConfigReader.git; + rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4"; + sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = https://github.com/gin-gonic/gin.git; + rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de"; + sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = https://github.com/go-ini/ini.git; + rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; + sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; + }; + } + { + goPackagePath = "github.com/jlaffaye/ftp"; + fetch = { + type = "git"; + url = https://github.com/jlaffaye/ftp.git; + rev = "fec71e62e457557fbe85cefc847a048d57815d76"; + sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = https://github.com/jmespath/go-jmespath.git; + rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = https://github.com/julienschmidt/httprouter.git; + rev = "46807412fe50aaceb73bb57061c2230fd26a1640"; + sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = https://github.com/mattn/go-shellwords.git; + rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4"; + sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2"; + }; + } + { + goPackagePath = "github.com/mkrautz/goar"; + fetch = { + type = "git"; + url = https://github.com/mkrautz/goar.git; + rev = "282caa8bd9daba480b51f1d5a988714913b97aad"; + sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2"; + }; + } + { + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = https://github.com/mxk/go-flowrate.git; + rev = "cca7078d478f8520f85629ad7c68962d31ed7682"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = https://github.com/ncw/swift.git; + rev = "384ef27c70645e285f8bb9d02276bf654d06027e"; + sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg"; + }; + } + { + goPackagePath = "github.com/smira/go-aws-auth"; + fetch = { + type = "git"; + url = https://github.com/smira/go-aws-auth.git; + rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a"; + sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh"; + }; + } + { + goPackagePath = "github.com/smira/go-xz"; + fetch = { + type = "git"; + url = https://github.com/smira/go-xz.git; + rev = "0c531f070014e218b21f3cfca801cc992d52726d"; + sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma"; + }; + } + { + goPackagePath = "github.com/smira/commander"; + fetch = { + type = "git"; + url = https://github.com/smira/commander.git; + rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47"; + sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa"; + }; + } + { + goPackagePath = "github.com/smira/flag"; + fetch = { + type = "git"; + url = https://github.com/smira/flag.git; + rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107"; + sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri"; + }; + } + { + goPackagePath = "github.com/smira/go-ftp-protocol"; + fetch = { + type = "git"; + url = https://github.com/smira/go-ftp-protocol.git; + rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa"; + sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx"; + }; + } + { + goPackagePath = "github.com/smira/go-uuid"; + fetch = { + type = "git"; + url = https://github.com/smira/go-uuid.git; + rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d"; + sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4"; + }; + } + { + goPackagePath = "github.com/smira/lzma"; + fetch = { + type = "git"; + url = https://github.com/smira/lzma.git; + rev = "7f0af6269940baa2c938fabe73e0d7ba41205683"; + sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = https://github.com/golang/snappy.git; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = https://github.com/syndtr/goleveldb.git; + rev = "917f41c560270110ceb73c5b38be2a9127387071"; + sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = https://github.com/ugorji/go.git; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = https://github.com/vaughan0/go-ini.git; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/wsxiaoys/terminal"; + fetch = { + type = "git"; + url = https://github.com/wsxiaoys/terminal.git; + rev = "5668e431776a7957528361f90ce828266c69ed08"; + sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = https://go.googlesource.com/crypto.git; + rev = "a7ead6ddf06233883deca151dffaef2effbf498f"; + sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc"; + }; + } +] diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 0bdcfa76fec1..577c0a33b3ee 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - boost, clasp, cmake, clingo, re2c + boost, clasp, cmake, gringo, re2c }: let @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; }; - buildInputs = [ boost clasp cmake clingo re2c ]; + buildInputs = [ boost clasp cmake gringo re2c ]; buildPhase = '' cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${clingo}/bin/gringo \ + -DGRINGO_LOC=${gringo}/bin/gringo \ -DCLASP_LOC=${clasp}/bin/clasp \ -DENCODING_LOC=$out/share/aspcud/specification.lp \ . diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ea486dd5154f..817510bfb761 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.2.4"; + version = "22.5.0"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475"; + sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 068d3e3866e0..74894da54182 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of tools for translating from BibTeX to HTML"; homepage = https://www.lri.fr/~filliatr/bibtex2html/; - licence = licenses.gpl2; + license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; }; diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix deleted file mode 100644 index 6ab0a68920f7..000000000000 --- a/pkgs/tools/misc/clingo/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, - bison, re2c, scons -}: - -let - version = "5.1.0"; -in - -stdenv.mkDerivation rec { - name = "clingo-${version}"; - - src = fetchFromGitHub { - owner = "potassco"; - repo = "clingo"; - rev = "v${version}"; - sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv"; - }; - - buildInputs = [ bison re2c scons ]; - - buildPhase = '' - scons --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "A grounder and solver for logic programs."; - homepage = http://potassco.org; - platforms = platforms.linux; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 8bba00b564d9..af518e7efa98 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: stdenv.mkDerivation { - name = "cloud-utils-0.27"; + # NOTICE: if you bump this, make sure to run + # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops + name = "cloud-utils-0.29"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; - sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; + sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; }; - patches = [ ./growpart-util-linux-2.26.patch ]; + buildInputs = [ makeWrapper ]; buildPhase = '' mkdir -p $out/bin cp bin/growpart $out/bin/growpart sed -i 's|awk|gawk|' $out/bin/growpart sed -i 's|sed|gnused|' $out/bin/growpart + ln -s sed $out/bin/gnused + wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" ''; dontInstall = true; dontPatchShebangs = true; + dontStrip = true; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 2bfe0eb42665..d146cd93343e 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -9,15 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; }; - preBuild = '' - substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild Foundation AddressBook ]; installPhase = '' mkdir -p $out/bin - cp ./build/Deployment/contacts $out/bin + cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; + ## FIXME: the framework setup hook isn't adding these correctly + NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; + meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ece9c5ed3824..2fe9ec2fbe79 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -8,12 +8,12 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { - version = "2.16.6"; + version = "2.16.8"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0lkhilwb1gsnk8q14wkrl78s0w3l8aghsaz00vprmkmcc3j1x14h"; + sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index d60b47ca0116..e70efe6c4f11 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,38 +1,16 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: -let # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { - name = "makedev-for-debootstrap"; - src = fetchurl { - url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz; - sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5"; - }; - patches = [ - (fetchurl { - url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz"; - sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw"; - }) - ]; - # TODO install man - installPhase = '' - mkdir -p $out/sbin - ls -l - t=$out/sbin/MAKEDEV - cp MAKEDEV $t - chmod +x $t - ''; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.80"; + version = "1.0.87"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6"; + sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; }; buildInputs = [ dpkg gettext gawk perl ]; @@ -72,8 +50,6 @@ in stdenv.mkDerivation rec { d=$out/share/debootstrap mkdir -p $out/{share/debootstrap,bin} - ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV - cp -r . $d cat >> $out/bin/debootstrap << EOF @@ -90,10 +66,6 @@ in stdenv.mkDerivation rec { mv debootstrap.8 $out/man/man8 ''; - passthru = { - inherit makedev; - }; - meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 0e3922d2928a..d26eb8f45aea 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -36,5 +36,6 @@ buildRustPackage rec { homepage = http://bsago.me/exa; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; + broken = true; }; } diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 000000000000..00879d9505b8 --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ./gringo-4.5.4-to_string.patch + ]; + + buildPhase = '' + scons WITH_PYTHON= --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 000000000000..7b5510e2344b --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include <cmath> ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch new file mode 100644 index 000000000000..b81eab4cd678 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400 ++++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500 +@@ -32,7 +32,7 @@ + #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter) + #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter) + +-#ifdef MISSING_STD_TO_STRING ++#if 0 + + #include <sstream> + diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 7e9b82a6a3f9..fabefb810313 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-08-06"; + version = "0.4.6a-2016-11-09"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1"; - sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq"; + rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd"; + sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cf28fa051326..8066cdd9bc5a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix new file mode 100644 index 000000000000..c35d3b666acb --- /dev/null +++ b/pkgs/tools/misc/magic-wormhole/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages }: + +with stdenv.lib; + +pythonPackages.buildPythonApplication rec { + name = "magic-wormhole-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; + sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; + }; + checkPhase = '' + ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole + ''; + + propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + meta = { + description = "Securely transfer data between computers"; + homepage = "https://github.com/warner/magic-wormhole"; + license = licenses.mit; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index e840aa15ec20..0c9ac20fcc3e 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs - libssh2 openssl ]; + buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/MidnightCommander/mc.git; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; updateWalker = true; }; } diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 66e91ed14240..aff329e04b69 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.2"; + version = "2016.11"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; }; buildInputs = [ file desktop_file_utils ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 6ea9d71bddc7..c309c8229747 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh"; + sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 023498de371c..d74f27700302 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160722"; + name = "parallel-20161022"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521"; + sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index ab72dc69fa47..0b48a5a66c6e 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3"; + sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 811e57c0a084..ac4f4524b992 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Command-line password safe"; homepage = https://github.com/janlelis/pws; license = licenses.mit; - maintainers = maintainers.swistak35; + maintainers = [ maintainers.swistak35 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 7eba2d2f939c..c5f017564af5 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w"; + sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 1e39ddf481bc..9a2f9b65e8c2 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,45 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils +{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill +, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools +, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux , enableRDW ? false, networkmanager }: let paths = lib.makeBinPath ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools - x86_energy_perf_policy gawk gnugrep coreutils + x86_energy_perf_policy gawk gnugrep coreutils utillinux ] ++ lib.optional enableRDW networkmanager ); in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww"; + sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn"; }; makeFlags = [ "DESTDIR=$(out)" - "TLP_LIBDIR=/lib" - "TLP_SBIN=/bin" - "TLP_BIN=/bin" + "TLP_SBIN=$(out)/bin" + "TLP_BIN=$(out)/bin" + "TLP_TLIB=$(out)/share/tlp-pm" + "TLP_PLIB=$(out)/lib/pm-utils" + "TLP_ULIB=$(out)/lib/udev" + "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d" + "TLP_SHCPL=$(out)/share/bash-completion/completions" + "TLP_MAN=$(out)/share/man" + "TLP_NO_INIT=1" "TLP_NO_PMUTILS=1" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper file ]; buildInputs = [ perl ]; - installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; postInstall = '' - for i in $out/bin/* $out/lib/udev/tlp-*; do - sed -i "s,/usr/lib/,$out/lib/,g" "$i" - if [[ "$(basename "$i")" = tlp-*list ]]; then + cp -r $out/$out/* $out + rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) + + for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do + if file "$i" | grep -q Perl; then # Perl script; use wrapProgram wrapProgram "$i" \ --prefix PATH : "${paths}" @@ -48,21 +57,6 @@ in stdenv.mkDerivation rec { sed -i '2iexport PATH=${paths}:$PATH' "$i" fi done - - for i in $out/lib/udev/rules.d/*; do - sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" - done - - for i in man/*; do - install -D $i $out/share/man/man''${i##*.}/$(basename $i) - done - '' + lib.optionalString enableRDW '' - for i in $out/etc/NetworkManager/dispatcher.d/*; do - sed -i \ - -e "s,/usr/lib/,$out/lib/,g" \ - -e '2iexport PATH=${paths}:$PATH' \ - "$i" - done ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 9052c5ce6d53..95d1a7275d9b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -3,10 +3,10 @@ let bashCompletion = fetchFromGitHub { - owner = "przepompownia"; + owner = "imomaliev"; repo = "tmux-bash-completion"; - rev = "678a27616b70c649c6701cae9cd8c92b58cc051b"; - sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf"; + rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d"; + sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8"; }; in diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a2dd91e83bc9..70719bdfdf1f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.08.1"; + version = "2016.11.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; + sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index eec84e103867..ab82851f178f 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw"; + sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://aria2.github.io; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; - maintainers = with maintainers; [ koral jgeerds ]; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ koral jgeerds ]; }; } diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4f05220232fc..af5d8309507d 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, gettext, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, gettext, libssl }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.7"; + version = "2.11"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0"; + sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky"; }; - buildInputs = [ gettext autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ gettext libssl ]; installFlags = [ "ETCDIR=$(out)/etc" ]; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 7b441c72cbf4..74dd91316800 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -10,14 +10,14 @@ let else if stdenv.system == "i686-linux" then "x86" else abort "Unsupported architecture"; sha256 = - if stdenv.system == "x86_64-linux" then "0l8y8z8fqvxrypx3dp83mm3qr9shgpcn5h7x2k2z13gp4aq0yw6g" - else if stdenv.system == "i686-linux" then "00nl442k4pij9fm8inlk4qrcvbnz55fbwf3sm3dgbzvd5jcgsa0f" + if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3" + else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else abort "Unsupported architecture"; libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { name = "logmein-hamachi-${version}"; - version = "2.1.0.165"; + version = "2.1.0.174"; src = fetchurl { url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d96bc08495f0..0bd79890dc02 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 5e09bb7229f8..591994ddccf6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = "https://github.com/seriyps/NetworkManager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 4c42771be170..a37b1bdbd98a 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }: +{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; +assert stdenv.isLinux -> libseccomp != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8p8"; + name = "ntp-4.2.8p9"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra"; + sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p"; }; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + "--with-openssl-libdir=${openssl.out}/lib" + "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--enable-linuxcaps" + "--enable-libseccomp" + ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libcap openssl ]; + buildInputs = [ libcap openssl libseccomp perl ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 93541bd06039..a11b34ef9914 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { - version = "7.0.6"; + version = "7.0.9"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc"; + sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac"; }; doCheck = false; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 202cb4c6ba61..47d1dbbcbe69 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p4"; + version = "6.0p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; + sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"; }; configureFlags = [ diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index f59e70ed3187..186d5109b94a 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, which, systemd }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, openresolv, coreutils, systemd }: let - binPath = lib.makeBinPath [ coreutils openresolv which systemd ]; + binPath = lib.makeBinPath [ coreutils openresolv systemd ]; in stdenv.mkDerivation rec { - name = "update-resolv-conf-2016-04-24"; + name = "update-resolv-conf-2016-09-30"; src = fetchFromGitHub { owner = "masterkorp"; repo = "openvpn-update-resolv-conf"; - rev = "994574f36b9147cc78674a5f13874d503a625c98"; - sha256 = "1rvzlaj53k8s09phg4clsyzlmf44dmwwyvg0nbg966sxp3xsqlxc"; + rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34"; + sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index a01c39743fe6..6bcf2b80a136 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.36"; + version = "5.37"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb"; + sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 09f48d9fa1ad..fb0ee64cc2c0 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: stdenv.mkDerivation rec { - name = "vtun-3.0.3"; + name = "vtun-3.0.4"; src = fetchurl { url = "mirror://sourceforge/vtun/${name}.tar.gz"; - sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39"; + sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; }; patches = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index c1d4cd319b8f..103ef8d77765 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.14"; + version = "1.18.15"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; + sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 9c4c2600fb40..87ed6295977f 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -14,6 +14,7 @@ python2Packages.buildPythonApplication { pythonPath = with python2Packages; [ prettytable boto + boto3 hetzner libcloud azure-storage @@ -22,6 +23,8 @@ python2Packages.buildPythonApplication { azure-mgmt-resource azure-mgmt-storage adal + pysqlite # Go back to builtin sqlite once Python 2.7.13 is released + datadog ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index bba392e30e76..fb5791be2397 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.4"; + version = "2016-11-23"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; + # Hydra doesn't serve production outputs anymore :( + url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2"; + sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz"; }; }) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 0cb34b2e73c9..88df4d78d26b 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl -, libmilter, pcre, freshclamConf ? null }: +, libmilter, pcre }: stdenv.mkDerivation rec { name = "clamav-${version}"; @@ -10,9 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; + # don't install sample config files into the absolute sysconfdir folder + postPatch = '' + substituteInPlace Makefile.in --replace ' etc ' ' ' + ''; + + buildInputs = [ + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + ]; configureFlags = [ + "--sysconfdir=/etc/clamav" "--with-zlib=${zlib.dev}" "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" @@ -22,10 +30,12 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-pcre=${pcre.dev}" "--enable-milter" - "--disable-clamav" ]; - fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else ""; + postInstall = '' + mkdir $out/etc + cp etc/*.sample $out/etc + ''; meta = with stdenv.lib; { homepage = http://www.clamav.net; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5ee630539b69..f26b2d3308b7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.18"; + version = "4.1.19"; src = fetchFromGitHub { - sha256 = "049rxrlcwcb9yir8q2inmqlslp49alpgm4pccl138xl34cg1hyhl"; + sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index fb72782abee6..e5bf5a08afc7 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -2,11 +2,12 @@ , libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-0.6.0"; + name = "fprintd-${version}"; + version = "0.7.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1by6nvlrqkwzcz2v2kyq6avi3h384vmlr42vj9s2yzcinkp64m1z"; + sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; }; buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b7a71332e772..a4b47843583f 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.15"; + version = "2.1.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362"; + sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"; }; buildInputs = [ @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index fb7b8cc9fe74..a38e70df6323 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kbfs-2016-08-02-git"; - version = "1.0.16"; + name = "kbfs-2016-11-18-git"; + version = "1.0.2"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "a8f0714536d15668e0f561ec4d3324762c8cf030"; - sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd"; + rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c"; + sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c4d0f20d6c2d..fbed233b090d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.17"; + version = "1.0.18"; rev = "v${version}"; goPackagePath = "github.com/keybase/client"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; inherit rev; - sha256 = "14cj0npsvnc3whw7gashgd7lhj3lvjdkivsnvsjg7dp3hifvqxnx"; + sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix new file mode 100644 index 000000000000..814bc0d85302 --- /dev/null +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "phrasendrescher-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz"; + sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2"; + }; + + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "Cracking tool that finds passphrases of SSH keys"; + homepage = "http://leidecker.info/projects/phrasendrescher.shtml"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 4bd199686763..5f282dd378a5 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; - meta = { + meta = with stdenv.lib; { homepage = https://www.opendnssec.org/softhsm; description = "Cryptographic store accessible through a PKCS #11 interface"; - license = stdenv.lib.licenses.bsd2; - maintainers = stdenv.lib.maintainers.leenaars; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.leenaars ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 900ad39ecb23..be93b291dcc2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else - "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; + "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else + "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index eed5c06552b2..055a480f92ad 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: +{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.19.0"; + name = "monit-5.20.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y"; + sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b"; }; nativeBuildInputs = [ bison flex ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ]; + buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ]; configureFlags = [ "--with-ssl-incl-dir=${openssl.dev}/include" diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index baa18aacdfb8..d5936b00806e 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0k10sl262d9slrln1vkgsxlr1pnfxzd3ycs552bl7ynf0zxpl48h"; + sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g"; }; buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { preInstall = "sysconfdir=$out/etc"; - meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index b83f97a4b8d7..9851f9596c36 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.9"; + version = "0.4.10.2"; src = fetchFromGitHub { - sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; + sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 370fcf265d51..b6340fd2df46 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; - maintainers = "mckean.kylej@gmail.com"; + maintainers = [ "mckean.kylej@gmail.com" ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index c76e0f49734e..91cecce61225 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, patchelf }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { name = "xidel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { } else throw "xidel is not supported on ${stdenv.system}"; - buildInputs = [ dpkg patchelf ]; + buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" - patchelf --set-interpreter "$interpreter" "$out/bin/xidel" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919e1892edb5..e8600419a707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,12 +203,25 @@ in fetchFromGitHub = { owner, repo, rev, name ? "${repo}-${rev}-src", + fetchSubmodules ? false, ... # For hash agility - }@args: fetchzip ({ - inherit name; - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - meta.homepage = "https://github.com/${owner}/${repo}/"; - } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; + }@args: + let + baseUrl = "https://github.com/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + in if fetchSubmodules then + fetchgit ({ + inherit name rev fetchSubmodules; + url = "${baseUrl}.git"; + } // passthruAttrs) + else + # We prefer fetchzip in cases we don't need submodules as the hash + # is more stable in that case. + fetchzip ({ + inherit name; + url = "${baseUrl}/archive/${rev}.tar.gz"; + meta.homepage = "${baseUrl}/"; + } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { owner, repo, rev, name ? "${repo}-${rev}-src", @@ -282,6 +295,8 @@ in pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + singularity-tools = callPackage ../build-support/singularity-tools { }; + srcOnly = args: callPackage ../build-support/src-only args; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -406,6 +421,8 @@ in apt-offline = callPackage ../tools/misc/apt-offline { }; + aptly = callPackage ../tools/misc/aptly { }; + apulse = callPackage ../misc/apulse { }; archivemount = callPackage ../tools/filesystems/archivemount { }; @@ -569,7 +586,9 @@ in awstats = callPackage ../tools/system/awstats { }; - axel = callPackage ../tools/networking/axel { }; + axel = callPackage ../tools/networking/axel { + libssl = openssl; + }; azureus = callPackage ../tools/networking/p2p/azureus { }; @@ -762,7 +781,9 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; - contacts = callPackage ../tools/misc/contacts { }; + contacts = callPackage ../tools/misc/contacts { + inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + }; coturn = callPackage ../servers/coturn { }; @@ -770,6 +791,8 @@ in daemontools = callPackage ../tools/admin/daemontools { }; + dante = callPackage ../servers/dante { }; + datamash = callPackage ../tools/misc/datamash { }; datefudge = callPackage ../tools/system/datefudge { }; @@ -827,6 +850,8 @@ in dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + ecasound = callPackage ../applications/audio/ecasound { }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; eggdrop = callPackage ../tools/networking/eggdrop { }; @@ -879,7 +904,7 @@ in goa = callPackage ../development/tools/goa { }; - clingo = callPackage ../tools/misc/clingo { }; + gringo = callPackage ../tools/misc/gringo { }; gti = callPackage ../tools/misc/gti { }; @@ -895,6 +920,7 @@ in long-shebang = callPackage ../misc/long-shebang {}; + magic-wormhole = callPackage ../tools/misc/magic-wormhole {}; mathics = pythonPackages.mathics; meson = callPackage ../development/tools/build-managers/meson { }; @@ -1289,6 +1315,10 @@ in cudatoolkit = cudatoolkit8; }; + cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 { + cudatoolkit = cudatoolkit8; + }; + curlFull = curl.override { idnSupport = true; ldapSupport = true; @@ -2279,6 +2309,8 @@ in jscoverage = callPackage ../development/tools/misc/jscoverage { }; + jsduck = callPackage ../development/tools/jsduck { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -2373,6 +2405,8 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; @@ -3721,6 +3755,11 @@ in sstp = callPackage ../tools/networking/sstp {}; + subsurface = + qt55.callPackage ../applications/misc/subsurface { + libgit2 = pkgs.libgit2_0_23; + }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; @@ -4469,6 +4508,8 @@ in arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; + asn1c = callPackage ../development/compilers/asn1c { }; + aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; @@ -4844,7 +4885,7 @@ in # Haskell and GHC - haskell = callPackage ./haskell-packages.nix { }; + haskell = callPackage ./haskell-packages.nix { inherit crossSystem; }; haskellPackages = haskell.packages.ghc801.override { overrides = config.haskellPackageOverrides or (self: super: {}); @@ -5004,6 +5045,7 @@ in gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + llvm = llvm_37; }; julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { @@ -5032,7 +5074,8 @@ in llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_37; + llvmPackages = recurseIntoAttrs + (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39); llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -5178,6 +5221,7 @@ in rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; + rust-bindgen = callPackage ../development/tools/rust/bindgen { }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -5332,6 +5376,13 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; + erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -5481,7 +5532,7 @@ in mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf2_5; + pythonProtobuf = pythonPackages.protobuf2_6; perf = linuxPackages.perf; }; @@ -5554,7 +5605,13 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; + python26Full = python26.override{includeModules=true;self=python26Full;}; + 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;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; @@ -5653,12 +5710,12 @@ in spark = callPackage ../applications/networking/cluster/spark { }; - spidermonkey = callPackage ../development/interpreters/spidermonkey { }; - spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; - spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; - spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; - spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; + spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { }; + spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; + spidermonkey = spidermonkey_31; supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -5838,6 +5895,8 @@ in bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + bloaty = callPackage ../development/tools/bloaty { }; + bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; @@ -6474,7 +6533,11 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit (darwin) cctools bootstrap_cmds binutils; + stdenv = clangStdenv; + }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -6583,9 +6646,8 @@ in beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages) clang-unwrapped; - inherit (xlibs) libX11; - inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; + inherit (llvmPackages_37) llvm clang-unwrapped; + inherit (xorg) libX11 libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; inherit (python3Packages) python; inherit (purePackages) gl; }; @@ -7034,6 +7096,7 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; + libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { }; @@ -7390,6 +7453,9 @@ in iml = callPackage ../development/libraries/iml { }; imlib2 = callPackage ../development/libraries/imlib2 { }; + imlib2-nox = imlib2.override { + x11Support = false; + }; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; @@ -7661,7 +7727,7 @@ in libdevil-nox = libdevil.override { libX11 = null; - mesa = null; + mesa_noglu = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; @@ -7670,6 +7736,8 @@ in libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; @@ -8788,9 +8856,7 @@ in polarssl = mbedtls; - polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_17; - }; + polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; @@ -8826,6 +8892,7 @@ in protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0. protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { }); + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; @@ -9372,27 +9439,27 @@ in }); v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_30_33 = callPackage ../development/libraries/v8/3.30.33.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8 = callPackage ../development/libraries/v8 { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_static = lowPrio (self.v8.override { static = true; }); @@ -9528,11 +9595,6 @@ in xapian = callPackage ../development/libraries/xapian { }; - xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python - php = php56; - sphinx = pythonPackages.sphinx; - }; - xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; }; @@ -9719,10 +9781,6 @@ in saxonb = callPackage ../development/libraries/java/saxon/default8.nix { }; - sharedobjects = callPackage ../development/libraries/java/shared-objects { - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { @@ -9951,7 +10009,7 @@ in charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; erlang = erlangR16; @@ -10054,9 +10112,7 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - mediatomb = callPackage ../servers/mediatomb { - spidermonkey = spidermonkey_185; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; @@ -10194,6 +10250,14 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; + riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + erlang = erlang_basho_R16B03; + }; + + stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { + erlang = erlang_basho_R16B03; + }; + influxdb = callPackage ../servers/nosql/influxdb { }; mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { @@ -10264,7 +10328,8 @@ in postgresql92 postgresql93 postgresql94 - postgresql95; + postgresql95 + postgresql96; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -10608,6 +10673,10 @@ in swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation {}; + ios-cross = callPackage ../os-specific/darwin/ios-cross { + inherit (darwin) binutils; + }; + xcode = callPackage ../os-specific/darwin/xcode {}; osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; @@ -11119,7 +11188,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; + kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; @@ -11721,6 +11790,8 @@ in inherit (gnome3) gsettings_desktop_schemas; + go-font = callPackage ../data/fonts/go-font { }; + gyre-fonts = callPackage ../data/fonts/gyre {}; hack-font = callPackage ../data/fonts/hack { }; @@ -12000,6 +12071,12 @@ in abook = callPackage ../applications/misc/abook { }; + acd-cli = callPackage ../applications/networking/sync/acd_cli { + inherit (python35Packages) + buildPythonApplication appdirs colorama dateutil + requests2 requests_toolbelt sqlalchemy fusepy; + }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -12637,8 +12714,6 @@ in notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; @@ -12882,6 +12957,8 @@ in puddletag = callPackage ../applications/audio/puddletag { }; + w_scan = callPackage ../applications/video/w_scan { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; @@ -12889,6 +12966,7 @@ in wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { withQt = false; withGtk = false; + inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; @@ -13253,8 +13331,14 @@ in hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; + singularity = callPackage ../applications/virtualization/singularity { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; @@ -13961,16 +14045,12 @@ in qtbase = qt55; }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { - # No need to build Emacs - notmuch.el works just fine without - # byte-compilation. Use emacsPackages.notmuch if you want to - # byte-compiled files - emacs = null; - sphinx = pythonPackages.sphinx; - }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; + # Open Stack nova = callPackage ../applications/virtualization/openstack/nova.nix { }; keystone = callPackage ../applications/virtualization/openstack/keystone.nix { }; @@ -14091,6 +14171,8 @@ in phototonic = qt5.callPackage ../applications/graphics/phototonic { }; + phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phwmon = callPackage ../applications/misc/phwmon { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -14157,6 +14239,8 @@ in gtksharp = gtk-sharp-2_0; }; + plover = callPackage ../applications/misc/plover { }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; pmenu = callPackage ../applications/misc/pmenu { }; @@ -14610,6 +14694,8 @@ in git = gitMinimal; }; + ssr = callPackage ../applications/audio/soundscape-renderer {}; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; @@ -14708,7 +14794,9 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (pythonPackages) gyp; + }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -14756,7 +14844,7 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte_290; + vte = gnome3.vte; gtk = gtk3; }; @@ -15017,13 +15105,15 @@ in # Version without X11 w3m-nox = w3m.override { x11Support = false; + imlib2 = imlib2-nox; }; # Version for batch text processing, not a good browser w3m-batch = w3m.override { graphicsSupport = false; - x11Support = false; mouseSupport = false; + x11Support = false; + imlib2 = imlib2-nox; }; weechat = callPackage ../applications/networking/irc/weechat { @@ -15323,8 +15413,7 @@ in roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) gsettings_desktop_schemas; - vte = gnome3.vte_290; + inherit (gnome3) gsettings_desktop_schemas vte; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -15500,7 +15589,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {}; drumkv1 = callPackage ../applications/audio/drumkv1 { }; @@ -15591,6 +15680,8 @@ in gnugo = callPackage ../games/gnugo { }; + gogui = callPackage ../games/gogui {}; + gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; @@ -16353,6 +16444,8 @@ in plink = callPackage ../applications/science/biology/plink/default.nix { }; + plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; + samtools = callPackage ../applications/science/biology/samtools/default.nix { }; bwa = callPackage ../applications/science/biology/bwa/default.nix { }; @@ -16967,6 +17060,8 @@ in faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; + faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; + faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; fceux = callPackage ../misc/emulators/fceux { }; @@ -17067,7 +17162,7 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = nixops;# callPackage ../tools/package-management/nixops/unstable.nix { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; @@ -17517,4 +17612,6 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; fpm2 = callPackage ../tools/security/fpm2 { }; + + simplenote = callPackage ../applications/misc/simplenote { }; } diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 633b4f8a211b..ed9e09802b7d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ with pkgs; rec { libxml2 = (pkgs.libxml2.override { stdenv = emscriptenStdenv; - supportPython = false; + pythonSupport = false; }).overrideDerivation (old: { buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f305c55dbfa5..a3cb0a8ca1c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, stdenv }: +{ pkgs, callPackage, stdenv, crossSystem }: rec { @@ -49,6 +49,8 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; + inherit crossSystem; + selfPkgs = packages.ghcHEAD; }; ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { bootPkgs = packages.ghc784; @@ -121,6 +123,11 @@ rec { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + # TODO Support for multiple variants here + ghcCross = callPackage ../development/haskell-modules { + ghc = compiler.ghcHEAD.crossCompiler; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + }; ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e694f188e9c..391e2c80a57f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -158,6 +158,8 @@ let erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { }; + estring = callPackage ../development/ocaml-modules/estring { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { @@ -259,7 +261,13 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { + lwt = ocaml_lwt; + }; + + notty = callPackage ../development/ocaml-modules/notty { + lwt = ocaml_lwt; + }; ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -331,12 +339,16 @@ let ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; otfm = callPackage ../development/ocaml-modules/otfm { }; + otr = callPackage ../development/ocaml-modules/otr { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; @@ -364,6 +376,10 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; + tls = callPackage ../development/ocaml-modules/tls { + lwt = ocaml_lwt; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; @@ -639,7 +655,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ); - + glsurf = callPackage ../applications/science/math/glsurf { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ef49116bee5..5ae95864232b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7413,10 +7413,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.042"; + name = "Log-Any-1.045"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "b2cadb25a147bd49afdab1092a4a37268f307fcb6524a679623647a22501de84"; + sha256 = "d95180c0c2d50d7d3a541e0c79d83ee6b4ad5787e1785b361fed450c2dec8400"; }; meta = { homepage = https://github.com/preaction/Log-Any; @@ -7494,10 +7494,10 @@ let self = _self // overrides; _self = with self; { }; LogLog4perl = buildPerlPackage rec { - name = "Log-Log4perl-1.47"; + name = "Log-Log4perl-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; - sha256 = "9001dded011226538b9a50c7856815bb0dba72a1e6218fdcaba56f651356b96f"; + sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98"; }; meta = { homepage = https://mschilli.github.io/log4perl/; @@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999727"; + name = "Math-BigInt-1.999800"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e"; + sha256 = "216096d1f937252bfc449b1de01b760ffaab46e753e150cc2a685f4935bd030d"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -7803,10 +7803,10 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260804"; + name = "Math-BigRat-0.260805"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "f9bf5c007c0f141df7c7887d3482d47033cf7deab094a01e2863f31bacd7ef8a"; + sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -10066,10 +10066,10 @@ let self = _self // overrides; _self = with self; { }; pcscperl = buildPerlPackage { - name = "pcsc-perl-1.4.13"; + name = "pcsc-perl-1.4.14"; src = fetchurl { - url = mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.13.tar.bz2; - sha256 = "a5f7dfb30be0346cfe80d47749994dab861592929d80786104693987b36e3684"; + url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; + sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; nativeBuildInputs = [ pkgs.pkgconfig ]; @@ -10077,7 +10077,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6313ff5372cd..1808d65b75c4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -79,10 +79,10 @@ let sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg"; configureFlags = [ - "--with-spidermonkey=${pkgs.spidermonkey_185}" + "--with-spidermonkey=${pkgs.spidermonkey_1_8_5}" ]; - buildInputs = [ pkgs.spidermonkey_185 ]; + buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; xdebug = if isPhp7 then xdebug24 else xdebug23; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4537e1222a8..40b1b9adedfb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29,7 +29,7 @@ let in { - inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; # helpers @@ -336,34 +336,6 @@ in { }; }; - acd_cli = buildPythonPackage rec { - name = pname + "-" + version; - pname = "acd_cli"; - version = "0.3.1"; - - disabled = !isPy33; - doCheck = !isPy33; - - src = pkgs.fetchFromGitHub { - owner = "yadayada"; - repo = pname; - rev = version; - sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s"; - }; - - propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ]; - - makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ]; - - meta = { - description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; - homepage = https://github.com/yadayada/acd_cli; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - altair = buildPythonPackage rec { name = "altair-1.0.0"; @@ -522,13 +494,13 @@ in { }; afew = buildPythonPackage rec { - rev = "3f1e5e93119788984c2193292c988ac81ecb0a45"; - name = "afew-git-2016-01-04"; + rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; + name = "afew-git-2016-02-29"; src = pkgs.fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw"; + sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; }; buildInputs = with self; [ pkgs.dbacl ]; @@ -645,11 +617,11 @@ in { asgiref = buildPythonPackage rec { name = "asgiref-${version}"; - version = "0.14.0"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + sha256 = "1jg4nxjsn7nc4vd3170xd60m6syn57m6xwyyna6r68vniq8nhg7i"; }; propagatedBuildInputs = with self ; [ six ]; @@ -663,11 +635,11 @@ in { asgi_ipc = buildPythonPackage rec { name = "asgi_ipc-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + sha256 = "03phyfj30s4sgaqfbmv38nfvx3kdmjwsh3558d2lxrf2gdrimmf9"; }; propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; @@ -681,11 +653,11 @@ in { asgi_redis = buildPythonPackage rec { name = "asgi_redis-${version}"; - version = "0.14.1"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + sha256 = "1pdzxannmgb0as2x6xy0rk4xi8ygnsggpsa0z31pzpwbk6jsgwxd"; }; # Requires a redis server available @@ -795,6 +767,8 @@ in { rev = "0.3.7"; name = "alot-${rev}"; + disabled = isPy3k; + src = pkgs.fetchFromGitHub { owner = "pazz"; repo = "alot"; @@ -1067,7 +1041,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -1484,7 +1458,7 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; meta = with stdenv.lib; { - homepage = https://github.com/dimka665/awesome-slugify; + homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; license = licenses.gpl3; platforms = platforms.all; @@ -2200,6 +2174,10 @@ in { }; }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = pkgs.boost.override {inherit python;}; + buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -4303,11 +4281,11 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; + sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4324,11 +4302,11 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; + sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae"; }; }; @@ -8694,17 +8672,17 @@ in { python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; - version = "0.1.7"; + version = "0.1.35"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx"; + sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0"; }; - propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; + propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8722,7 +8700,7 @@ in { }; meta = { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; @@ -8747,7 +8725,7 @@ in { ''; meta = { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; @@ -8950,7 +8928,7 @@ in { }; meta = { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; @@ -8969,15 +8947,18 @@ in { sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq"; }; - doCheck = pythonOlder "3.5"; - buildInputs = with self; [ decorator appdirs six numpy + pytest ]; + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + meta = { homepage = https://github.com/inducer/pytools/; description = "Miscellaneous Python lifesavers."; @@ -9102,7 +9083,7 @@ in { }; meta = { - homepage = http://sarge.readthedocs.org/; + homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; platform = platforms.all; @@ -9467,16 +9448,16 @@ in { regex = buildPythonPackage rec { name = "regex-${version}"; - version = "2016.01.10"; + version = "2016.11.18"; src = pkgs.fetchurl { url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "1q3rbmnijjzn7y3cm3qy49b5lqw1fq38zv974xma387lwc37d9q2"; + sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; }; meta = { description = "Alternative regular expression module, to replace re"; - homepage = https://bitbucket.org/mrabarnett/mrab-regex; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; license = licenses.psfl; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; @@ -9910,29 +9891,6 @@ in { }; }; - django_1_5 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.5.12"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_appconf = buildPythonPackage rec { name = "django-appconf-${version}"; version = "1.0.1"; @@ -10082,21 +10040,21 @@ in { }; django_tagging = buildPythonPackage rec { - name = "django-tagging-0.3.1"; + name = "django-tagging-0.4.5"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "e5fbeb7ca6e0c22a9a96239095dff508040ec95171e51c69e6f8ada72ea4bce2"; + sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; }; # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ django_1_5 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A generic tagging application for Django projects"; - homepage = http://code.google.com/p/django-tagging/; + homepage = https://github.com/Fantomas42/django-tagging; }; }; @@ -11023,17 +10981,17 @@ in { flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; - version = "0.11"; + version = "0.12"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "1vs59gygwhwqj37if8hiw6vd2rns09xkblaz4qkmpp6hpy3shrvf"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; }; propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "http://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; @@ -11078,11 +11036,11 @@ in { flask_login = buildPythonPackage rec { name = "Flask-Login-${version}"; - version = "0.2.2"; + version = "0.4.0"; src = pkgs.fetchurl { url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + sha256 = "19w2f33lglkyvxqnj3qghhxa4pr8mp13235k1bd557x52imkapnj"; }; propagatedBuildInputs = with self; [ flask ]; @@ -11091,7 +11049,7 @@ in { doCheck = false; meta = { - homepage = http://github.com/miracle2k/flask-assets; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; @@ -11136,7 +11094,7 @@ in { propagatedBuildInputs = with self; [ flask blinker nose ]; meta = { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; platforms = platforms.all; @@ -11175,7 +11133,7 @@ in { propagatedBuildInputs = with self; [ flask ]; meta = { - homepage = http://github.com/smurfix/flask-script; + homepage = "http://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; platforms = platforms.all; @@ -11954,7 +11912,7 @@ in { meta = { homepage = "http://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; - license = licenses.lgpl2; + license = licenses.lgpl3; maintainers = with maintainers; [ koral ]; }; }; @@ -12493,6 +12451,28 @@ in { }; }; + hkdf = buildPythonPackage rec { + name = "hkdf-${version}"; + version = "0.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hkdf/${name}.tar.gz"; + sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; + }; + + buildInputs = with self; [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; + homepage = "https://github.com/casebeer/python-hkdf"; + license = licenses.bsd2; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.10"; @@ -12724,12 +12704,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295"; + sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; @@ -13391,7 +13371,7 @@ in { }; meta = { - homepage = https://github.com/jlhutch/pylru; + homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; license = licenses.gpl2; platforms = platforms.all; @@ -13523,6 +13503,12 @@ in { clblas = pkgs.clblas-cuda; }; + libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else + (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; + + libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else + (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; + limnoria = buildPythonPackage rec { name = "limnoria-${version}"; version = "2016.05.06"; @@ -13657,45 +13643,7 @@ in { }; }; - llvmlite = let - llvm = pkgs.llvm_38; - in buildPythonPackage rec { - name = "llvmlite-${version}"; - version = "0.13.0"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llvmlite/${name}.tar.gz"; - sha256 = "f852be3391acb2e77ef484c5d0ff90e7cf2821dcf9575e358a1f08c274c582eb"; - }; - - propagatedBuildInputs = with self; [ llvm ] ++ optional (pythonOlder "3.4") enum34; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm}/bin/llvm-config - ''; - checkPhase = '' - ${self.python.executable} runtests.py - ''; - - __impureHostDeps = optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - meta = { - description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = "http://llvmlite.pydata.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; lockfile = buildPythonPackage rec { name = "lockfile-${version}"; @@ -13837,7 +13785,6 @@ in { }; }; - m2crypto = buildPythonPackage rec { version = "0.24.0"; name = "m2crypto-${version}"; @@ -14410,7 +14357,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -14909,31 +14856,20 @@ in { }; }; - - plover = buildPythonPackage rec { - name = "plover-${version}"; - version = "3.0.0"; - disabled = !isPy27; + pint = buildPythonPackage rec { + name = "pint-${version}"; + version = "0.7.2"; meta = { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; + description = "Physical quantities module"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint/"; }; src = pkgs.fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; + url = "mirror://pypi/p/pint/Pint-${version}.tar.gz"; + sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q"; }; - - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi - wxPython xlib pkgs.wmctrl ]; }; pygal = buildPythonPackage rec { @@ -15239,15 +15175,20 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.1"; + version = "1.2.1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c"; + sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; }; + patchPhase = '' + substituteInPlace slixmpp/thirdparty/gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" + ''; + propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { @@ -15768,54 +15709,17 @@ in { }; }; - numba = buildPythonPackage rec { - version = "0.27.0"; - name = "numba-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba"; - }; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - - propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch; - # Future work: add Cuda support. - #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6]; - #buildPhase = '' - # export NUMBAPRO_CUDA_DRIVER= - # export NUMBAPRO_NVVM=${pkgs.cudatoolkit6} - # export NUMBAPRO_LIBDEVICE= - #''; - - # Copy test script into $out and run the test suite. - checkPhase = '' - cp runtests.py $out/${python.sitePackages}/numba/runtests.py - ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py - ''; - # ImportError: cannot import name '_typeconv' - doCheck = false; - - meta = { - homepage = http://numba.pydata.org/; - license = licenses.bsd2; - description = "Compiling Python code using LLVM"; - maintainers = with maintainers; [ fridh ]; - }; - }; + numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.5.2"; + version = "2.6.1"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "0kb6549fwfxpc4qy3l5liad2mx99dys77c6w1y2rm32wyrf5k1by"; + sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; }; - # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 - # doCheck = !isPy3k; - propagatedBuildInputs = with self; [ numpy ]; # Run the test suite. @@ -18510,12 +18414,13 @@ in { }; pip = buildPythonPackage rec { - version = "8.1.2"; - name = "pip-${version}"; + pname = "pip"; + version = "9.0.1"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pip/pip-${version}.tar.gz"; - sha256 = "0cmpsy9lr9diskkypswm9s8glgr7w3crzh1im4zqlqv7z8zv092d"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; }; # pip detects that we already have bootstrapped_pip "installed", so we need @@ -18839,12 +18744,12 @@ in { }; powerline = buildPythonPackage rec { - rev = "2.1.4"; + rev = "2.4"; name = "powerline-${rev}"; src = pkgs.fetchurl { url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0gnh5yyackmqcphiympan48dm5lc834yzspss1lp4g1wq3vpyraf"; + sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184"; }; propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ]; @@ -19990,7 +19895,7 @@ in { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - buildInputs = with self; [ pkgs.boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; + buildInputs = with self; [ boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; @@ -20124,6 +20029,8 @@ in { }; }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyrr = buildPythonPackage rec { name = "pyrr-${version}"; version = "0.7.2"; @@ -20290,23 +20197,15 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.3"; + name = "PyICU-1.9.5"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; }; buildInputs = [ pkgs.icu ]; - patches = [ - # Fixes a bug in the test suite. - (pkgs.fetchpatch { - url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; - sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; - }) - ]; - meta = { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; @@ -20953,6 +20852,44 @@ in { }; }; + pymaging = buildPythonPackage rec { + name = "pymaging-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging"; + rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; + sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; + }; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = http://pymaging.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + + pymaging_png = buildPythonPackage rec { + name = "pymaging-png-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging-png"; + rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; + sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; + }; + + propagatedBuildInputs = with self; [ pymaging ]; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = https://github.com/ojii/pymaging-png/; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; @@ -21915,6 +21852,8 @@ in { }; }; + reikna = callPackage ../development/python-modules/reikna { }; + repocheck = buildPythonPackage rec { name = "repocheck-2015-08-05"; disabled = isPy26 || isPy27; @@ -23190,6 +23129,30 @@ in { }; }; + spake2 = buildPythonPackage rec { + name = "spake2-${version}"; + version = "0.7"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/spake2/${name}.tar.gz"; + sha256 = "0rmplicbbid41qrvwc1ckyp211ban01ardms5yqqq16ixrc18a6j"; + }; + + buildInputs = with self; [ pytest ]; + + propagatedBuildInputs = with self; [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; + }; + sqlite3dbm = buildPythonPackage rec { name = "sqlite3dbm-0.1.4"; disabled = isPy3k; @@ -25010,19 +24973,21 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.2.2"; + version = "4.3.1"; name = "traitlets-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "7d7e3070484b2fe490fa55e0acf7023afc5ed9ddabec57405f25c355158e152a"; + sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator]; + LC_ALL = "en_US.UTF-8"; + + buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; + propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; checkPhase = '' - nosetests -v + py.test $out ''; meta = { @@ -25126,18 +25091,14 @@ in { qrcode = buildPythonPackage rec { name = "qrcode-${version}"; - version = "5.1"; + version = "5.3"; src = pkgs.fetchurl { url = "mirror://pypi/q/qrcode/${name}.tar.gz"; - sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - # Errors in several tests: - # TypeError: must be str, not bytes - disabled = isPy3k; - - propagatedBuildInputs = with self; [ six pillow ]; + propagatedBuildInputs = with self; [ six pillow pymaging_png ]; meta = { description = "Quick Response code generation for Python"; @@ -26023,18 +25984,18 @@ in { webassets = buildPythonPackage rec { name = "webassets-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = pkgs.fetchurl { url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "0p1qypcbq9b88ipcylxh3bbnby5n6dr421wb4bwmrlcrgvj4r5lz"; + sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; }; propagatedBuildInputs = with self; [ pyyaml ]; meta = { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = "http://github.com/miracle2k/webassets/"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; @@ -27856,14 +27817,15 @@ in { graphite_web = buildPythonPackage rec { name = "graphite-web-${version}"; - version = "0.9.12"; + disabled = isPy3k; + version = "0.9.15"; src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; + sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_5 django_tagging whisper pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django django_tagging whisper pycairo ldap memcached ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -29441,29 +29403,29 @@ in { }; }; - poezio = buildPythonPackage rec { + poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.9"; + version = "0.10"; - namePrefix = ""; disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ]; - - checkPhase = '' - PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test - ''; - - patches = - let patch_base = ../development/python-modules/poezio; - in [ "${patch_base}/make_default_config_writable.patch" ]; + propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; - sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; + url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; + sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; }; + patches = [ + ../development/python-modules/poezio/fix_gnupg_import.patch + ../development/python-modules/poezio/fix_plugins_imports.patch + ]; + + checkPhase = '' + py.test + ''; + meta = { description = "Free console XMPP client"; homepage = http://poez.io; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 332fe71f64fa..bea2cb41a69f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-10-29"; - rev = "623cc0d9328bfb949b54209443f2b4f06c41961e"; - sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs"; + version = "2016-11-15"; + rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; + sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; src = fetchFromGitHub { inherit rev; |