diff options
1008 files changed, 27888 insertions, 32678 deletions
diff --git a/.mention-bot b/.mention-bot index 64f0ed854c49..8aeeedace10f 100644 --- a/.mention-bot +++ b/.mention-bot @@ -4,7 +4,8 @@ "jhasse" ], "alwaysNotifyForPaths": [ - { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] } + { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, + { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } ], "fileBlacklist": ["pkgs/top-level/all-packages.nix"] } diff --git a/doc/default.nix b/doc/default.nix index f4f467b1f5a0..03134cf4cc86 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -61,6 +61,10 @@ pkgs.stdenv.mkDerivation { outputFile = "languages-frameworks/idris.xml"; } + toDocbook { + inputFile = ../pkgs/development/node-packages/README.md; + outputFile = "languages-frameworks/node.xml"; + } + + toDocbook { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index e56d7dd389d9..026acb4e8fb9 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -24,7 +24,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; <co xml:id='ex-buildGoPackage-3' /> + goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-3' /> buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' /> } @@ -56,7 +56,9 @@ the following arguments are of special significance to the function: <callout arearefs='ex-buildGoPackage-3'> <para> <varname>goDeps</varname> is where the Go dependencies of a Go program are listed - in a JSON format described below. + as a list of package source identified by Go import path. + It could be imported as a separate <varname>deps.nix</varname> file for + readability. The dependency data structure is described below. </para> </callout> @@ -70,23 +72,32 @@ the following arguments are of special significance to the function: </para> -<para>The <varname>goDeps</varname> attribute should point to a JSON file that defines which Go libraries - are needed and should be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>. - +<para>The <varname>goDeps</varname> attribute can be imported from a separate + <varname>nix</varname> file that defines which Go libraries are needed and should + be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>. </para> -<example xml:id='ex-goDeps'><title>deps.json</title> +<example xml:id='ex-goDeps'><title>deps.nix</title> <programlisting> [ <co xml:id='ex-goDeps-1' /> - { - "goPackagePath": "gopkg.in/yaml.v2", <co xml:id='ex-goDeps-2' /> - "fetch": { - "type": "git", <co xml:id='ex-goDeps-3' /> - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } + { + goPackagePath = "gopkg.in/yaml.v2"; <co xml:id='ex-goDeps-2' /> + fetch = { + type = "git"; <co xml:id='ex-goDeps-3' /> + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } ] </programlisting> </example> diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 8076c33f1b3f..81352ec2a9a6 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ such as Perl or Haskell. These are described in this chapter.</para> <xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md --> <xi:include href="java.xml" /> <xi:include href="lua.xml" /> +<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md --> <xi:include href="perl.xml" /> <xi:include href="python.xml" /> <xi:include href="qt.xml" /> diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 686e125f100c..1f381c5e7213 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -296,12 +296,17 @@ rec { /* Converts a store path to a fake derivation. */ toDerivation = path: - let path' = builtins.storePath path; in - { type = "derivation"; - name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); - outPath = path'; - outputs = [ "out" ]; - }; + let + path' = builtins.storePath path; + res = + { type = "derivation"; + name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); + outPath = path'; + outputs = [ "out" ]; + out = res; + outputName = "out"; + }; + in res; /* If `cond' is true, return the attribute set `as', @@ -455,7 +460,7 @@ rec { getDev = getOutput "dev"; /* Pick the outputs of packages to place in buildInputs */ - chooseDevOutputs = drvs: builtins.map (drv: if drv.outputUnspecified or false then drv.dev or drv else drv) drvs; + chooseDevOutputs = drvs: builtins.map getDev drvs; /*** deprecated stuff ***/ diff --git a/lib/default.nix b/lib/default.nix index 32ac0c58af6c..cb9a9b0bd4d0 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,27 +1,46 @@ -let +let + # trivial, often used functions trivial = import ./trivial.nix; + + # datatypes + attrsets = import ./attrsets.nix; lists = import ./lists.nix; strings = import ./strings.nix; stringsWithDeps = import ./strings-with-deps.nix; - attrsets = import ./attrsets.nix; + + # packaging + customisation = import ./customisation.nix; + maintainers = import ./maintainers.nix; + meta = import ./meta.nix; sources = import ./sources.nix; + + # module system modules = import ./modules.nix; options = import ./options.nix; types = import ./types.nix; - meta = import ./meta.nix; - debug = import ./debug.nix; - misc = import ./deprecated.nix; - maintainers = import ./maintainers.nix; + + # constants + licenses = import ./licenses.nix; platforms = import ./platforms.nix; systems = import ./systems.nix; - customisation = import ./customisation.nix; - licenses = import ./licenses.nix; + + # misc + debug = import ./debug.nix; + misc = import ./deprecated.nix; + + # domain-specific sandbox = import ./sandbox.nix; + fetchers = import ./fetchers.nix; in - { inherit trivial lists strings stringsWithDeps attrsets sources options - modules types meta debug maintainers licenses platforms systems sandbox; + { inherit trivial + attrsets lists strings stringsWithDeps + customisation maintainers meta sources + modules options types + licenses platforms systems + debug misc + sandbox fetchers; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. diff --git a/lib/fetchers.nix b/lib/fetchers.nix new file mode 100644 index 000000000000..19d89d6c4074 --- /dev/null +++ b/lib/fetchers.nix @@ -0,0 +1,12 @@ +# snippets that can be shared by mutliple fetchers (pkgs/build-support) +{ + + proxyImpureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; + +} diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0e5740a6c325..24b87a5f36a0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -86,6 +86,7 @@ cko = "Christine Koppelt <christine.koppelt@gmail.com>"; cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>"; + cmfwyp = "cmfwyp <cmfwyp@riseup.net>"; coconnor = "Corey O'Connor <coreyoconnor@gmail.com>"; codsl = "codsl <codsl@riseup.net>"; codyopel = "Cody Opel <codyopel@gmail.com>"; @@ -168,6 +169,7 @@ grahamc = "Graham Christensen <graham@grahamc.com>"; gridaphobe = "Eric Seidel <eric@seidel.io>"; guibert = "David Guibert <david.guibert@gmail.com>"; + hakuch = "Jesse Haber-Kucharsky <hakuch@gmail.com>"; havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>"; hce = "Hans-Christian Esperer <hc@hcesperer.org>"; @@ -195,6 +197,7 @@ joelmo = "Joel Moberg <joel.moberg@gmail.com>"; joelteon = "Joel Taylor <me@joelt.io>"; joko = "Ioannis Koutras <ioannis.koutras@gmail.com>"; + jonafato = "Jon Banafato <jon@jonafato.com>"; jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>"; juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>"; @@ -416,6 +419,7 @@ ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; tv = "Tomislav Viljetić <tv@shackspace.de>"; tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>"; + tvorog = "Marsel Zaripov <marszaripov@gmail.com>"; twey = "James ‘Twey’ Kay <twey@twey.co.uk>"; uralbash = "Svintsov Dmitry <root@uralbash.ru>"; urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index d7a9239027d8..a2b8080e2a43 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -1,6 +1,8 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils findutils gnused nix wget +set -efuo pipefail + SRCS= if [ -d "$1" ]; then SRCS="$(pwd)/$1/srcs.nix" diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index b0689aa1d97f..7be5e9d51d46 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -31,9 +31,9 @@ options = { <varlistentry> <term><varname>type</varname></term> <listitem> - <para>The type of the option (see below). It may be omitted, - but that’s not advisable since it may lead to errors that are - hard to diagnose.</para> + <para>The type of the option (see <xref linkend='sec-option-types' />). + It may be omitted, but that’s not advisable since it may lead to errors + that are hard to diagnose.</para> </listitem> </varlistentry> @@ -65,86 +65,4 @@ options = { </para> -<para>Here is a non-exhaustive list of option types: - -<variablelist> - - <varlistentry> - <term><varname>types.bool</varname></term> - <listitem> - <para>A Boolean.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.int</varname></term> - <listitem> - <para>An integer.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.str</varname></term> - <listitem> - <para>A string.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.lines</varname></term> - <listitem> - <para>A string. If there are multiple definitions, they are - concatenated, with newline characters in between.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.path</varname></term> - <listitem> - <para>A path, defined as anything that, when coerced to a - string, starts with a slash. This includes derivations.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.package</varname></term> - <listitem> - <para>A derivation (such as <literal>pkgs.hello</literal>) or a - store path (such as - <filename>/nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10</filename>).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.listOf</varname> <replaceable>t</replaceable></term> - <listitem> - <para>A list of elements of type <replaceable>t</replaceable> - (e.g., <literal>types.listOf types.str</literal> is a list of - strings). Multiple definitions are concatenated together.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.attrsOf</varname> <replaceable>t</replaceable></term> - <listitem> - <para>A set of elements of type <replaceable>t</replaceable> - (e.g., <literal>types.attrsOf types.int</literal> is a set of - name/value pairs, the values being integers).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term> - <listitem> - <para>Either the value <literal>null</literal> or something of - type <replaceable>t</replaceable>.</para> - </listitem> - </varlistentry> - -</variablelist> - -You can also create new types using the function -<varname>mkOptionType</varname>. See -<filename>lib/types.nix</filename> in Nixpkgs for details.</para> - </section> diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml new file mode 100644 index 000000000000..8871b02cebf1 --- /dev/null +++ b/nixos/doc/manual/development/option-types.xml @@ -0,0 +1,394 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-option-types"> + +<title>Options Types</title> + + <para>Option types are a way to put constraints on the values a module option + can take. + Types are also responsible of how values are merged in case of multiple + value definitions.</para> + <section><title>Basic Types</title> + + <para>Basic types are the simplest available types in the module system. + Basic types include multiple string types that mainly differ in how + definition merging is handled.</para> + +<variablelist> + <varlistentry> + <term><varname>types.bool</varname></term> + <listitem><para>A boolean, its values can be <literal>true</literal> or + <literal>false</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.int</varname></term> + <listitem><para>An integer.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.path</varname></term> + <listitem><para>A filesystem path, defined as anything that when coerced to + a string starts with a slash. Even if derivations can be considered as + path, the more specific <literal>types.package</literal> should be + preferred.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.package</varname></term> + <listitem><para>A derivation or a store path.</para></listitem> + </varlistentry> +</variablelist> + +<para>String related types:</para> + +<variablelist> + <varlistentry> + <term><varname>types.str</varname></term> + <listitem><para>A string. Multiple definitions cannot be + merged.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.lines</varname></term> + <listitem><para>A string. Multiple definitions are concatenated with a new + line <literal>"\n"</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.commas</varname></term> + <listitem><para>A string. Multiple definitions are concatenated with a comma + <literal>","</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.envVar</varname></term> + <listitem><para>A string. Multiple definitions are concatenated with a + collon <literal>":"</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.separatedString</varname> + <replaceable>sep</replaceable></term> + <listitem><para>A string with a custom separator + <replaceable>sep</replaceable>, e.g. <literal>types.separatedString + "|"</literal>.</para></listitem> + </varlistentry> +</variablelist> + + </section> + + <section><title>Composed Types</title> + + <para>Composed types allow to create complex types by taking another type(s) + or value(s) as parameter(s). + It is possible to compose types multiple times, e.g. <literal>with types; + nullOr (enum [ "left" "right" ])</literal>.</para> + +<variablelist> + <varlistentry> + <term><varname>types.listOf</varname> <replaceable>t</replaceable></term> + <listitem><para>A list of <replaceable>t</replaceable> type, e.g. + <literal>types.listOf int</literal>. Multiple definitions are merged + with list concatenation.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.attrsOf</varname> <replaceable>t</replaceable></term> + <listitem><para>An attribute set of where all the values are of + <replaceable>t</replaceable> type. Multiple definitions result in the + joined attribute set.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.loaOf</varname> <replaceable>t</replaceable></term> + <listitem><para>An attribute set or a list of <replaceable>t</replaceable> + type. Multiple definitions are merged according to the + value.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.loeOf</varname> <replaceable>t</replaceable></term> + <listitem><para>A list or an element of <replaceable>t</replaceable> type. + Multiple definitions are merged according to the + values.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term> + <listitem><para><literal>null</literal> or type + <replaceable>t</replaceable>. Multiple definitions are merged according + to type <replaceable>t</replaceable>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.uniq</varname> <replaceable>t</replaceable></term> + <listitem><para>Ensures that type <replaceable>t</replaceable> cannot be + merged. It is used to ensure option definitions are declared only + once.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.enum</varname> <replaceable>l</replaceable></term> + <listitem><para>One element of the list <replaceable>l</replaceable>, e.g. + <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions + cannot be merged</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.either</varname> <replaceable>t1</replaceable> + <replaceable>t2</replaceable></term> + <listitem><para>Type <replaceable>t1</replaceable> or type + <replaceable>t2</replaceable>, e.g. <literal>with types; either int + str</literal>. Multiple definitions cannot be + merged.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>types.submodule</varname> <replaceable>o</replaceable></term> + <listitem><para>A set of sub options <replaceable>o</replaceable>. + <replaceable>o</replaceable> can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in <xref + linkend='section-option-types-submodule' />.</para></listitem> + </varlistentry> +</variablelist> + +</section> + +<section xml:id='section-option-types-submodule'><title>Submodule</title> + + <para>Submodule is a very powerful type that defines a set of sub-options that + are handled like a separate module. + It is especially interesting when used with composed types like + <literal>attrsOf</literal> or <literal>listOf</literal>.</para> + + <para>The submodule type take a parameter <replaceable>o</replaceable>, that + should be a set, or a function returning a set with an + <literal>options</literal> key defining the sub-options. + The option set can be defined directly (<xref linkend='ex-submodule-direct' + />) or as reference (<xref linkend='ex-submodule-reference' />).</para> + + <para>Submodule option definitions are type-checked accordingly to the options + declarations. It is possible to declare submodule options inside a submodule + sub-options for even higher modularity.</para> + +<example xml:id='ex-submodule-direct'><title>Directly defined submodule</title> +<screen> +options.mod = mkOption { + name = "mod"; + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +};</screen></example> + +<example xml:id='ex-submodule-reference'><title>Submodule defined as a + reference</title> +<screen> +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule modOptions); +};</screen></example> + + +<section><title>Composed with <literal>listOf</literal></title> + + <para>When composed with <literal>listOf</literal>, submodule allows multiple + definitions of the submodule option set.</para> + +<example xml:id='ex-submodule-listof-declaration'><title>Declaration of a list + of submodules</title> +<screen> +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +};</screen></example> + +<example xml:id='ex-submodule-listof-definition'><title>Definition of a list of + submodules</title> +<screen> +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +];</screen></example> + +</section> + + +<section><title>Composed with <literal>attrsOf</literal></title> + + <para>When composed with <literal>attrsOf</literal>, submodule allows multiple + named definitions of the submodule option set.</para> + +<example xml:id='ex-submodule-attrsof-declaration'><title>Declaration of + attribute sets of submodules</title> +<screen> +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +};</screen></example> + +<example xml:id='ex-submodule-attrsof-definition'><title>Declaration of + attribute sets of submodules</title> +<screen> +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; };</screen></example> + +</section> +</section> + +<section><title>Extending types</title> + + <para>Types are mainly characterized by their <literal>check</literal> and + <literal>merge</literal> functions.</para> + +<variablelist> + <varlistentry> + <term><varname>check</varname></term> + <listitem><para>The function to type check the value. Takes a value as + parameter and return a boolean. + It is possible to extend a type check with the + <literal>addCheck</literal> function (<xref + linkend='ex-extending-type-check-1' />), or to fully override the + check function (<xref linkend='ex-extending-type-check-2' />).</para> + +<example xml:id='ex-extending-type-check-1'><title>Adding a type check</title> +<screen> +byte = mkOption { + description = "An integer between 0 and 255."; + type = addCheck (x: x >= 0 && x <= 255) types.int; +};</screen></example> + +<example xml:id='ex-extending-type-check-2'><title>Overriding a type + check</title> +<screen> +nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; +};</screen></example> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>merge</varname></term> + <listitem><para>Function to merge the options values when multiple values + are set. +The function takes two parameters, <literal>loc</literal> the option path as a +list of strings, and <literal>defs</literal> the list of defined values as a +list. +It is possible to override a type merge function for custom +needs.</para></listitem> + </varlistentry> +</variablelist> + +</section> + +<section><title>Custom Types</title> + +<para>Custom types can be created with the <literal>mkOptionType</literal> + function. +As type creation includes some more complex topics such as submodule handling, +it is recommended to get familiar with <filename + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> +code before creating a new type.</para> + +<para>The only required parameter is <literal>name</literal>.</para> + +<variablelist> + <varlistentry> + <term><varname>name</varname></term> + <listitem><para>A string representation of the type function name, name + usually changes accordingly parameters passed to + types.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>check</varname></term> + <listitem><para>A function to type check the definition value. Takes the + definition value as a parameter and returns a boolean indicating the + type check result, <literal>true</literal> for success and + <literal>false</literal> for failure.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>merge</varname></term> + <listitem><para>A function to merge multiple definitions values. Takes two + parameters:</para> + <variablelist> + <varlistentry> + <term><replaceable>loc</replaceable></term> + <listitem><para>The option path as a list of strings, e.g. + <literal>["boot" "loader "grub" + "enable"]</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><replaceable>defs</replaceable></term> + <listitem><para>The list of sets of defined <literal>value</literal> + and <literal>file</literal> where the value was defined, e.g. + <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; + value = 2 } ]</literal>. The <literal>merge</literal> function + should return the merged value or throw an error in case the + values are impossible or not meant to be merged.</para></listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>getSubOptions</varname></term> + <listitem><para>For composed types that can take a submodule as type + parameter, this function generate sub-options documentation. It takes + the current option prefix as a list and return the set of sub-options. + Usually defined in a recursive manner by adding a term to the prefix, + e.g. <literal>prefix: elemType.getSubOptions (prefix ++ + [<replaceable>"prefix"</replaceable>])</literal> where + <replaceable>"prefix"</replaceable> is the newly added + prefix.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>getSubModules</varname></term> + <listitem><para>For composed types that can take a submodule as type + parameter, this function should return the type parameters submodules. + If the type parameter is called <literal>elemType</literal>, the + function should just recursively look into submodules by returning + <literal>elemType.getSubModules;</literal>.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>substSubModules</varname></term> + <listitem><para>For composed types that can take a submodule as type + parameter, this function can be used to substitute the parameter of a + submodule type. It takes a module as parameter and return the type with + the submodule options substituted. It is usally defined as a type + function call with a recursive call to + <literal>substSubModules</literal>, e.g for a type + <literal>composedType</literal> that take an <literal>elemtype</literal> + type parameter, this function should be defined as <literal>m: + composedType (elemType.substSubModules m)</literal>.</para></listitem> + </varlistentry> +</variablelist> + +</section> +</section> diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a68b122ce022..ef6920160e6d 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -176,6 +176,7 @@ in { </example> <xi:include href="option-declarations.xml" /> +<xi:include href="option-types.xml" /> <xi:include href="option-def.xml" /> <xi:include href="meta-attributes.xml" /> diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 70759ee25f86..c884eaa3ec28 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -90,6 +90,27 @@ following incompatible changes:</para> Use <literal>security.audit.enable = true;</literal> to explicitly enable it.</para> </listitem> + <listitem> + <para> + <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the + kernel modules instead of the VirtualBox user space binaries. + If you want to reference the user space binaries, you have to use the new + <literal>pkgs.virtualbox</literal> instead. + </para> + </listitem> + + <listitem> + <para><literal>goPackages</literal> was replaced with separated Go applications + in appropriate <literal>nixpkgs</literal> categories. Each Go package uses its own + dependency set defined in nix. There's also a new <literal>go2nix</literal> + tool introduced to generate Go package definition from its Go source automatically.</para> + </listitem> + + <listitem> + <para><literal>services.mongodb.extraConfig</literal> configuration format + was changed to YAML.</para> + </listitem> + </itemizedlist> @@ -105,6 +126,27 @@ following incompatible changes:</para> functionality. See <xref linkend="sec-grsecurity" /> for documentation </para></listitem> + <listitem><para>Special filesystems, like <literal>/proc</literal>, + <literal>/run</literal> and others, now have the same mount options as + recommended by systemd. They are now unified across different places in NixOS. + Options are also updated on the system switch if possible. One benefit from + this is improved security -- most such filesystems are now mounted with + <literal>noexec</literal>, <literal>nodev</literal> and/or + <literal>nosuid</literal> options.</para></listitem> + + <listitem><para>The reverse path filter was interfering with DHCPv4 server + operation in the past. An exception for DHCPv4 and a new option to log + packets that were dropped due to the reverse path filter was added + (<literal>networking.firewall.logReversePathDrops</literal>) for easier + debugging.</para></listitem> + + <listitem><para>Containers configuration within + <literal>containers.<name>.config</literal> is now properly + typed and checked. In particular, partial configurations are merged + correctly. + (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">#17365</link>) + </para></listitem> + </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index c0fa4388a2ad..2eda8a56b202 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -29,7 +29,11 @@ following incompatible changes:</para> <itemizedlist> <listitem> - <para></para> + <para> + <literal>gnome</literal> alias has been removed along with + <literal>gtk</literal>, <literal>gtkmm</literal> and several others. + Now you need to use versioned attributes, like <literal>gnome3</literal>. + </para> </listitem> </itemizedlist> diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd5126..7fad5cbc3cd9 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix new file mode 100644 index 000000000000..2a9382f39410 --- /dev/null +++ b/nixos/modules/hardware/video/displaylink.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +with lib; + +let + + enabled = elem "displaylink" config.services.xserver.videoDrivers; + + displaylink = config.boot.kernelPackages.displaylink; + +in + +{ + + config = mkIf enabled { + + boot.extraModulePackages = [ displaylink ]; + + boot.kernelModules = [ "evdi" ]; + + # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. + + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess" + ''; + + powerManagement.powerDownCommands = '' + #flush any bytes in pipe + while read -n 1 -t 1 SUSPEND_RESULT < /tmp/PmMessagesPort_out; do : ; done; + + #suspend DisplayLinkManager + echo "S" > /tmp/PmMessagesPort_in + + #wait until suspend of DisplayLinkManager finish + read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + ''; + + powerManagement.resumeCommands = '' + #resume DisplayLinkManager + echo "R" > /tmp/PmMessagesPort_in + ''; + + systemd.services.displaylink = { + description = "DisplayLink Manager Service"; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + + serviceConfig = { + ExecStart = "${displaylink}/bin/DisplayLinkManager"; + Restart = "always"; + RestartSec = 5; + }; + + preStart = '' + mkdir -p /var/log/displaylink + ''; + }; + + }; + +} diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index d984cb307170..ba84cd51098f 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -61,7 +61,7 @@ in pkgs.cryptsetup # needed for dm-crypt volumes # Some networking tools. - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen pkgs.wpa_supplicant # !!! should use the wpa module diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 9e733241993d..7ec09acd5919 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -55,7 +55,7 @@ in pkgs.cryptsetup # needed for dm-crypt volumes # Some networking tools. - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen pkgs.wpa_supplicant # !!! should use the wpa module diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 5e576367eb2f..f1874f239778 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -527,8 +527,11 @@ EOF # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only EOF } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d406cbf9c015..13a7323e858e 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -74,7 +74,6 @@ rtkit = 45; dovecot2 = 46; dovenull2 = 47; - unbound = 48; prayer = 49; mpd = 50; clamav = 51; @@ -141,7 +140,7 @@ ngircd = 112; btsync = 113; minecraft = 114; - monetdb = 115; + #monetdb = 115; # unused (not packaged), removed 2016-09-19 rippled = 116; murmur = 117; foundationdb = 118; @@ -274,6 +273,8 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; + telegraf = 256; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -330,7 +331,6 @@ #rtkit = 45; # unused dovecot2 = 46; #dovenull = 47; # unused - #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; @@ -395,7 +395,7 @@ #ngircd = 112; # unused btsync = 113; #minecraft = 114; # unused - monetdb = 115; + #monetdb = 115; # unused (not packaged), removed 2016-09-19 #ripped = 116; # unused #murmur = 117; # unused foundationdb = 118; @@ -518,6 +518,8 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; + #telegraf = 256; # unused # 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 efbb63da400d..7064dcd968ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -40,6 +40,7 @@ ./hardware/video/amdgpu.nix ./hardware/video/ati.nix ./hardware/video/bumblebee.nix + ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix @@ -144,7 +145,6 @@ ./services/databases/hbase.nix ./services/databases/influxdb.nix ./services/databases/memcached.nix - ./services/databases/monetdb.nix ./services/databases/mongodb.nix ./services/databases/mysql.nix ./services/databases/neo4j.nix @@ -287,6 +287,9 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix + ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/node-exporter.nix + ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -295,6 +298,7 @@ ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix + ./services/monitoring/telegraf.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/zabbix-agent.nix @@ -384,6 +388,7 @@ ./services/networking/ostinato.nix ./services/networking/pdnsd.nix ./services/networking/polipo.nix + ./services/networking/powerdns.nix ./services/networking/pptpd.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 20a1f7f1ed8c..32bea97823ce 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -20,7 +20,7 @@ # Some networking tools. pkgs.fuse - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 412cccc20d58..34b9724442eb 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -15,7 +15,6 @@ with lib; (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) - (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) @@ -154,5 +153,7 @@ with lib; "See the 16.03 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "services" "dockerRegistry" ] + "docker-registry has been deprecated upstream since a long time.") ]; } diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 8f2df380cfe8..ee351eb84473 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -2,19 +2,19 @@ with lib; { - options = { - security.hideProcessInformation = mkEnableOption "" // { description = '' - Restrict access to process information to the owning user. Enabling - this option implies, among other things, that command-line arguments - remain private. This option is recommended for most systems, unless - there's a legitimate reason for allowing unprivileged users to inspect - the process information of other users. + meta = { + maintainers = [ maintainers.joachifm ]; + doc = ./hidepid.xml; + }; - Members of the group "proc" are exempt from process information hiding. - To allow a service to run without process information hiding, add "proc" - to its supplementary groups via - <option>systemd.services.<name?>.serviceConfig.SupplementaryGroups</option>. - ''; }; + options = { + security.hideProcessInformation = mkOption { + type = types.bool; + default = false; + description = '' + Restrict process information to the owning user. + ''; + }; }; config = mkIf config.security.hideProcessInformation { diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml new file mode 100644 index 000000000000..5715ee7ac165 --- /dev/null +++ b/nixos/modules/security/hidepid.xml @@ -0,0 +1,33 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-hidepid"> + + <title>Hiding process information</title> + + <para> + Setting + <programlisting> + security.hideProcessInformation = true; + </programlisting> + ensures that access to process information is restricted to the + owning user. This implies, among other things, that command-line + arguments remain private. Unless your deployment relies on unprivileged + users being able to inspect the process information of other users, this + option should be safe to enable. + </para> + + <para> + Members of the <literal>proc</literal> group are exempt from process + information hiding. + </para> + + <para> + To allow a service <replaceable>foo</replaceable> to run without process information hiding, set + <programlisting> + systemd.services.<replaceable>foo</replaceable>.serviceConfig.SupplementaryGroups = [ "proc" ]; + </programlisting> + </para> + +</chapter> diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index b14ea7a5f276..3a1ffc55e5fe 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -18,7 +18,7 @@ with lib; config = mkIf config.security.rngd.enable { services.udev.extraRules = '' KERNEL=="random", TAG+="systemd" - SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" + SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index bced2a6ed757..f5612e1b0c5d 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -74,7 +74,7 @@ in Defaults env_keep+=SSH_AUTH_SOCK # "root" is allowed to do anything. - root ALL=(ALL) SETENV: ALL + root ALL=(ALL:ALL) SETENV: ALL # Users in the "wheel" group can do anything. %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 029b14ab4726..c0a0f0374294 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -21,13 +21,7 @@ in { services.mopidy = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable Mopidy, a music player daemon. - ''; - }; + enable = mkEnableOption "Mopidy, a music player daemon"; dataDir = mkOption { default = "/var/lib/mopidy"; diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index fb8b868ed40a..d34c1c9d83cc 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -12,11 +12,7 @@ in { services.ympd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable ympd, the MPD Web GUI."; - }; + enable = mkEnableOption "ympd, the MPD Web GUI"; webPort = mkOption { type = types.string; diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 21f319f7fcf6..d60b55e83d11 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -98,7 +98,7 @@ in { ]; description = '' Specifies startup command line arguments to pass to Go.CD agent - java process. Example contains debug and gcLog arguments. + java process. ''; }; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 2d1986301216..4bb792055d25 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -90,7 +90,7 @@ in { ''; }; - extraOptions = mkOption { + startupOptions = mkOption { default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -103,6 +103,15 @@ in { "-Dcruise.server.port=${toString cfg.port}" "-Dcruise.server.ssl.port=${toString cfg.sslPort}" ]; + + description = '' + Specifies startup command line arguments to pass to Go.CD server + java process. + ''; + }; + + extraOptions = mkOption { + default = [ ]; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" @@ -169,7 +178,8 @@ in { script = '' ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt - ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.extraOptions} \ + ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \ + ${concatStringsSep " " cfg.extraOptions} \ -jar ${pkgs.gocd-server}/go-server/go.jar ''; diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index e2268bd556ef..11ea0e1b6b41 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -66,16 +66,16 @@ let enabled = false; }]; - collectd = { + collectd = [{ enabled = false; typesdb = "${pkgs.collectd}/share/collectd/types.db"; database = "collectd_db"; port = 25826; - }; + }]; - opentsdb = { + opentsdb = [{ enabled = false; - }; + }]; continuous_queries = { enabled = true; @@ -171,6 +171,11 @@ in mkdir -m 0770 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi ''; + postStart = mkBefore '' + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://127.0.0.1${toString configOptions.http.bind-address}'/ping; do + sleep 1; + done + ''; }; users.extraUsers = optional (cfg.user == "influxdb") { diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix deleted file mode 100644 index 9f09c71e005a..000000000000 --- a/nixos/modules/services/databases/monetdb.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.monetdb; - monetdbUser = "monetdb"; -in -with lib; -{ - - ###### interface - - options = { - - services.monetdb = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable MonetDB database server."; - }; - - package = mkOption { - type = types.path; - description = "MonetDB package to use."; - }; - - dbfarmDir = mkOption { - type = types.path; - default = "/var/lib/monetdb"; - description = '' - Specifies location of Monetdb dbfarm (keeps database and auxiliary files). - ''; - }; - - port = mkOption { - default = "50000"; - example = "50000"; - description = "Port to listen on."; - }; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers.monetdb = - { name = monetdbUser; - uid = config.ids.uids.monetdb; - description = "monetdb user"; - home = cfg.dbfarmDir; - }; - - users.extraGroups.monetdb.gid = config.ids.gids.monetdb; - - environment.systemPackages = [ cfg.package ]; - - systemd.services.monetdb = - { description = "MonetDB Server"; - - wantedBy = [ "multi-user.target" ]; - - after = [ "network.target" ]; - - path = [ cfg.package ]; - - preStart = - '' - # Initialise the database. - if ! test -e ${cfg.dbfarmDir}/.merovingian_properties; then - mkdir -m 0700 -p ${cfg.dbfarmDir} - chown -R ${monetdbUser} ${cfg.dbfarmDir} - ${cfg.package}/bin/monetdbd create ${cfg.dbfarmDir} - ${cfg.package}/bin/monetdbd set port=${cfg.port} ${cfg.dbfarmDir} - fi - ''; - - serviceConfig.ExecStart = "${cfg.package}/bin/monetdbd start -n ${cfg.dbfarmDir}"; - - serviceConfig.ExecStop = "${cfg.package}/bin/monetdbd stop ${cfg.dbfarmDir}"; - - unitConfig.RequiresMountsFor = "${cfg.dbfarmDir}"; - }; - - }; - -} diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index ef9bc46e4a0e..38e46a0c6ef9 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -12,13 +12,11 @@ let mongoCnf = pkgs.writeText "mongodb.conf" '' - bind_ip = ${cfg.bind_ip} - ${optionalString cfg.quiet "quiet = true"} - dbpath = ${cfg.dbpath} - syslog = true - fork = true - pidfilepath = ${cfg.pidFile} - ${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"} + net.bindIp: ${cfg.bind_ip} + ${optionalString cfg.quiet "systemLog.quiet: true"} + systemLog.destination: syslog + storage.dbPath: ${cfg.dbpath} + ${optionalString (cfg.replSetName != "") "replication.replSetName: ${cfg.replSetName}"} ${cfg.extraConfig} ''; @@ -84,9 +82,9 @@ in extraConfig = mkOption { default = ""; example = '' - nojournal = true + storage.journal.enabled: false ''; - description = "MongoDB extra configuration"; + description = "MongoDB extra configuration in YAML format"; }; }; @@ -112,7 +110,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}"; + ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; User = cfg.user; PIDFile = cfg.pidFile; Type = "forking"; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index bee768fa42ae..4477904f78c6 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.riak2"; + example = literalExample "pkgs.riak"; description = '' Riak package to use. ''; @@ -108,6 +108,7 @@ in pkgs.bash ]; + environment.HOME = "${cfg.dataDir}"; environment.RIAK_DATA_DIR = "${cfg.dataDir}"; environment.RIAK_LOG_DIR = "${cfg.logDir}"; environment.RIAK_ETC_DIR = "/etc/riak"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index ee8ef512bc70..618460953a17 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -59,17 +59,17 @@ <variablelist> <varlistentry> <term><varname>emacs</varname></term> - <term><varname>emacs24</varname></term> + <term><varname>emacs25</varname></term> <listitem> <para> - The latest stable version of Emacs 24 using the <link + The latest stable version of Emacs 25 using the <link xlink:href="http://www.gtk.org">GTK+ 2</link> widget toolkit. </para> </listitem> </varlistentry> <varlistentry> - <term><varname>emacs24-nox</varname></term> + <term><varname>emacs25-nox</varname></term> <listitem> <para> Emacs 24 built without any dependency on X11 @@ -86,15 +86,6 @@ </para> </listitem> </varlistentry> - <varlistentry> - <term><varname>emacs25pre</varname></term> - <listitem> - <para> - A pretest version of what will become the first - version of Emacs 25. - </para> - </listitem> - </varlistentry> </variablelist> </para> diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 18f0c3eb83d5..40b48f70f7ed 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -22,7 +22,7 @@ in default = false; description = " Mount filesystems on demand. Unmount them automatically. - You may also be interested in afuese. + You may also be interested in afuse. "; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index b3f09999adba..de90d461f527 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -533,6 +533,8 @@ in { fi fi + # enable required pg_trgm extension for gitlab + psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a67df158be47..8ae8b12056ce 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,6 +90,7 @@ in { ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} ''} ''; + TimeoutStartSec=300; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix new file mode 100644 index 000000000000..a9c0ce4ed6cb --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -0,0 +1,116 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.alertmanager; + mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration); +in { + options = { + services.prometheus.alertmanager = { + enable = mkEnableOption "Prometheus Alertmanager"; + + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which Alertmanager shall be run. + ''; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = '' + Group under which Alertmanager shall be run. + ''; + }; + + configuration = mkOption { + type = types.attrs; + default = {}; + description = '' + Alertmanager configuration as nix attribute set. + ''; + }; + + logFormat = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set use a syslog logger or JSON logging. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "warn"; + description = '' + Only log messages with the given severity or above. + ''; + }; + + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The URL under which Alertmanager is externally reachable (for example, if Alertmanager is served via a reverse proxy). + Used for generating relative and absolute links back to Alertmanager itself. + If the URL has a path portion, it will be used to prefix all HTTP endoints served by Alertmanager. + If omitted, relevant URL components will be derived automatically. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for the web interface and API. + ''; + }; + + port = mkOption { + type = types.int; + default = 9093; + description = '' + Port to listen on for the web interface and API. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.alertmanager = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ + -config.file ${mkConfigFile} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -log.level ${cfg.logLevel} \ + ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} + ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"} + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = "/tmp"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix new file mode 100644 index 000000000000..e6817ee227ab --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -0,0 +1,445 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus; + promUser = "prometheus"; + promGroup = "prometheus"; + + # Get a submodule without any embedded metadata: + _filter = x: filterAttrs (k: v: k != "_module") x; + + # Pretty-print JSON to a file + writePrettyJSON = name: x: + pkgs.runCommand name { } '' + echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out + ''; + + # This becomes the main config file + promConfig = { + global = cfg.globalConfig; + rule_files = cfg.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) + ]; + scrape_configs = cfg.scrapeConfigs; + }; + + cmdlineArgs = cfg.extraFlags ++ [ + "-storage.local.path=${cfg.dataDir}/metrics" + "-config.file=${writePrettyJSON "prometheus.yml" promConfig}" + "-web.listen-address=${cfg.listenAddress}" + "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" + "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" + (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}") + ]; + + promTypes.globalConfig = types.submodule { + options = { + scrape_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to scrape targets by default. + ''; + }; + + scrape_timeout = mkOption { + type = types.str; + default = "10s"; + description = '' + How long until a scrape request times out. + ''; + }; + + evaluation_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to evaluate rules by default. + ''; + }; + + labels = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + The labels to add to any timeseries that this Prometheus instance + scrapes. + ''; + }; + }; + }; + + promTypes.scrape_config = types.submodule { + options = { + job_name = mkOption { + type = types.str; + description = '' + The job name assigned to scraped metrics by default. + ''; + }; + scrape_interval = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + How frequently to scrape targets from this job. Defaults to the + globally configured default. + ''; + }; + scrape_timeout = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Per-target timeout when scraping this job. Defaults to the + globally configured default. + ''; + }; + metrics_path = mkOption { + type = types.str; + default = "/metrics"; + description = '' + The HTTP resource path on which to fetch metrics from targets. + ''; + }; + scheme = mkOption { + type = types.enum ["http" "https"]; + default = "http"; + description = '' + The URL scheme with which to fetch metrics from targets. + ''; + }; + basic_auth = mkOption { + type = types.nullOr (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOption { + type = types.str; + description = '' + HTTP password + ''; + }; + }; + }); + default = null; + description = '' + Optional http login credentials for metrics scraping. + ''; + }; + dns_sd_configs = mkOption { + type = types.listOf promTypes.dns_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of DNS service discovery configurations. + ''; + }; + consul_sd_configs = mkOption { + type = types.listOf promTypes.consul_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of Consul service discovery configurations. + ''; + }; + file_sd_configs = mkOption { + type = types.listOf promTypes.file_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of file service discovery configurations. + ''; + }; + static_configs = mkOption { + type = types.listOf promTypes.static_config; + default = []; + apply = x: map _filter x; + description = '' + List of labeled target groups for this job. + ''; + }; + relabel_configs = mkOption { + type = types.listOf promTypes.relabel_config; + default = []; + apply = x: map _filter x; + description = '' + List of relabel configurations. + ''; + }; + }; + }; + + promTypes.static_config = types.submodule { + options = { + targets = mkOption { + type = types.listOf types.str; + description = '' + The targets specified by the target group. + ''; + }; + labels = mkOption { + type = types.attrsOf types.str; + description = '' + Labels assigned to all metrics scraped from the targets. + ''; + }; + }; + }; + + promTypes.dns_sd_config = types.submodule { + options = { + names = mkOption { + type = types.listOf types.str; + description = '' + A list of DNS SRV record names to be queried. + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + The time after which the provided names are refreshed. + ''; + }; + }; + }; + + promTypes.consul_sd_config = types.submodule { + options = { + server = mkOption { + type = types.str; + description = "Consul server to query."; + }; + token = mkOption { + type = types.nullOr types.str; + description = "Consul token"; + }; + datacenter = mkOption { + type = types.nullOr types.str; + description = "Consul datacenter"; + }; + scheme = mkOption { + type = types.nullOr types.str; + description = "Consul scheme"; + }; + username = mkOption { + type = types.nullOr types.str; + description = "Consul username"; + }; + password = mkOption { + type = types.nullOr types.str; + description = "Consul password"; + }; + + services = mkOption { + type = types.listOf types.str; + description = '' + A list of services for which targets are retrieved. + ''; + }; + tag_separator = mkOption { + type = types.str; + default = ","; + description = '' + The string by which Consul tags are joined into the tag label. + ''; + }; + }; + }; + + promTypes.file_sd_config = types.submodule { + options = { + files = mkOption { + type = types.listOf types.str; + description = '' + Patterns for files from which target groups are extracted. Refer + to the Prometheus documentation for permitted filename patterns + and formats. + + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + Refresh interval to re-read the files. + ''; + }; + }; + }; + + promTypes.relabel_config = types.submodule { + options = { + source_labels = mkOption { + type = types.listOf types.str; + description = '' + The source labels select values from existing labels. Their content + is concatenated using the configured separator and matched against + the configured regular expression. + ''; + }; + separator = mkOption { + type = types.str; + default = ";"; + description = '' + Separator placed between concatenated source label values. + ''; + }; + target_label = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Label to which the resulting value is written in a replace action. + It is mandatory for replace actions. + ''; + }; + regex = mkOption { + type = types.str; + description = '' + Regular expression against which the extracted value is matched. + ''; + }; + replacement = mkOption { + type = types.str; + default = ""; + description = '' + Replacement value against which a regex replace is performed if the + regular expression matches. + ''; + }; + action = mkOption { + type = types.enum ["replace" "keep" "drop"]; + description = '' + Action to perform based on regex matching. + ''; + }; + }; + }; + +in { + options = { + services.prometheus = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus monitoring daemon. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/prometheus"; + description = '' + Directory to store Prometheus metrics data. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + apply = _filter; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + apply = x: map _filter x; + description = '' + A list of scrape configurations. + ''; + }; + + alertmanagerURL = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of Alertmanager URLs to send notifications to. + ''; + }; + + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; + + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; + users.extraUsers.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + home = cfg.dataDir; + createHome = true; + }; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + #!/bin/sh + exec ${pkgs.prometheus}/bin/prometheus \ + ${concatStringsSep " \\\n " cmdlineArgs} + ''; + serviceConfig = { + User = promUser; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix new file mode 100644 index 000000000000..52dc14effc45 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -0,0 +1,71 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nodeExporter; + cmdlineArgs = cfg.extraFlags ++ [ + "-web.listen-address=${cfg.listenAddress}" + ]; +in { + options = { + services.prometheus.nodeExporter = { + enable = mkEnableOption "prometheus node exporter"; + + port = mkOption { + type = types.int; + default = 9100; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + + enabledCollectors = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "systemd" ]''; + description = '' + Collectors to enable, additionally to the defaults. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the node exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-node-exporter = { + description = "Prometheus exporter for machine metrics"; + unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; + wantedBy = [ "multi-user.target" ]; + script = '' + exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ + ${optionalString (cfg.enabledCollectors != []) + ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix new file mode 100644 index 000000000000..49dc9d8143e6 --- /dev/null +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.telegraf; + + configFile = pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ + > $out + ''; +in { + ###### interface + options = { + services.telegraf = { + enable = mkEnableOption "telegraf server"; + + package = mkOption { + default = pkgs.telegraf; + defaultText = "pkgs.telegraf"; + description = "Which telegraf derivation to use"; + type = types.package; + }; + + extraConfig = mkOption { + default = {}; + description = "Extra configuration options for telegraf"; + type = types.attrs; + example = { + outputs = { + influxdb = { + urls = ["http://localhost:8086"]; + database = "telegraf"; + }; + }; + inputs = { + statsd = { + service_address = ":8125"; + delete_timings = true; + }; + }; + }; + }; + }; + }; + + + ###### implementation + config = mkIf config.services.telegraf.enable { + systemd.services.telegraf = { + description = "Telegraf Agent"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + ExecStart=''${cfg.package}/bin/telegraf -config "${configFile}"''; + ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = "telegraf"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = [{ + name = "telegraf"; + uid = config.ids.uids.telegraf; + description = "telegraf daemon user"; + }]; + }; +} diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 49d74dfdf0f0..4b0e90886510 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -10,7 +10,8 @@ let interfaces = attrValues config.networking.interfaces; - enableDHCP = config.networking.useDHCP || any (i: i.useDHCP == true) interfaces; + enableDHCP = config.networking.dhcpcd.enable && + (config.networking.useDHCP || any (i: i.useDHCP == true) interfaces); # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. @@ -85,6 +86,15 @@ in options = { + networking.dhcpcd.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable dhcpcd for device configuration. This is mainly to + explicitly disable dhcpcd (for example when using networkd). + ''; + }; + networking.dhcpcd.persistent = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix new file mode 100644 index 000000000000..91ad63b88139 --- /dev/null +++ b/nixos/modules/services/networking/powerdns.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.powerdns; + configDir = pkgs.writeTextDir "pdns.conf" "${cfg.extraConfig}"; +in { + options = { + services.powerdns = { + enable = mkEnableOption "Powerdns domain name server"; + + extraConfig = mkOption { + type = types.lines; + default = "launch=bind"; + description = '' + Extra lines to be added verbatim to pdns.conf. + Powerdns will chroot to /var/lib/powerdns. + So any file, powerdns is supposed to be read, + should be in /var/lib/powerdns and needs to specified + relative to the chroot. + ''; + }; + }; + }; + + config = mkIf config.services.powerdns.enable { + systemd.services.pdns = { + unitConfig.Documentation = "man:pdns_server(1) man:pdns_control(1)"; + description = "Powerdns name server"; + wantedBy = [ "multi-user.target" ]; + after = ["network.target" "mysql.service" "postgresql.service" "openldap.service"]; + + serviceConfig = { + Restart="on-failure"; + RestartSec="1"; + StartLimitInterval="0"; + PrivateTmp=true; + PrivateDevices=true; + CapabilityBoundingSet="CAP_CHOWN CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT"; + NoNewPrivileges=true; + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/powerdns"; + ExecStart = "${pkgs.powerdns}/bin/pdns_server --setuid=nobody --setgid=nogroup --chroot=/var/lib/powerdns --socket-dir=/ --daemon=no --guardian=no --disable-syslog --write-pid=no --config-dir=${configDir}"; + ProtectSystem="full"; + ProtectHome=true; + RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index ed0744c44ccf..6375ebee3209 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -12,9 +12,17 @@ let interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces; - forward = optionalString (length cfg.forwardAddresses != 0) - "forward-zone:\n name: .\n" + - concatMapStrings (x: " forward-addr: ${x}\n") cfg.forwardAddresses; + isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1"; + + forward = + optionalString (any isLocalAddress cfg.forwardAddresses) '' + do-not-query-localhost: no + '' + + optionalString (cfg.forwardAddresses != []) '' + forward-zone: + name: . + '' + + concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; rootTrustAnchorFile = "${stateDir}/root.key"; @@ -72,7 +80,11 @@ in extraConfig = mkOption { default = ""; type = types.str; - description = "Extra lines of unbound config."; + description = '' + Extra unbound config. See + <citerefentry><refentrytitle>unbound.conf</refentrytitle><manvolnum>8 + </manvolnum></citerefentry>. + ''; }; }; @@ -84,12 +96,9 @@ in environment.systemPackages = [ pkgs.unbound ]; - users.extraUsers = singleton { - name = "unbound"; - uid = config.ids.uids.unbound; + users.users.unbound = { description = "unbound daemon user"; - home = stateDir; - createHome = true; + isSystemUser = true; }; systemd.services.unbound = { @@ -107,12 +116,16 @@ in chown unbound ${stateDir} ${rootTrustAnchorFile} ''} touch ${stateDir}/dev/random - ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random + ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random ''; serviceConfig = { ExecStart = "${pkgs.unbound}/bin/unbound -d -c ${stateDir}/unbound.conf"; ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random"; + + ProtectSystem = true; + ProtectHome = true; + PrivateDevices = true; }; }; diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 2aa523bf70a4..eca529188810 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -48,14 +48,18 @@ in { description = "Entropy Harvesting Daemon"; unitConfig.Documentation = "man:haveged(8)"; wantedBy = [ "multi-user.target" ]; - + path = [ pkgs.haveged ]; - - serviceConfig = - { Type = "forking"; - ExecStart = "${pkgs.haveged}/sbin/haveged -w ${toString cfg.refill_threshold} -v 1"; - PIDFile = "/run/haveged.pid"; - }; + + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; + SuccessExitStatus = 143; + PrivateTmp = true; + PrivateDevices = true; + PrivateNetwork = true; + ProtectSystem = "full"; + ProtectHome = true; + }; }; }; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b08070f1e366..5193814da725 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,7 +18,6 @@ let poolName = "tt-rss"; phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; - virtualHostName = "tt-rss"; tt-rss-config = pkgs.writeText "config.php" '' <?php @@ -34,10 +33,10 @@ let define('MYSQL_CHARSET', 'UTF8'); define('DB_TYPE', '${cfg.database.type}'); - define('DB_HOST', '${cfg.database.host}'); + define('DB_HOST', '${optionalString (cfg.database.host != null) cfg.database.host}'); define('DB_USER', '${cfg.database.user}'); define('DB_NAME', '${cfg.database.name}'); - define('DB_PASS', '${escape ["'" "\\"] cfg.database.password}'); + define('DB_PASS', '${optionalString (cfg.database.password != null) (escape ["'" "\\"] cfg.database.password)}'); define('DB_PORT', '${toString dbPort}'); define('AUTH_AUTO_CREATE', ${boolToString cfg.auth.autoCreate}); @@ -91,12 +90,21 @@ let enable = mkEnableOption "tt-rss"; + root = mkOption { + type = types.path; + default = "/var/lib/tt-rss"; + example = "/var/lib/tt-rss"; + description = '' + Root of the application. + ''; + }; + user = mkOption { type = types.str; default = "nginx"; example = "nginx"; description = '' - User account under which both the service and the web-application run. + User account under which both the update daemon and the web-application run. ''; }; @@ -110,17 +118,13 @@ let ''; }; - # TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged - - # virtualHost = mkOption { - # type = types.str; - # default = "${virtualHostName}"; - # description = '' - # Name of existing nginx virtual host that is used to run web-application. - # If not specified a host will be created automatically with - # default values. - # ''; - # }; + virtualHost = mkOption { + type = types.nullOr types.str; + default = "tt-rss"; + description = '' + Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; database = { type = mkOption { @@ -132,10 +136,10 @@ let }; host = mkOption { - type = types.str; - default = "localhost"; + type = types.nullOr types.str; + default = null; description = '' - Host of the database. + Host of the database. Leave null to use Unix domain socket. ''; }; @@ -362,7 +366,7 @@ let singleUserMode = mkOption { type = types.bool; - default = true; + default = false; description = '' Operate in single user mode, disables all functionality related to @@ -445,17 +449,15 @@ let ###### implementation - config = let - root = "/var/lib/tt-rss"; - in mkIf cfg.enable { + config = mkIf cfg.enable { - services.phpfpm.poolConfigs = if cfg.pool == "${poolName}" then { + services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") { "${poolName}" = '' listen = "${phpfpmSocketName}"; listen.owner = nginx listen.group = nginx listen.mode = 0600 - user = nginx + user = ${cfg.user} pm = dynamic pm.max_children = 75 pm.start_servers = 10 @@ -464,36 +466,26 @@ let pm.max_requests = 500 catch_workers_output = 1 ''; - } else {}; - - # TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged - - # services.nginx.virtualHosts = if cfg.virtualHost == "${virtualHostName}" then { - # "${virtualHostName}" = { - # root = "${root}"; - # extraConfig = '' - # access_log /var/log/nginx-${virtualHostName}-access.log; - # error_log /var/log/nginx-${virtualHostName}-error.log; - # ''; - - # locations."/" = { - # extraConfig = '' - # index index.php; - # ''; - # }; - - # locations."~ \.php$" = { - # extraConfig = '' - # fastcgi_split_path_info ^(.+\.php)(/.+)$; - # fastcgi_pass unix:${phpfpmSocketName}; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME ${root}/$fastcgi_script_name; - - # include ${pkgs.nginx}/conf/fastcgi_params; - # ''; - # }; - # }; - # } else {}; + }; + + services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) { + "${cfg.virtualHost}" = { + root = "${cfg.root}"; + + locations."/" = { + index = "index.php"; + }; + + locations."~ \.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name; + ''; + }; + }; + }; systemd.services.tt-rss = let @@ -503,35 +495,34 @@ let description = "Tiny Tiny RSS feeds update daemon"; preStart = let - callSql = if cfg.database.type == "pgsql" then (e: '' - ${optionalString (cfg.database.password != null) - "PGPASSWORD=${cfg.database.password}"} ${pkgs.postgresql95}/bin/psql \ - -U ${cfg.database.user} \ - -h ${cfg.database.host} \ - --port ${toString dbPort} \ - -c '${e}' \ - ${cfg.database.name}'') - - else if cfg.database.type == "mysql" then (e: '' - echo '${e}' | ${pkgs.mysql}/bin/mysql \ - ${optionalString (cfg.database.password != null) - "-p${cfg.database.password}"} \ - -u ${cfg.database.user} \ - -h ${cfg.database.host} \ - -P ${toString dbPort} \ - ${cfg.database.name}'') - - else ""; + callSql = e: + if cfg.database.type == "pgsql" then '' + ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ + ${pkgs.postgresql95}/bin/psql \ + -U ${cfg.database.user} \ + ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ + -c '${e}' \ + ${cfg.database.name}'' + + else if cfg.database.type == "mysql" then '' + echo '${e}' | ${pkgs.mysql}/bin/mysql \ + -u ${cfg.database.user} \ + ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \ + ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \ + ${cfg.database.name}'' + + else ""; in '' - rm -rf "${root}/*" - mkdir -m 755 -p "${root}" - cp -r "${pkgs.tt-rss}/"* "${root}" - ln -sf "${tt-rss-config}" "${root}/config.php" - chown -R "${cfg.user}" "${root}" - chmod -R 755 "${root}" - '' + (optionalString (cfg.database.type == "pgsql") '' - + rm -rf "${cfg.root}/*" + mkdir -m 755 -p "${cfg.root}" + cp -r "${pkgs.tt-rss}/"* "${cfg.root}" + ln -sf "${tt-rss-config}" "${cfg.root}/config.php" + chown -R "${cfg.user}" "${cfg.root}" + chmod -R 755 "${cfg.root}" + '' + + + (optionalString (cfg.database.type == "pgsql") '' exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -540,8 +531,9 @@ let else echo 'The database contains some data. Leaving it as it is.' fi; - '') + (optionalString (cfg.database.type == "mysql") '' + '') + + (optionalString (cfg.database.type == "mysql") '' exists=$(${callSql "select count(*) > 0 from information_schema.tables where table_schema = schema()"} \ | tail -n+2 | sed -e 's/[ \n\t]*//') @@ -554,7 +546,7 @@ let serviceConfig = { User = "${cfg.user}"; - ExecStart = "${pkgs.php}/bin/php /var/lib/tt-rss/update.php --daemon"; + ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; StandardOutput = "syslog"; StandardError = "syslog"; PermissionsStartOnly = true; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8a03dd65b335..7ea8b30d23d1 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -32,10 +32,10 @@ in e.efl e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu - pkgs.gtk # To get GTK+'s themes. + pkgs.gtk2 # To get GTK+'s themes. pkgs.tango-icon-theme pkgs.shared_mime_info - pkgs.gnome.gnomeicontheme + pkgs.gnome2.gnomeicontheme pkgs.xorg.xcursorthemes ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 634d2a39576a..51d7d905d587 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -69,7 +69,7 @@ in services.xserver.updateDbusEnvironment = true; environment.systemPackages = - [ pkgs.gtk # To get GTK+'s themes. + [ pkgs.gtk2 # To get GTK+'s themes. pkgs.hicolor_icon_theme pkgs.tango-icon-theme pkgs.shared_mime_info @@ -100,6 +100,7 @@ in pkgs.xfce.tumbler # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager + ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) [ pkgs.xfce.xfce4panel pkgs.xfce.xfdesktop diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 47786f0a4321..33cd51f37c68 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -46,13 +46,15 @@ let [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} + ${optionalString (elem defaultSessionName dmcfg.session.names) '' + user-session = ${defaultSessionName} + ''} ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} ${optionalString cfg.autoLogin.enable '' autologin-user = ${cfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} - autologin-session = ${defaultSessionName} ''} ${cfg.extraSeatDefaults} ''; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 16d1e89e8d96..4d2ddedca1ea 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -46,7 +46,7 @@ let HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} HideShells=/run/current-system/sw/bin/nologin - [XDisplay] + [X11] MinimumVT=${toString xcfg.tty} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr @@ -100,7 +100,7 @@ in theme = mkOption { type = types.str; - default = "maui"; + default = ""; description = '' Greeter theme to use. ''; diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 455b3568499f..eb97449c6bd9 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,7 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - + inherit (pkgs.luaPackages) getLuaPath getLuaCPath; in { @@ -46,10 +46,8 @@ in { name = "awesome"; start = '' - ${concatMapStrings (pkg: '' - export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so - export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua - '') cfg.luaModules} + export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" + export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" ${awesome}/bin/awesome & waitPID=$! @@ -59,5 +57,4 @@ in environment.systemPackages = [ awesome ]; }; - } diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 60298362d767..4c3d30e346c5 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -142,10 +142,10 @@ in # Empty, immutable home directory of many system accounts. mkdir -p /var/empty # Make sure it's really empty - ${pkgs.e2fsprogs}/bin/chattr -i /var/empty + ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true find /var/empty -mindepth 1 -delete chmod 0555 /var/empty - ${pkgs.e2fsprogs}/bin/chattr +i /var/empty + ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index bc899984c57d..a8c7d4b3ee5e 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -85,10 +85,14 @@ in }; config = mkIf (config.boot.initrd.network.enable && cfg.enable) { - assertions = [ { - assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; - message = "You should specify at least one host key for initrd SSH"; - } ]; + assertions = [ + { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; + message = "You should specify at least one host key for initrd SSH"; + } + { assertion = cfg.authorizedKeys != []; + message = "You should specify at least one authorized key for initrd SSH"; + } + ]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 61c34cc2f034..e84cdb3212ce 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,7 +55,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels - default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; + default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -357,6 +357,44 @@ in ''; }; + efiInstallAsRemovable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to invoke <literal>grub-install</literal> with + <literal>--removable</literal>.</para> + + <para>Unless you turn this on, GRUB will install itself somewhere in + <literal>boot.loader.efi.efiSysMountPoint</literal> (exactly where + depends on other config variables). If you've set + <literal>boot.loader.efi.canTouchEfiVariables</literal> *AND* you + are currently booted in UEFI mode, then GRUB will use + <literal>efibootmgr</literal> to modify the boot order in the + EFI variables of your firmware to include this location. If you are + *not* booted in UEFI mode at the time GRUB is being installed, the + NVRAM will not be modified, and your system will not find GRUB at + boot time. However, GRUB will still return success so you may miss + the warning that gets printed ("<literal>efibootmgr: EFI variables + are not supported on this system.</literal>").</para> + + <para>If you turn this feature on, GRUB will install itself in a + special location within <literal>efiSysMountPoint</literal> (namely + <literal>EFI/boot/boot$arch.efi</literal>) which the firmwares + are hardcoded to try first, regardless of NVRAM EFI variables.</para> + + <para>To summarize, turn this on if: + <itemizedlist> + <listitem><para>You are installing NixOS and want it to boot in UEFI mode, + but you are currently booted in legacy mode</para></listitem> + <listitem><para>You want to make a drive that will boot regardless of + the NVRAM state of the computer (like a USB "removable" drive)</para></listitem> + <listitem><para>You simply dislike the idea of depending on NVRAM + state to make your drive bootable</para></listitem> + </itemizedlist> + ''; + }; + enableCryptodisk = mkOption { default = false; type = types.bool; @@ -484,6 +522,14 @@ in assertion = !cfg.trustedBoot.enable || cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated"; message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'."; } + { + assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport"; + } + { + assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables"; + } ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 06eece5025f8..b93395300b72 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -60,6 +60,7 @@ my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); my $storePath = get("storePath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); +my $efiInstallAsRemovable = get("efiInstallAsRemovable"); my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); @@ -544,13 +545,15 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { # install EFI GRUB 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 ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--bootloader-id=$bootloaderId"; } else { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--no-nvram"; + push @command, "--removable" if $efiInstallAsRemovable eq "true"; } + + (system @command) == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 397e9a4987b7..b724995bb1fc 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -571,6 +571,16 @@ in ''; }; + systemd.user.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultCPUAccounting=yes"; + description = '' + Extra config options for systemd user instances. See man systemd-user.conf for + available options. + ''; + }; + systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -665,6 +675,11 @@ in ${config.systemd.extraConfig} ''; + "systemd/user.conf".text = '' + [Manager] + ${config.systemd.user.extraConfig} + ''; + "systemd/journald.conf".text = '' [Journal] RateLimitInterval=${config.services.journald.rateLimitInterval} diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 301ee43fd0e5..974041d7e1a5 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -43,7 +43,7 @@ in message = "networking.bridges.${n}.rstp is not supported by networkd."; }); - systemd.services.dhcpcd.enable = mkDefault false; + networking.dhcpcd.enable = mkDefault false; systemd.services.network-local-commands = { after = [ "systemd-networkd.service" ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index c52bd904caec..9042418b7234 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -231,7 +231,7 @@ let type = types.bool; description = '' Whether this interface is virtual and should be created by tunctl. - This is mainly useful for creating bridges between a host a virtual + This is mainly useful for creating bridges between a host and a virtual network such as VPN or a virtual machine. ''; }; @@ -391,7 +391,7 @@ in }; networking.localCommands = mkOption { - type = types.str; + type = types.lines; default = ""; example = "text=anything; echo You can put $text here."; description = '' diff --git a/nixos/modules/virtualisation/azure-bootstrap-blobs.nix b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix new file mode 100644 index 000000000000..281be9a12318 --- /dev/null +++ b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix @@ -0,0 +1,3 @@ +{ + "16.03" = "https://nixos.blob.core.windows.net/images/nixos-image-16.03.847.8688c17-x86_64-linux.vhd"; +} diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 413aa94339f1..eaa4d828afb6 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -12,21 +12,21 @@ let '' echo "Bringing ${name} up" ip link set dev ${name} up - ${optionalString (cfg . "localAddress" or null != null) '' + ${optionalString (cfg.localAddress != null) '' echo "Setting ip for ${name}" - ip addr add ${cfg . "localAddress"} dev ${name} + ip addr add ${cfg.localAddress} dev ${name} ''} - ${optionalString (cfg . "localAddress6" or null != null) '' + ${optionalString (cfg.localAddress6 != null) '' echo "Setting ip6 for ${name}" - ip -6 addr add ${cfg . "localAddress6"} dev ${name} + ip -6 addr add ${cfg.localAddress6} dev ${name} ''} - ${optionalString (cfg . "hostAddress" or null != null) '' + ${optionalString (cfg.hostAddress != null) '' echo "Setting route to host for ${name}" - ip route add ${cfg . "hostAddress"} dev ${name} + ip route add ${cfg.hostAddress} dev ${name} ''} - ${optionalString (cfg . "hostAddress6" or null != null) '' + ${optionalString (cfg.hostAddress6 != null) '' echo "Setting route6 to host for ${name}" - ip -6 route add ${cfg . "hostAddress6"} dev ${name} + ip -6 route add ${cfg.hostAddress6} dev ${name} ''} '' ); @@ -56,9 +56,7 @@ let ip -6 route add default via $HOST_ADDRESS6 fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} - ip a - ip r + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi # Start the regular stage 1 script. @@ -67,7 +65,8 @@ let ); nspawnExtraVethArgs = (name: cfg: "--network-veth-extra=${name}"); - startScript = (cfg: + + startScript = cfg: '' mkdir -p -m 0755 "$root/etc" "$root/var/lib" mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers @@ -92,11 +91,7 @@ let fi fi - ${if cfg . "extraVeths" or null != null then - ''extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg . "extraVeths" or {})}"'' - else - ''# No extra veth pairs to create'' - } + extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" for iface in $INTERFACES; do extraFlags+=" --network-interface=$iface" @@ -135,10 +130,9 @@ let --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - '' - ); + ''; - preStartScript = (cfg: + preStartScript = cfg: '' # Clean up existing machined registration and interfaces. machinectl terminate "$INSTANCE" 2> /dev/null || true @@ -151,45 +145,43 @@ let ${concatStringsSep "\n" ( mapAttrsToList (name: cfg: ''ip link del dev ${name} 2> /dev/null || true '' - ) cfg . "extraVeths" or {} + ) cfg.extraVeths )} - '' - ); + ''; + postStartScript = (cfg: let - ipcall = (cfg: ipcmd: variable: attribute: - if cfg . attribute or null == null then + ipcall = cfg: ipcmd: variable: attribute: + if cfg.${attribute} == null then '' if [ -n "${variable}" ]; then ${ipcmd} add ${variable} dev $ifaceHost fi '' else - ''${ipcmd} add ${cfg . attribute} dev $ifaceHost'' - ); - renderExtraVeth = (name: cfg: - if cfg . "hostBridge" or null != null then + ''${ipcmd} add ${cfg.attribute} dev $ifaceHost''; + renderExtraVeth = name: cfg: + if cfg.hostBridge != null then '' # Add ${name} to bridge ${cfg.hostBridge} ip link set dev ${name} master ${cfg.hostBridge} up '' else '' - # Set IPs and routes for ${name} - ${optionalString (cfg . "hostAddress" or null != null) '' - ip addr add ${cfg . "hostAddress"} dev ${name} - ''} - ${optionalString (cfg . "hostAddress6" or null != null) '' - ip -6 addr add ${cfg . "hostAddress6"} dev ${name} - ''} - ${optionalString (cfg . "localAddress" or null != null) '' - ip route add ${cfg . "localAddress"} dev ${name} - ''} - ${optionalString (cfg . "localAddress6" or null != null) '' - ip -6 route add ${cfg . "localAddress6"} dev ${name} - ''} - '' - ); + # Set IPs and routes for ${name} + ${optionalString (cfg.hostAddress != null) '' + ip addr add ${cfg.hostAddress} dev ${name} + ''} + ${optionalString (cfg.hostAddress6 != null) '' + ip -6 addr add ${cfg.hostAddress6} dev ${name} + ''} + ${optionalString (cfg.localAddress != null) '' + ip route add ${cfg.localAddress} dev ${name} + ''} + ${optionalString (cfg.localAddress6 != null) '' + ip -6 route add ${cfg.localAddress6} dev ${name} + ''} + ''; in '' if [ "$PRIVATE_NETWORK" = 1 ]; then @@ -202,7 +194,7 @@ let ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi # Get the leader PID so that we can signal it in @@ -307,6 +299,15 @@ let }; + dummyConfig = + { + extraVeths = {}; + hostAddress = null; + hostAddress6 = null; + localAddress = null; + localAddress6 = null; + }; + in { @@ -451,7 +452,7 @@ in containers. Each container appears as a service <literal>container-<replaceable>name</replaceable></literal> on the host system, allowing it to be started and stopped via - <command>systemctl</command> . + <command>systemctl</command>. ''; }; @@ -470,11 +471,11 @@ in environment.INSTANCE = "%i"; environment.root = "/var/lib/containers/%i"; - preStart = preStartScript {}; + preStart = preStartScript dummyConfig; - script = startScript {}; + script = startScript dummyConfig; - postStart = postStartScript {}; + postStart = postStartScript dummyConfig; preStop = '' diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ebc2be087a5b..92fe98f3f9c2 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -40,13 +40,25 @@ in }; storageDriver = mkOption { - type = types.enum ["aufs" "btrfs" "devicemapper" "overlay" "zfs"]; - default = "devicemapper"; + type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); + default = null; description = '' - This option determines which Docker storage driver to use. + This option determines which Docker storage driver to use. By default + it let's docker automatically choose preferred storage driver. ''; }; + + logDriver = + mkOption { + type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; + default = "journald"; + description = + '' + This option determines which Docker log driver to use. + ''; + }; + extraOptions = mkOption { type = types.separatedString " "; @@ -88,7 +100,12 @@ in after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ; requires = optional cfg.socketActivation "docker.socket"; serviceConfig = { - ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${optionalString cfg.socketActivation "--host=fd://"} ${cfg.extraOptions}"; + ExecStart = ''${pkgs.docker}/bin/dockerd \ + --group=docker --log-driver=${cfg.logDriver} \ + ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ + ${optionalString cfg.socketActivation "--host=fd://"} \ + ${cfg.extraOptions} + ''; # I'm not sure if that limits aren't too high, but it's what # goes in config bundled with docker itself LimitNOFILE = 1048576; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index ce4abecd6762..7214543871d6 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -4,10 +4,15 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = config.boot.kernelPackages.virtualbox.override { + + virtualbox = pkgs.virtualbox.override { inherit (cfg) enableHardening headless; }; + kernelModules = config.boot.kernelPackages.virtualbox.override { + inherit virtualbox; + }; + in { @@ -60,7 +65,7 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ virtualbox ]; + boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; security.setuidOwners = let diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index b6a5b3e4788d..d68b3bb73904 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -34,7 +34,7 @@ in { postVM = '' export HOME=$PWD - export PATH=${pkgs.linuxPackages.virtualbox}/bin:$PATH + export PATH=${pkgs.virtualbox}/bin:$PATH echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage diff --git a/nixos/release.nix b/nixos/release.nix index 87e10b497314..7fcff78f6b95 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -260,6 +260,7 @@ in rec { #tests.logstash = callTest tests/logstash.nix {}; tests.mathics = callTest tests/mathics.nix {}; tests.misc = callTest tests/misc.nix {}; + tests.mongodb = callTest tests/mongodb.nix {}; tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mysql = callTest tests/mysql.nix {}; @@ -274,7 +275,7 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; - tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); + #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index c55b08c0e924..f0083ab18e45 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -13,10 +13,6 @@ import ./make-test.nix ({ pkgs, ... } : { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; - systemd.services.influxdb.postStart = mkAfter '' - ${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \ - -d '{"name": "root"}' - ''; }; }; @@ -27,6 +23,12 @@ import ./make-test.nix ({ pkgs, ... } : { $machine->succeed("curl http://localhost:8080/containers/"); $influxdb->waitForUnit("influxdb.service"); + + # create influxdb database + $influxdb->succeed(q~ + curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root" + ~); + $influxdb->waitForUnit("cadvisor.service"); $influxdb->succeed("curl http://localhost:8080/containers/"); ''; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 06e511d6e0bd..1b57a94a05d4 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,9 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; - # FIXME: The default "devicemapper" storageDriver fails in NixOS VM - # tests. - virtualisation.docker.storageDriver = "overlay"; }; }; diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index aca2189716a4..ee126091667a 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -17,9 +17,6 @@ import ./make-test.nix ({ pkgs, ...} : { $one->waitForUnit("influxdb.service"); - # Check if admin interface is avalible - $one->waitUntilSucceeds("curl -f 127.0.0.1:8083"); - # create database $one->succeed(q~ curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test" diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix index 787dd2f8cbdd..30a0d09d18bb 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/kde5.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { - name = "sddm"; + name = "kde5"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix new file mode 100644 index 000000000000..18535f51af9b --- /dev/null +++ b/nixos/tests/mongodb.nix @@ -0,0 +1,34 @@ +# This test start mongodb, runs a query using mongo shell + +import ./make-test.nix ({ pkgs, ...} : let + testQuery = pkgs.writeScript "nixtest.js" '' + db.greetings.insert({ "greeting": "hello" }); + print(db.greetings.findOne().greeting); + ''; +in { + name = "mongodb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bluescreen303 offline wkennington cstrahan rvl ]; + }; + + nodes = { + one = + { config, pkgs, ... }: + { + services = { + mongodb.enable = true; + mongodb.extraConfig = '' + # Allow starting engine with only a small virtual disk + storage.journal.enabled: false + storage.mmapv1.smallFiles: true + ''; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("mongodb.service"); + $one->succeed("mongo nixtest ${testQuery}") =~ /hello/ or die; + ''; +}) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 35f440026997..7959b85a0cf0 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -36,18 +36,29 @@ in # cancel client audio configuration $client1->waitForWindow(qr/Audio Tuning Wizard/); $client2->waitForWindow(qr/Audio Tuning Wizard/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # cancel client cert configuration $client1->waitForWindow(qr/Certificate Management/); $client2->waitForWindow(qr/Certificate Management/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # accept server certificate $client1->waitForWindow(qr/^Mumble$/); $client2->waitForWindow(qr/^Mumble$/); + $server->sleep(5); # wait because mumble is slow to register event handlers + $client1->sendChars("y"); + $client2->sendChars("y"); + $server->sleep(5); # wait because mumble is slow to register event handlers + + # sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again + $client1->sendKeys("alt-tab"); + $client2->sendKeys("alt-tab"); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendChars("y"); $client2->sendChars("y"); diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix new file mode 100644 index 000000000000..7605227100d2 --- /dev/null +++ b/nixos/tests/prometheus.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "prometheus"; + + nodes = { + one = { config, pkgs, ... }: { + services.prometheus = { + enable = true; + globalConfig = { + labels = { foo = "bar"; }; + }; + scrapeConfigs = [{ + job_name = "prometheus"; + target_groups = [{ + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + }]; + }]; + rules = [ ''testrule = count(up{job="prometheus"})'' ]; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + ''; +} diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix index 3864f676497e..18da52b5134b 100644 --- a/nixos/tests/pump.io.nix +++ b/nixos/tests/pump.io.nix @@ -77,7 +77,7 @@ in { }; }; mongodb.enable = true; mongodb.extraConfig = '' - nojournal = true + storage.journal.enabled: false ''; }; systemd.services.mongodb.unitConfig.Before = "pump.io.service"; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 92680d82ba89..475c947e72d9 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -23,9 +23,8 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $server->waitForUnit("tomcat"); - $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly $client->waitForUnit("network.target"); - $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); - $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); + $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); + $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index ab4d46ab7e15..66f16ed8bcc5 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -144,6 +144,7 @@ let "--uart1 0x3F8 4" "--uartmode1 client /run/virtualbox-log-${name}.sock" "--memory 768" + "--audio none" ] ++ (attrs.vmFlags or [])); controllerFlags = mkFlags [ @@ -273,9 +274,12 @@ let sub shutdownVM_${name} { $machine->succeed(ru "touch ${sharePath}/shutdown"); - $machine->waitUntilSucceeds( - "test ! -e ${sharePath}/shutdown ". - " -a ! -e ${sharePath}/boot-done" + $machine->execute( + 'set -e; i=0; '. + 'while test -e ${sharePath}/shutdown '. + ' -o -e ${sharePath}/boot-done; do '. + 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '. + 'done' ); waitForShutdown_${name}; } @@ -386,6 +390,7 @@ in mapAttrs mkVBoxTest { $machine->sendKeys("ctrl-q"); $machine->sleep(5); $machine->screenshot("gui_manager_stopped"); + destroyVM_simple; ''; simple-cli = '' @@ -403,6 +408,7 @@ in mapAttrs mkVBoxTest { }); shutdownVM_simple; + destroyVM_simple; ''; headless = '' @@ -411,6 +417,7 @@ in mapAttrs mkVBoxTest { waitForStartup_headless; waitForVMBoot_headless; shutdownVM_headless; + destroyVM_headless; ''; host-usb-permissions = '' diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 0001f0a92922..9d62696a3f8e 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; }; - buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index d9614d10d327..ff2d4bbce4e2 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 9f047a600cbd..7951076daa0d 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix new file mode 100644 index 000000000000..b5897c71cd94 --- /dev/null +++ b/pkgs/applications/audio/asunder/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +, mp3Support ? false, lame +, oggSupport ? true, vorbis-tools +, flacSupport ? true, flac +, opusSupport ? false, opusTools +, wavpackSupport ? false, wavpack +#, musepackSupport ? false, TODO: mpcenc +, monkeysAudioSupport ? false, monkeysAudio +#, aacSupport ? false, TODO: neroAacEnc +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.8"; + name = "asunder-${version}"; + src = fetchurl { + url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; + sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + }; + + buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ]; + + runtimeDeps = + optional mp3Support lame ++ + optional oggSupport vorbis-tools ++ + optional flacSupport flac ++ + optional opusSupport opusTools ++ + optional wavpackSupport wavpack ++ + optional monkeysAudioSupport monkeysAudio ++ + [ cdparanoia ]; + + postInstall = '' + wrapProgram "$out/bin/asunder" \ + --prefix PATH : "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "A graphical Audio CD ripper and encoder for Linux"; + homepage = http://littlesvr.ca/asunder/index.php; + license = licenses.gpl2; + maintainers = with maintainers; [ mudri ]; + platforms = platforms.linux; + + longDescription = '' + Asunder is a graphical Audio CD ripper and encoder for Linux. You can use + it to save tracks from an Audio CD as any of WAV, MP3, OGG, FLAC, Opus, + WavPack, Musepack, AAC, and Monkey's Audio files. + ''; + }; +} diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a93a445db311..b31cecffbd17 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, +{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag gtk + libsndfile soxr libid3tag gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index f5f0711ecac1..db5f081c4ed4 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, gettext, ncurses , gtkGUI ? false , pkgconfig ? null -, gtk ? null}: +, gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk != null; +assert gtkGUI -> pkgconfig != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk] else []); + ++ (if gtkGUI then [pkgconfig gtk2] else []); meta = { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7113a169e808..900d6759e4a6 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool -, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: +, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: stdenv.mkDerivation rec { name = "beast-0.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib guile libart_lgpl pkgconfig intltool gtk glib + [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib libogg libvorbis libgnomecanvas gettext ]; diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index efb36abe240b..47c80af9fe0f 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf -, glib, gtk, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp +, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm , xdg_utils, zenity, zlib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontStrip = true; libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk harfbuzz + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ba086d88482..e133df564d7a 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 28183a2c6691..ceff147d618b 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon IOKit ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 0ff83a9023ef..3ef69606c774 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix index 2fe03d73a23c..17cec46f6c6a 100644 --- a/pkgs/applications/audio/faust/faust2alsa.nix +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -6,7 +6,7 @@ , freetype , gdk_pixbuf , glib -, gtk +, gtk2 , pango }: @@ -22,7 +22,7 @@ faust.wrapWithBuildEnv { freetype gdk_pixbuf glib - gtk + gtk2 pango ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 9dfb7f875c53..3867114562d5 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,5 +1,5 @@ { faust -, gtk +, gtk2 , jack2Full , opencv }: @@ -15,7 +15,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - gtk + gtk2 jack2Full opencv ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 6971a718de9f..ecb9d0f85d05 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -3,17 +3,19 @@ , libSM, libsndfile, libogg }: -stdenv.mkDerivation { - name = "freewheeling-100"; +stdenv.mkDerivation rec { + name = "freewheeling-${version}"; + version = "100"; src = fetchsvn { url = svn://svn.code.sf.net/p/freewheeling/code; - rev = 100; + rev = version; sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf + gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM ]; @@ -35,7 +37,6 @@ stdenv.mkDerivation { software, released under the GNU GPL license. '' ; - version = "r100"; homepage = "http://freewheeling.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.sepi ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 269b48aebb8f..e53b498fb6ee 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 -, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt +, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt , pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.cvs"; buildInputs = [ - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool + autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool libgig libsndfile libtool libxslt pkgconfig ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 7486ec3e081f..2d63245fef63 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 0c7b5c2c9cae..ab6dd0eee72f 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup + libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index af213f1a8354..4fd68742ba23 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2 +, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom , webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf + gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ab8f7af1bd55..9a336576d3a9 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn +{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom , suil }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig python raul serd sord-svn sratom suil ]; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index e4a48230e23d..1d1925779f0d 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 5e99e60c818b..bcec085887a5 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index cfe29949e4f6..da61eee3b643 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper + buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper pkgconfig readline ]; propagatedBuildInputs = [ libuuid ]; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 22ab37dc98af..47b65ff2b5a3 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }: stdenv.mkDerivation { name = "lingot-0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; + buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ]; configureFlags = "--disable-jack"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 26400ed61da1..2c6df650d5d7 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH +{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame , vorbis-tools }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; }; - buildInputs = [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile + buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile pkgconfig libpulseaudio makeWrapper ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index b9a38ab9d03b..0ab0d24c2726 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; [ - pygobject gst_python musicbrainzngs + pygobject2 gst_python musicbrainzngs pycdio pyxdg setuptools CDDB ]; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d28cd7c9e06d..5f1d2bfa93d5 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, gtk }: +{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - buildInputs = [ ncurses pkgconfig gtk ]; + buildInputs = [ ncurses pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index b55ea30bae05..4937d09e532e 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libogg libopus ]; + buildInputs = [ openssl libogg ]; + propagatedBuildInputs = [ libopus ]; + patches = [ ./include-multistream.patch ]; meta = { description = "High-level API for decoding and seeking in .opus files"; diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/applications/audio/opusfile/include-multistream.patch new file mode 100644 index 000000000000..7c6dd8475963 --- /dev/null +++ b/pkgs/applications/audio/opusfile/include-multistream.patch @@ -0,0 +1,12 @@ +diff -Naur a/include/opusfile.h b/include/opusfile.h +--- a/include/opusfile.h 2014-04-29 19:07:09.000000000 +0200 ++++ b/include/opusfile.h 2016-09-05 17:50:15.147553798 +0200 +@@ -107,7 +107,7 @@ + # include <stdarg.h> + # include <stdio.h> + # include <ogg/ogg.h> +-# include <opus_multistream.h> ++# include <opus/opus_multistream.h> + + /**@cond PRIVATE*/ + diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 0f8c7a950103..7cce08e733d8 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm +{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm , dbus_glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ]; + buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 1deb11d99258..91a270a698e6 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2 -, gtkmm, libjack2, pkgconfig, python2 +{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +, gtkmm2, libjack2, pkgconfig, python2 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2 + alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index c9d9ad57487a..d86e5aae2cd4 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas +{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig, openssl }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig openssl ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 883d49682cec..52f2a0ff924c 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { name = "praat-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - buildInputs = [ alsaLib gtk pkgconfig ]; + buildInputs = [ alsaLib gtk2 pkgconfig ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 418efa23b209..9e0abac5ce47 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd , sord, sratom, stdenv, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom suil diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a046fe80e13d..00856721f95d 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; - inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python; + inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; @@ -48,7 +48,7 @@ in buildPythonApplication { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject dbus-python gst_python intltool + mutagen pygtk pygobject2 dbus-python gst_python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 73fa58a46c41..eafa0980b4b2 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; - buildInputs = [ alsaLib gtkmm libjack2 ]; + buildInputs = [ alsaLib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e0d89d809a75..a0188e48a8ff 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: assert stdenv.system == "x86_64-linux"; @@ -22,7 +22,7 @@ let GConf gdk_pixbuf glib - gtk + gtk2 libgcrypt libpng nss @@ -83,7 +83,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" + --prefix PATH : "${gnome2.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix new file mode 100644 index 000000000000..2022183f4a08 --- /dev/null +++ b/pkgs/applications/audio/squishyball/default.nix @@ -0,0 +1,48 @@ +{ stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +, opusfile, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "squishyball-${rev}"; + rev = "19580"; + + src = fetchsvn { + url = "https://svn.xiph.org/trunk/squishyball"; + rev = rev; + sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ flac libao libvorbis ncurses opusfile ]; + + patches = [ ./gnu-screen.patch ]; + + postInstall = '' + # Why doesn’t this happen automagically? + mkdir -p $out/share/man/man1 + cp squishyball.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "A tool to perform sample comparison testing on the command line"; + longDescription = '' + squishyball is a simple command-line utility for performing + double-blind A/B, A/B/X or X/X/Y testing on the command line. + The user specifies two input files to be compared and uses the + keyboard during playback to flip between the randomized samples + to perform on-the-fly compar†isons. After a predetermined + number of trials, squishyball prints the trial results to + stdout and exits. Results (stdout) may be redirected to a file + without affecting interactive use of the terminal. + + squishyball can also be used to perform casual, non-randomized + comparisons of groups of up to ten samples; this is the default + mode of operation. + ''; + homepage = https://svn.xiph.org/trunk/squishyball; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/squishyball/gnu-screen.patch b/pkgs/applications/audio/squishyball/gnu-screen.patch new file mode 100644 index 000000000000..addc30d604c6 --- /dev/null +++ b/pkgs/applications/audio/squishyball/gnu-screen.patch @@ -0,0 +1,20 @@ +diff -Naur a/main.c b/main.c +--- a/main.c 2016-09-06 13:37:32.259895631 +0200 ++++ b/main.c 2016-09-07 01:41:51.014309863 +0200 +@@ -693,6 +693,11 @@ + } + + /* set up terminal */ ++ if (!strncmp(getenv("TERM"), "screen", 6)) { ++ char term[256]; ++ snprintf(term, sizeof(term), "xterm%s", getenv("TERM") + 6); ++ setenv("TERM", term, 1); ++ } + atexit(min_panel_remove); + panel_init(pcm, test_files, test_mode, start, end>0 ? end : len, len, + beep_mode, restart_mode, tests, running_score); +@@ -1170,4 +1175,3 @@ + fprintf(stderr,"Done.\n"); + return 0; + } +- diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 9ca78ee1a3f4..2c3d4b91f258 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig -, libltc, libsndfile, libsamplerate, xz -, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +{ stdenv, fetchurl, pkgconfig, fetchgit +, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 +, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20160619"; @@ -11,15 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; }; - buildInputs = [ xz mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ + mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate + lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver + ]; - makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ]; + makeFlags = [ + "PREFIX=$(out)" + "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" + "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" + ]; - meta = with stdenv.lib; - { description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; - maintainers = with maintainers; [ magnetophon ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 96da8ad8c557..a55b47a6c16b 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index ea80957afb02..235d4d16a405 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; }; + patches = [ + (fetchurl { + name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch"; + url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616"; + sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv"; + }) + ]; + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c33d06e7822a..e788585a0a96 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -5,15 +5,15 @@ }: let - ver_branch = "1.18"; - version = "1.18.1"; + ver_branch = "1.19"; + version = "1.19.4"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "1yl9zhn9l83bj5mbifkxfw15nqgsjzzhqcrgb81fr290wijqaj45"; + sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf"; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch b/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch deleted file mode 100644 index ad5dcbc472db..000000000000 --- a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7a18f4cb77c567dec9ad924fcc76c50092de6ee7 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 23 Nov 2015 06:57:51 -0600 -Subject: [PATCH 2/2] fix ConfigReader QStringList corruption - ---- - src/common/ConfigReader.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index 5bf5a6a..34182e6 100644 ---- a/src/common/ConfigReader.cpp -+++ b/src/common/ConfigReader.cpp -@@ -30,7 +30,8 @@ - - QTextStream &operator>>(QTextStream &str, QStringList &list) { - list.clear(); -- foreach(const QStringRef &s, str.readLine().splitRef(QLatin1Char(','))) -+ QString line = str.readLine(); -+ foreach(const QStringRef &s, line.splitRef(QLatin1Char(','))) - { - QStringRef trimmed = s.trimmed(); - if (!trimmed.isEmpty()) --- -2.6.3 - diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 923b185ae393..3f8d5aec4aa1 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,11 +1,11 @@ { stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, libxcb, libpthreadstubs, lndir +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , themes }: let - version = "0.13.0"; + version = "0.14.0"; unwrapped = stdenv.mkDerivation rec { name = "sddm-unwrapped-${version}"; @@ -14,19 +14,18 @@ let owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; + sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; }; patches = [ ./0001-ignore-config-mtime.patch - ./0002-fix-ConfigReader-QStringList-corruption.patch - (fetchpatch { - url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch; - sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj"; + (fetchpatch { /* Fix display of user avatars. */ + url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; + sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; }) ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 85b9e7c4368a..4e16ceedbbbe 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -3,25 +3,32 @@ , coreutils , fetchurl , findutils +, file , git +, glxinfo , gnugrep , gnutar , gzip , jdk +, libpulseaudio +, libX11 , libXrandr , makeWrapper +, pciutils , pkgsi686Linux +, setxkbmap , stdenv , unzip , which , writeTextFile +, xkeyboard_config , zlib }: let - version = "2.1.2.0"; - build = "143.2915827"; + version = "2.1.3.0"; + build = "143.3101438"; androidStudio = stdenv.mkDerivation { name = "android-studio"; @@ -40,6 +47,12 @@ let jdk which + # For Android emulator + file + glxinfo + pciutils + setxkbmap + # Used during setup wizard gnutar gzip @@ -47,21 +60,26 @@ let # Runtime stuff git - ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ + ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib + # aapt wants libz.so.1 zlib pkgsi686Linux.zlib # Support multiple monitors libXrandr - ]}" + + # For Android emulator + libpulseaudio + libX11 + ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; + sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj"; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index dbfc2ebb6b38..1285e46fb484 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index a839f5b24e5c..4237ce73f21c 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: let bracketsEnv = buildEnv { name = "env-brackets"; paths = [ - gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 + gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd.lib ]; }; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 76df6d4d2b99..9cab87e9ed24 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; }; - buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] + buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix new file mode 100644 index 000000000000..03b920ffab0d --- /dev/null +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft +}: + +stdenv.mkDerivation rec { + name = "deadpixi-sam-unstable"; + version = "2016-09-15"; + src = fetchFromGitHub { + owner = "deadpixi"; + repo = "sam"; + rev = "a6a8872246e8634d884b0ce52bc3be9770ab1b0f"; + sha256 = "1zr8dl0vp1xic3dq69h4bp2fcxsjhrzasfl6ayvkibjd6z5dn07p"; + }; + + postPatch = '' + substituteInPlace config.mk.def \ + --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + buildInputs = [ libX11 libXt libXft ]; + + postInstall = '' + mkdir -p $out/share/applications + mv deadpixi-sam.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Updated version of the sam text editor"; + license = with licenses; lpl-102; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 609c5e3c651f..74707c65b6ca 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3d59777e5f0c..c688065e6ea9 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jdk +, glib, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage -} @ args: +}: assert stdenv ? glibc; rec { - buildEclipse = import ./build-eclipse.nix args; + buildEclipse = callPackage ./build-eclipse.nix { }; eclipse-sdk-35 = buildEclipse { name = "eclipse-sdk-3.5.2"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b3008f8cb241..bc3f7b064d49 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -403,16 +403,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.11.201604020423"; + version = "6.9.12.201607091356"; srcFeature = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; - sha256 = "1cp7f6f0525wqwjj4pyrp0q0ii7zcd5gwd5acaq9jjb13xgw8vav"; + sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "04m07cdfw0isp27ykx6dbrlcdw33rxww7vnavanygxxnlpyvyas3"; + sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh deleted file mode 100644 index 984a61df6f3b..000000000000 --- a/pkgs/applications/editors/emacs-24/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -# This hook is supposed to be run on Linux. It patches the proper locations of -# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with -# *our* versions, not the ones found in the system, as it would do by default. -# On other platforms, this appears to be unnecessary. -preConfigure() { - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done - - case "${system}" in - x86_64-linux) glibclibdir=lib64 ;; - i686-linux) glibclibdir=lib ;; - *) return; - esac - - libc=$(cat ${NIX_CC}/nix-support/orig-libc) - echo "libc: $libc" - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ - --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o - done -} - -preInstall () { - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -genericBuild diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix deleted file mode 100644 index df53cf2c9a49..000000000000 --- a/pkgs/applications/editors/emacs-24/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO -, withX ? !stdenv.isDarwin -, withGTK3 ? false, gtk3 ? null -, withGTK2 ? true, gtk2 -, enableTTYTrueColor ? false -}: - -assert (libXft != null) -> libpng != null; # probably a bug -assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise -assert withGTK2 -> withX || stdenv.isDarwin; -assert withGTK3 -> withX || stdenv.isDarwin; -assert withGTK2 -> !withGTK3 && gtk2 != null; -assert withGTK3 -> !withGTK2 && gtk3 != null; - -let - toolkit = - if withGTK3 then "gtk3" - else if withGTK2 then "gtk2" - else "lucid"; -in - -stdenv.mkDerivation rec { - name = "emacs-24.5"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; - }; - - patches = lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - ] ++ lib.optionals enableTTYTrueColor [ - # Modified TTY True Color patch from: https://gist.github.com/choppsv1/36aacdd696d505566088 - # To use, pass --color=true-color, which will default to using ';' - # as the separator. - # Alternatively, set $EMACS_TRUE_COLOR_SEPARATOR to ';' or ':'. - ./tty-true-color.patch - ]; - - postPatch = '' - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - # emacs runs then dumps itself. In the process, it keeps a copy of the - # PATH env var, holding all the build inputs in it's closure. - # Prevent that by running the self-dumping emacs with an empty PATH. - sed -i 's|^RUN_TEMACS = |&PATH= |' src/Makefile.in - ''; - - buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] - ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] - ++ stdenv.lib.optional (withX && withGTK2) gtk2 - ++ stdenv.lib.optional (withX && withGTK3) gtk3 - ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; - - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; - - configureFlags = - if stdenv.isDarwin - then [ "--with-ns" "--disable-ns-self-contained" ] - else if withX - then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]; - - NIX_CFLAGS_COMPILE = - [ "-ffreestanding" ] # needed due to glibc 2.24 upgrade (see https://sourceware.org/glibc/wiki/Release/2.24#Known_Issues) - ++ stdenv.lib.optional (stdenv.isDarwin && withX) "-I${cairo.dev}/include/cairo"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - '' + stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv nextstep/Emacs.app $out/Applications - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; - platforms = platforms.all; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs-24/tty-true-color.patch b/pkgs/applications/editors/emacs-24/tty-true-color.patch deleted file mode 100644 index 09ceeb658abb..000000000000 --- a/pkgs/applications/editors/emacs-24/tty-true-color.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el -index 98108ce..21814a9 100644 ---- a/lisp/term/tty-colors.el -+++ b/lisp/term/tty-colors.el -@@ -764,7 +764,8 @@ - (auto . 0) - (ansi8 . 8) - (always . 8) -- (yes . 8)) -+ (yes . 8) -+ (true-color . 16777216)) - "An alist of supported standard tty color modes and their aliases.") - - (defun tty-color-alist (&optional _frame) -diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el -index c673749..244cf7f 100644 ---- a/lisp/term/xterm.el -+++ b/lisp/term/xterm.el -@@ -674,6 +674,15 @@ versions of xterm." - ;; are more colors to support, compute them now. - (when (> ncolors 0) - (cond -+ ((= (display-color-cells (selected-frame)) 16777216) ; 24-bit xterm -+ (let ((idx (length xterm-standard-colors))) -+ ;; Insert standard X colors after the standard xterm ones -+ (mapc (lambda (color) -+ (if (not (assoc (car color) xterm-standard-colors)) -+ (progn -+ (tty-color-define (car color) idx (cdr color)) -+ (setq idx (1+ idx))))) -+ color-name-rgb-alist))) - ((= ncolors 240) ; 256-color xterm - ;; 216 non-gray colors first - (let ((r 0) (g 0) (b 0)) -diff --git a/src/dispextern.h b/src/dispextern.h -index 239c442..5760b84 100644 ---- a/src/dispextern.h -+++ b/src/dispextern.h -@@ -1739,9 +1739,15 @@ struct face - INLINE bool - face_tty_specified_color (unsigned long color) - { -- return color < FACE_TTY_DEFAULT_BG_COLOR; -+ return (color < FACE_TTY_DEFAULT_BG_COLOR); - } - -+INLINE bool -+face_tty_specified_24_bit_color (unsigned long color) -+{ -+ /* 24 bit colors have 24th but not 25th bit set */ -+ return ((color & (0x03 << 24)) == (0x01 << 24)); -+} - /* Non-zero if FACE was realized for unibyte use. */ - - #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0) -diff --git a/src/term.c b/src/term.c -index 8312491..b14aded 100644 ---- a/src/term.c -+++ b/src/term.c -@@ -1915,18 +1915,40 @@ turn_on_face (struct frame *f, int face_id) - const char *ts; - char *p; - -- ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground; -+ if (face_tty_specified_24_bit_color(fg)) -+ ts = tty->standout_mode ? tty->TS_set_rgb_background : tty->TS_set_rgb_foreground; -+ else -+ ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground; - if (face_tty_specified_color (fg) && ts) - { -- p = tparam (ts, NULL, 0, fg, 0, 0, 0); -+ if (!face_tty_specified_24_bit_color(fg)) -+ p = tparam (ts, NULL, 0, fg, 0, 0, 0); -+ else -+ { -+ const unsigned char r = (fg >> 16) & 0xFF, -+ g = (fg >> 8) & 0xFF, -+ b = fg & 0xFF; -+ p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0); -+ } - OUTPUT (tty, p); - xfree (p); - } - -- ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background; -+ if (face_tty_specified_24_bit_color(bg)) -+ ts = tty->standout_mode ? tty->TS_set_rgb_foreground : tty->TS_set_rgb_background; -+ else -+ ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background; - if (face_tty_specified_color (bg) && ts) - { -- p = tparam (ts, NULL, 0, bg, 0, 0, 0); -+ if (!face_tty_specified_24_bit_color(bg)) -+ p = tparam (ts, NULL, 0, bg, 0, 0, 0); -+ else -+ { -+ const unsigned char r = (bg >> 16) & 0xFF, -+ g = (bg >> 8) & 0xFF, -+ b = bg & 0xFF; -+ p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0); -+ } - OUTPUT (tty, p); - xfree (p); - } -@@ -2028,6 +2050,8 @@ TERMINAL does not refer to a text terminal. */) - struct terminal *t = get_tty_terminal (terminal, 0); - if (!t) - return make_number (0); -+ else if (t->display_info.tty->TS_set_rgb_foreground) -+ return make_number (16777216); /* 24 bit True Color */ - else - return make_number (t->display_info.tty->TN_max_colors); - } -@@ -2043,6 +2067,8 @@ static int default_no_color_video; - static char *default_orig_pair; - static char *default_set_foreground; - static char *default_set_background; -+static char *default_set_rgb_foreground; -+static char *default_set_rgb_background; - - /* Save or restore the default color-related capabilities of this - terminal. */ -@@ -2055,6 +2081,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save) - dupstring (&default_orig_pair, tty->TS_orig_pair); - dupstring (&default_set_foreground, tty->TS_set_foreground); - dupstring (&default_set_background, tty->TS_set_background); -+ dupstring (&default_set_rgb_foreground, tty->TS_set_rgb_foreground); -+ dupstring (&default_set_rgb_background, tty->TS_set_rgb_background); - default_max_colors = tty->TN_max_colors; - default_max_pairs = tty->TN_max_pairs; - default_no_color_video = tty->TN_no_color_video; -@@ -2064,6 +2092,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save) - tty->TS_orig_pair = default_orig_pair; - tty->TS_set_foreground = default_set_foreground; - tty->TS_set_background = default_set_background; -+ tty->TS_set_rgb_foreground = default_set_rgb_foreground; -+ tty->TS_set_rgb_background = default_set_rgb_background; - tty->TN_max_colors = default_max_colors; - tty->TN_max_pairs = default_max_pairs; - tty->TN_no_color_video = default_no_color_video; -@@ -2088,6 +2118,7 @@ tty_setup_colors (struct tty_display_info *tty, int mode) - tty->TN_max_pairs = 0; - tty->TN_no_color_video = 0; - tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = NULL; -+ tty->TS_set_rgb_foreground = tty->TS_set_rgb_background = NULL; - break; - case 0: /* default colors, if any */ - default: -@@ -2102,10 +2133,45 @@ tty_setup_colors (struct tty_display_info *tty, int mode) - tty->TS_set_foreground = "\033[3%dm"; - tty->TS_set_background = "\033[4%dm"; - #endif -+ tty->TS_set_rgb_foreground = NULL; -+ tty->TS_set_rgb_background = NULL; - tty->TN_max_colors = 8; - tty->TN_max_pairs = 64; - tty->TN_no_color_video = 0; - break; -+ case 16777216: /* RGB colors */ -+ tty->TS_orig_pair = "\033[0m"; -+ -+ /* if the user hasn't explicitly chosen the ":" separator, use ";". */ -+ char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR"); -+ if (true_color_separator && strcmp (true_color_separator, ":") == 0) -+ { -+ /* XXX chopps use ITU T.421 ':' separator */ -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm"; -+#endif -+ } -+ else -+ { -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm"; -+#endif -+ } -+ -+ tty->TN_max_colors = 16777216; -+ /*tty->TN_max_pairs = 64; TODO */ -+ tty->TN_no_color_video = 0; -+ break; - } - } - -@@ -4201,6 +4267,38 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ - tty->TN_no_color_video = tgetnum ("NC"); - if (tty->TN_no_color_video == -1) - tty->TN_no_color_video = 0; -+ -+ -+ /* Allow the user to opt-in to True Color support. */ -+ char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR"); -+ if (true_color_separator && strcmp (true_color_separator, ";") == 0) -+ { -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm"; -+#endif -+ } -+ else if (true_color_separator && strcmp (true_color_separator, ":") == 0) -+ { -+ /* XXX chopps use ITU T.421 ':' separator */ -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm"; -+#endif -+ } -+ else -+ { -+ tty->TS_set_rgb_foreground = NULL; -+ tty->TS_set_rgb_background = NULL; -+ } - } - - tty_default_color_capabilities (tty, 1); -diff --git a/src/termchar.h b/src/termchar.h -index d8066d7..e48d583 100644 ---- a/src/termchar.h -+++ b/src/termchar.h -@@ -157,6 +157,10 @@ struct tty_display_info - const char *TS_set_foreground; - const char *TS_set_background; - -+ /* Support for 24bit RGB color terminals. */ -+ const char *TS_set_rgb_foreground; -+ const char *TS_set_rgb_background; -+ - int TF_hazeltine; /* termcap hz flag. */ - int TF_insmode_motion; /* termcap mi flag: can move while in insert mode. */ - int TF_standout_motion; /* termcap mi flag: can move while in standout mode. */ -diff --git a/src/xfaces.c b/src/xfaces.c -index 29c91f7..347ebf8 100644 ---- a/src/xfaces.c -+++ b/src/xfaces.c -@@ -382,7 +382,7 @@ static ptrdiff_t lface_id_to_name_size; - - /* TTY color-related functions (defined in tty-colors.el). */ - --static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; -+static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values, Qtty_color_canonicalize; - - /* The name of the function used to compute colors on TTYs. */ - -@@ -943,54 +943,80 @@ tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, - if (!STRINGP (color) || NILP (Ffboundp (Qtty_color_desc))) - return 0; - -- XSETFRAME (frame, f); -- -- color_desc = call2 (Qtty_color_desc, color, frame); -- if (CONSP (color_desc) && CONSP (XCDR (color_desc))) -+ if (f->output_method == output_termcap -+ && f->output_data.tty->display_info->TS_set_rgb_foreground -+ && !NILP (Ffboundp (Qtty_color_standard_values))) - { -- Lisp_Object rgb; -- -- if (! INTEGERP (XCAR (XCDR (color_desc)))) -- return 0; -+ /* Terminal supports 3 byte RGB colors. */ -+ if (!NILP (Ffboundp (Qtty_color_canonicalize))) -+ color = call1(Qtty_color_canonicalize, color); - -- tty_color->pixel = XINT (XCAR (XCDR (color_desc))); -+ color_desc = call1 (Qtty_color_standard_values, color); -+ if (! parse_rgb_list (color_desc, tty_color)) -+ return 0; - -- rgb = XCDR (XCDR (color_desc)); -- if (! parse_rgb_list (rgb, tty_color)) -- return 0; -+ /* Map XColor to 3 byte values. */ -+ tty_color->pixel = 1 << 24 /* Set bit 24 to mark RGB values. */ -+ | (tty_color->red / 256) << 16 -+ | (tty_color->green / 256) << 8 -+ | (tty_color->blue / 256); - -- /* Should we fill in STD_COLOR too? */ - if (std_color) -- { -- /* Default STD_COLOR to the same as TTY_COLOR. */ -- *std_color = *tty_color; -- -- /* Do a quick check to see if the returned descriptor is -- actually _exactly_ equal to COLOR, otherwise we have to -- lookup STD_COLOR separately. If it's impossible to lookup -- a standard color, we just give up and use TTY_COLOR. */ -- if ((!STRINGP (XCAR (color_desc)) -- || NILP (Fstring_equal (color, XCAR (color_desc)))) -- && !NILP (Ffboundp (Qtty_color_standard_values))) -- { -- /* Look up STD_COLOR separately. */ -- rgb = call1 (Qtty_color_standard_values, color); -- if (! parse_rgb_list (rgb, std_color)) -- return 0; -- } -- } -+ *std_color = *tty_color; - - return 1; - } -- else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) -- /* We were called early during startup, and the colors are not -- yet set up in tty-defined-color-alist. Don't return a failure -- indication, since this produces the annoying "Unable to -- load color" messages in the *Messages* buffer. */ -- return 1; - else -- /* tty-color-desc seems to have returned a bad value. */ -- return 0; -+ { -+ XSETFRAME (frame, f); -+ -+ color_desc = call2 (Qtty_color_desc, color, frame); -+ if (CONSP (color_desc) && CONSP (XCDR (color_desc))) -+ { -+ Lisp_Object rgb; -+ -+ if (! INTEGERP (XCAR (XCDR (color_desc)))) -+ return 0; -+ -+ tty_color->pixel = XINT (XCAR (XCDR (color_desc))); -+ -+ rgb = XCDR (XCDR (color_desc)); -+ if (! parse_rgb_list (rgb, tty_color)) -+ return 0; -+ -+ /* Should we fill in STD_COLOR too? */ -+ if (std_color) -+ { -+ /* Default STD_COLOR to the same as TTY_COLOR. */ -+ *std_color = *tty_color; -+ -+ /* Do a quick check to see if the returned descriptor is -+ actually _exactly_ equal to COLOR, otherwise we have to -+ lookup STD_COLOR separately. If it's impossible to lookup -+ a standard color, we just give up and use TTY_COLOR. */ -+ if ((!STRINGP (XCAR (color_desc)) -+ || NILP (Fstring_equal (color, XCAR (color_desc)))) -+ && !NILP (Ffboundp (Qtty_color_standard_values))) -+ { -+ /* Look up STD_COLOR separately. */ -+ rgb = call1 (Qtty_color_standard_values, color); -+ if (! parse_rgb_list (rgb, std_color)) -+ return 0; -+ } -+ } -+ -+ return 1; -+ } -+ else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) -+ /* We were called early during startup, and the colors are not -+ yet set up in tty-defined-color-alist. Don't return a failure -+ indication, since this produces the annoying "Unable to -+ load color" messages in the *Messages* buffer. */ -+ return 1; -+ else -+ /* tty-color-desc seems to have returned a bad value. */ -+ return 0; -+ } - } - - /* A version of defined_color for non-X frames. */ -@@ -1008,7 +1034,9 @@ tty_defined_color (struct frame *f, const char *color_name, - color_def->green = 0; - - if (*color_name) -- status = tty_lookup_color (f, build_string (color_name), color_def, NULL); -+ { -+ status = tty_lookup_color (f, build_string (color_name), color_def, NULL); -+ } - - if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name) - { -@@ -5780,6 +5808,7 @@ map_tty_color (struct frame *f, struct face *face, - unsigned long default_pixel = - foreground_p ? FACE_TTY_DEFAULT_FG_COLOR : FACE_TTY_DEFAULT_BG_COLOR; - unsigned long pixel = default_pixel; -+ XColor true_color; - #ifdef MSDOS - unsigned long default_other_pixel = - foreground_p ? FACE_TTY_DEFAULT_BG_COLOR : FACE_TTY_DEFAULT_FG_COLOR; -@@ -5798,7 +5827,18 @@ map_tty_color (struct frame *f, struct face *face, - { - /* Associations in tty-defined-color-alist are of the form - (NAME INDEX R G B). We need the INDEX part. */ -- pixel = XINT (XCAR (XCDR (def))); -+ if (f->output_method == output_termcap -+ && f->output_data.tty->display_info->TS_set_rgb_foreground -+ && parse_rgb_list (XCDR (XCDR(def)), &true_color)) -+ { -+ /* Map XColor to 3 byte values. */ -+ pixel = 1 << 24 /* Set bit 24 to mark RGB values. */ -+ | (true_color.red / 256) << 16 -+ | (true_color.green / 256) << 8 -+ | (true_color.blue / 256); -+ } -+ else -+ pixel = XINT (XCAR (XCDR (def))); - } - - if (pixel == default_pixel && STRINGP (color)) -@@ -6460,6 +6500,7 @@ syms_of_xfaces (void) - DEFSYM (Qwindow_divider, "window-divider"); - DEFSYM (Qwindow_divider_first_pixel, "window-divider-first-pixel"); - DEFSYM (Qwindow_divider_last_pixel, "window-divider-last-pixel"); -+ DEFSYM (Qtty_color_canonicalize, "tty-color-canonicalize"); - DEFSYM (Qtty_color_desc, "tty-color-desc"); - DEFSYM (Qtty_color_standard_values, "tty-color-standard-values"); - DEFSYM (Qtty_color_by_index, "tty-color-by-index"); diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch deleted file mode 100644 index 2d8099b73736..000000000000 --- a/pkgs/applications/editors/emacs-25/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include <fcntl.h> - #include <unistd.h> - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs-25/site-start.el b/pkgs/applications/editors/emacs-25/site-start.el deleted file mode 100644 index 023d6412ed84..000000000000 --- a/pkgs/applications/editors/emacs-25/site-start.el +++ /dev/null @@ -1,17 +0,0 @@ -;; NixOS specific load-path -(setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - load-path)) - -;;; Make `woman' find the man pages -(eval-after-load 'woman - '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - woman-manpath))) - -;; Make tramp work for remote NixOS machines -;;; NOTE: You might want to add -(eval-after-load 'tramp - '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix index a03c64476229..0305be28ad62 100644 --- a/pkgs/applications/editors/emacs-modes/cua/default.nix +++ b/pkgs/applications/editors/emacs-modes/cua/default.nix @@ -3,6 +3,6 @@ builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/cua-mode-2.10.el; - md5 = "5bf5e43f5f38c8383868c7c6c5baca09"; + sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b"; }; } diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index cc9e033cd416..2ce8b23203fe 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1336,10 +1336,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160905"; + version = "20160912"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20160905.tar"; - sha256 = "118xq8bsiwa6nfxm14ww5dmyf5r0cv69lf748cj39bcvg1qm94vn"; + url = "https://elpa.gnu.org/packages/org-20160912.tar"; + sha256 = "0g44hcyk9x0103mfkmkbrn4f36vlyrfxil1qd3fpwardcnaxr5w4"; }; packageRequires = []; meta = { @@ -1529,10 +1529,10 @@ rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "rudel"; - version = "0.3"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rudel-0.3.tar"; - sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1"; + url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar"; + sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz"; }; packageRequires = [ cl-generic cl-lib emacs ]; meta = { @@ -1687,10 +1687,10 @@ }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.2.1.el"; - sha256 = "1d91ddak5whb7kln216vhcsl707h5kirc6aqbkw82skhpg4c3ap1"; + url = "https://elpa.gnu.org/packages/stream-2.2.2.el"; + sha256 = "00p24ipn8frlhhwzrz6za7dq4fkhs8i8cwp48yhsq9zpnj9y38xb"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index e1382d6d50b4..ca751b21fc01 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -2,12 +2,12 @@ _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_0blayout"; - version = "20160826.1522"; + version = "20160918.133"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "3032dadf28ab63c132cd20abdd3a0008f6b72f9f"; - sha256 = "1xq91wx2f0psj395jlrjb2viwdz4ai1xm34m5xvanip2vm085xgy"; + rev = "2383bd5a71faaf451db24897f107728aa0626d61"; + sha256 = "0238cavnwr1j06ablc3cznhiyrizns2ri599sk509858jyvcaz04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; @@ -590,8 +590,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ac-inf-ruby"; - rev = "3a1e741b40b8dba0e9c235dad4b9907411d9dcd3"; - sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0"; + rev = "ee53fc9c61950da9a96df3ff5ef186f9a9faf151"; + sha256 = "13xgv1c4gr075gffq95njra7bw1fkb5yp3xdlh3qndzw4bpary1l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby"; @@ -712,12 +712,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20160628.422"; + version = "20160910.1747"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "b9e3d647d1724f50af5622be944ea94d04078194"; + sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "b9e3d647d1724f50af5622be944ea94d04078194"; + sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -800,8 +800,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; - rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112"; - sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88"; + rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e"; + sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; @@ -964,12 +964,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160811.112"; + version = "20160912.853"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "36770f464a0d15f8c666a55f8aedde26c238f4f4"; - sha256 = "1rcpylzpqf06jss7kibm3jr1lpakhf236nqg39725bxqai63j6ci"; + rev = "624c5ffeb98f7805768084b8a2530ea21a78cf38"; + sha256 = "0s5zsa1asq5wcjkrcrpd82075irg9yzz1wj8hrir7bfxmwpmz1k5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1339,12 +1339,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20160815.1724"; + version = "20160907.922"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "ce0804bfc4fcd6db07d1ffc96722e1e9e87f0871"; - sha256 = "0cbb8389wd80hbfb084q3b3qlkzxmz5i682rd2sl0rgvk9aafik4"; + rev = "6f7c62553a265d6b8b09df355bbd6bb36e9a15f7"; + sha256 = "021chmk8xxf3pq0avw54n9683v6swkhpxk927mfpnlw1824pqkbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1381,12 +1381,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20160602.2341"; + version = "20160917.613"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "b70a9458d7cb0cf191a660e7f27c73dc49d0278c"; - sha256 = "1pfmpwma9k6l386v4m884gb5p2apl4k5m2vaxhmb7hnf9p27yrwl"; + rev = "c9852e692b26f9cafa226b279c07c562ea41a000"; + sha256 = "0f40q1s78j5j0l4hj5q73hssl86dbvjqpk09cq93zwgcsmr1ydi9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1504,6 +1504,27 @@ license = lib.licenses.free; }; }) {}; + all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons"; + version = "20160918.1"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "all-the-icons.el"; + rev = "4386585272116656dd84558977df70d000aacc25"; + sha256 = "0a3gm4wvy416vah5hwmyzh1m58246f4gy40vb0zl681bivz0a97m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; + sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; + name = "all-the-icons"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; @@ -1558,12 +1579,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20160906.643"; + version = "20160913.544"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "ad6b85dcc9bdc698d1a6ce657addd133c180eeea"; - sha256 = "0c6jr8izks2x316xzcd962aiy7q4zmwfn8w4i85ans01a88249xf"; + rev = "75bd5c7f2fd45d6f3f68ea6f06e95175a7b4e4ce"; + sha256 = "0w753zs6xzbqaxym02dh4gfgab0cslqa74s7rlhlq0dzjm1sbn7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -2673,12 +2694,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160816.713"; + version = "20160914.1337"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "0e20e451605a052ef4faecafbd4d9937a6daaf0c"; - sha256 = "1q9c0ckrax5qvf3l3v8pxf1ygx380k803rdwrl9c8yb9wmxyn0ck"; + rev = "7e2c683d2d45f0c4901c4c492004b78345425d41"; + sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2820,12 +2841,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20160228.623"; + version = "20160909.50"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "451952126251b4eaf0418ffb50257b63510451a1"; - sha256 = "03h5p4wbgj3gz3d94fwmc6s3gkxg7l77fscl3znkcb8f934rf6xn"; + rev = "73bf5a83697f10fb9291ae30d58ae0f1f4f9f2c0"; + sha256 = "0dqgxfw0c6zdnhfdsys8and60qxpd3vk459kx4xgbvmv0vljl83h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -2841,12 +2862,12 @@ auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-async-byte-compile"; - version = "20120322.1441"; + version = "20160915.2154"; src = fetchFromGitHub { owner = "rubikitch"; repo = "auto-async-byte-compile"; - rev = "73248feca5595d81cd8a3bd4a4810e3586076e0d"; - sha256 = "17nv8rqjh3ynbk1r0njwjb5hd7sgii0vncsa1q19jyp3h30rj4in"; + rev = "8681e74ddb8481789c5dbb3cafabb327db4c4484"; + sha256 = "1g98gla9qdqmifsxakhkbxlljy2ln1s3wfahk9zycrwgzfjlsdf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/auto-async-byte-compile"; @@ -3402,12 +3423,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20160430.1221"; + version = "20160917.1423"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "05ea2283e73125dba1bb320929b879633e69a600"; - sha256 = "1kb6h37qlhzxk3v45bn0m38bp244c3fpxr3lzr7f6rsy8bpc8w67"; + rev = "4237f7b64d8eab7c0717f110a78bf689b06c99b5"; + sha256 = "06ng67slv468a2sqqvr82hy2r90nk5nk75f60cc65qs4i4hf8b0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3607,6 +3628,27 @@ license = lib.licenses.free; }; }) {}; + avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "avk-emacs-themes"; + version = "20160909.1323"; + src = fetchFromGitHub { + owner = "avkoval"; + repo = "avk-emacs-themes"; + rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260"; + sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; + sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; + name = "avk-emacs-themes"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/avk-emacs-themes"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -3673,12 +3715,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20160818.725"; + version = "20160908.1034"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "6e394af511274e906db027ea025ac95b4739b613"; - sha256 = "00air40hslsiwm4h0kf3ynklx13hn5dziqw3xwcgf3cvjpchw7vy"; + rev = "404cc625a374d183cc8bf2dc89d7bd77d5f54e3a"; + sha256 = "0zj20wg3irdkydlqnlmb4idq9aa8kfgjpl42clckprlcrdmf3ca5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3904,12 +3946,12 @@ badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badwolf-theme"; - version = "20160823.152"; + version = "20160917.1018"; src = fetchFromGitHub { owner = "bkruczyk"; repo = "badwolf-emacs"; - rev = "dc3bf0ed7031e8d755e3c8ac733e69003715665a"; - sha256 = "00r9gwmyrf8dd4l83mqw4m4qzj8ppy3082k94njhmyq1cx9bvx85"; + rev = "9aa8bb4e387192211fde213f5344a017266e3974"; + sha256 = "0k1ahcxj64s4g1c9w8qjyp23gskvp4b5nqbssspjhlcc46j99fpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; @@ -3946,12 +3988,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20160906.2114"; + version = "20160914.1130"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "d97474f6188700556ac4e121b7ea8887e24a8c0b"; - sha256 = "02pj78ccxzkbw7kgnqjpicyy672c1irlya0kq7q38yfmvnsjrxgc"; + rev = "97359d48a00b30776c5416ea90735d8302687677"; + sha256 = "0f0gg5kfzgii0rf75gh48wnwimkc88xzwbifkwdf745jhzkyqn6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -5068,7 +5110,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160906.1010"; + version = "20160910.2019"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5087,12 +5129,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20160906.1203"; + version = "20160917.657"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bef6f50554209ccdfba9261fac9a1c40f08e47ef"; - sha256 = "0z176l6bfpyr1z51k3zyfsgnz46mpabncf1pjyip9ddw08qr2ird"; + rev = "477a3d9fa8b6e0eb726d731c4961bd311f0e7413"; + sha256 = "1sabwcc51jlq0c031lm04qm0cr2bbimv1d464n6z85qd7yqrn3kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6148,12 +6190,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20160906.1346"; + version = "20160910.827"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "9ab9937f6c2abb94b24383603838d762909bb62c"; - sha256 = "05a2nsr2pd679k5z9lj3q4pivvnd9xnnv49an90m6z9bvdcdp1kk"; + rev = "45ec3ac3bce4aac6b832e158efc8cb784caaf5f2"; + sha256 = "0jmdh4bllmr3jgv2v35d014pjcl4brffz9p9l17dvdi01pwkhan0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6549,8 +6591,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "52debcc0a272e8c6c0bda85a46b1880d8a7e5d60"; - sha256 = "1nb5wmn04in8a4d2maqxmynbkhigi8r8pl6j72s4in694y0mnn61"; + rev = "d084f691ba42cd34527be2c2e3a801776e275b87"; + sha256 = "11ylkywjnf2xiv4gwhwa7x01gfwjvky8rp2z5kfc97rw7jpmvma7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6589,7 +6631,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11717"; + rev = "11718"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6898,12 +6940,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20160906.2229"; + version = "20160915.1934"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "c17d7f3a16a2551d7c8e908186dcc361fad9ba40"; - sha256 = "0vg1rxn3lwvmapw63i9i9iccs86xmjr83kx96w8gligacvnbgnzz"; + rev = "dc7a7bfb2ed5f26d99bfe416f2586aba50082c64"; + sha256 = "0rghbg1a8bqll5zn6r2gff94l8jn22q52aac7hpcw5n53ypqk4c1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -7126,12 +7168,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20160830.23"; + version = "20160914.2335"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "bdbb2d25b9f3fccf2c586414c5dfce104c811713"; - sha256 = "1k5s97inlm7igy5wp8rapy3l8k8mln0c3fqwn5w7pr09xb7bcqk9"; + rev = "6d6595a06c3b075635b91540bd82a117db9a3f2f"; + sha256 = "1aplq5w4skwfy4lisj9ws9qjshp4h9nwvvyvpfiq4cxvwwi10agc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7378,11 +7420,11 @@ clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20151116.438"; + version = "20160912.302"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "280808"; - sha256 = "0jli8vapg8frk12djhrgz4wfhl7pxka73wx0x41a4k45y9yijyfg"; + rev = "281853"; + sha256 = "1mz49n2jrfq5q2v4w0b74nrz7zsc9iw1kjzyklil8aygm9448bhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7503,12 +7545,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160502.1912"; + version = "20160916.513"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9"; - sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860"; + rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; + sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7617,22 +7659,22 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "cljr-helm"; - version = "20150425.1307"; + version = "20160913.128"; src = fetchFromGitHub { owner = "philjackson"; repo = "cljr-helm"; - rev = "99c6dcc5228ecd2fe9e6e28a9512cbc3df0770ef"; - sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln"; + rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; + sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; name = "cljr-helm"; }; - packageRequires = [ clj-refactor helm ]; + packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { homepage = "https://melpa.org/#/cljr-helm"; license = lib.licenses.free; @@ -7956,12 +7998,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160824.615"; + version = "20160914.148"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "81863c2e16e2ddc6e1616d5585836e46ceee6401"; - sha256 = "0rj4ww67v0r5wjf8siz6yy3hwxbwsnm9l5f8962sxrjillgf3kpg"; + rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; + sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -8023,8 +8065,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "f76bcee9a6a95b566e36b533a5fa45b496eb456b"; - sha256 = "00k49iwbkc82wk3ik05al0xyj34vagdall2bqb6c4lv9plica189"; + rev = "ca504042d1e28bfafa100d1be825928640cca7f6"; + sha256 = "1q9k4gfkbbb6pgjk8sw2yyq9xd0a57b6wv7n5vvycsbgn7qwvvkd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8479,8 +8521,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "6d1cf921881a0db6286ad6904aff2d17b2a335b3"; - sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig"; + rev = "99fb4753f071542690e7a17b3dd76b5f2a05e9fc"; + sha256 = "1vhncjyw0qbglgsd04cgyqc3473kz97ks15586ljrpa14f8fnjk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; @@ -8496,12 +8538,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160829.2324"; + version = "20160916.1758"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "6943ca134babe228fef975506826d7ac471c9ca2"; - sha256 = "1cnd1fd4mi6jjy7fkldsk9vzgl6q67d5rajr9a5fzzanp4v08zr1"; + rev = "81d8990085960824f700520d08027e6aca58feaa"; + sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9054,12 +9096,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20160831.1929"; + version = "20160915.2229"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "5439c4060ef0b8120ed6e9bb6c549d412eb809de"; - sha256 = "1mdx07891gll4rkgm7y0vdp980g72rv07wpnmjdp4v26qy9jnakg"; + rev = "a5bb9014de6ef1393cb12ff808dd4469da7ea648"; + sha256 = "15yyg0qapmkc9m53fpxzpiq2rh6cxwanh1k79v0d0qqk97dxdr3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9142,8 +9184,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; - sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; + rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a"; + sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9331,8 +9373,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -9348,12 +9390,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160804.2131"; + version = "20160910.1747"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "b9e3d647d1724f50af5622be944ea94d04078194"; + sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9606,12 +9648,12 @@ company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160821.1554"; + version = "20160918.204"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "83041d5da4ea4637dbd8b018a4762051175dba1d"; + sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9687,6 +9729,27 @@ license = lib.licenses.free; }; }) {}; + conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: + melpaBuild { + pname = "conda"; + version = "20160916.719"; + src = fetchFromGitHub { + owner = "necaris"; + repo = "conda.el"; + rev = "0d6d85568d662224c9facc196bca7d41a9f88659"; + sha256 = "1gsppa28ivimwrsadk6gn1llh06a8x36xck9mbmnzgh6c94nblr9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; + sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; + name = "conda"; + }; + packageRequires = [ dash emacs f pythonic s ]; + meta = { + homepage = "https://melpa.org/#/conda"; + license = lib.licenses.free; + }; + }) {}; config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-parser"; @@ -9920,12 +9983,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20160906.750"; + version = "20160914.642"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "f180451217277e63b067aa3d06d5af69140e320d"; + sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -9983,12 +10046,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20160507.1022"; + version = "20160916.1319"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "e17c0845633e3d1fb6f8b84d97efa17227361a85"; - sha256 = "1jzqhbw6mid7p5s88lwk1vjb12fmmxc3zfkhdkvxiglmanqghq6f"; + rev = "b157a8d12c9c8e5fea5cf46cb6fe6561f08b284a"; + sha256 = "0wja54camh4mx864b5ydc2kx2s50i4mg6zzgiz59adysz7aqvci7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10317,12 +10380,12 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20140426.1004"; + version = "20160819.1444"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "a54d000d24757fad2a91ae2853b16a97ebe52771"; - sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w"; + rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f"; + sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -10359,12 +10422,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160901.319"; + version = "20160909.1316"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "2275ddab415bcd790f603ccfb6f613142c6144f1"; - sha256 = "16dabgcll453rwc7afigsbvk42dl9yb8ihgvvq01pv57y95jn5wf"; + rev = "0183fc4ac9efa09d48174d01702247eb194af49d"; + sha256 = "1kccpk47wsm4gmslrv7xc5yxbvx1nj0wgxn8mvg3shw5yb0gag40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -10585,12 +10648,12 @@ cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cubicaltt"; - version = "20160810.38"; + version = "20160914.1356"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "cdf88159a26e2e4b73f9fea0c88a6e1d16497218"; - sha256 = "1x9qpil0fmhqld03aj5zxqcb7k4q35ca8w4plgblf5h30l9xzfzg"; + rev = "16730466b6de68fd6b0261cf4539faebcf0f30d2"; + sha256 = "1a0i1wbz6bpnkvs77zdkw5g2pkni65syqffg01d568m3jzg0g82v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -10874,8 +10937,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "f0091a9d6580785b868e4660b3a53027a2447a3e"; - sha256 = "0wlvgpmj6rypgngkmf5wjy6hh45pws40b299r4j1rqk480px1d82"; + rev = "d1be46e1ae4c0a9c94820e7db18c21fe749bc7a8"; + sha256 = "0v6skbgvkhafz70zkq6hv7cb0pbmfxqcb43mz3bnckywws5d9dsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11143,12 +11206,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20160820.48"; + version = "20160918.716"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; - sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; + rev = "1267711e9701f91a2b08679a1abeb5c43eb820cd"; + sha256 = "11b2yipp250a2cyigssy12dw489an4gkx7z6f4xkifah5kq81j8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -11813,12 +11876,12 @@ dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dfmt"; - version = "20160827.211"; + version = "20160911.228"; src = fetchFromGitHub { owner = "qsimpleq"; repo = "elisp-dfmt"; - rev = "618274b841b0b6dbfebd79baa9fe05eab2bbd5c9"; - sha256 = "1pvplsjcxl3m8fxix63ndwcwp54ga12kh0yv2y1bzbd51z08210a"; + rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf"; + sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; @@ -12130,8 +12193,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -12293,8 +12356,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -12314,8 +12377,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -12352,12 +12415,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20160817.823"; + version = "20160917.826"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74"; - sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6"; + rev = "22662c18af39add062bfc8aba9a294c111ca4886"; + sha256 = "05i3k7d62rz2wczf5fxs8icsyx6xi2cggdcd36dq0kjimz3z2cd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -12373,12 +12436,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20160904.1533"; + version = "20160914.756"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "1c24b5ea9d0b091fac58047cb1a1ca60a16a6594"; - sha256 = "0cnj9ffphsq7rzq4hnlxaxi4ziij2d86zqll5pg0ggdsfjhq2dv6"; + rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb"; + sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -12394,12 +12457,12 @@ dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; - version = "20160130.845"; + version = "20160918.740"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -12419,8 +12482,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -12435,10 +12498,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20160826.2346"; + version = "20160915.1039"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "0v5qi7gvqq52qb8wv2dqw3xq348ckfb1ps1l1sk52qp5iswl6995"; + sha256 = "05fm87wjspgqjxip41g8z66q0zy4wyh6knid99ddlrn1k94l0y7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -12479,8 +12542,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -12500,8 +12563,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -12597,8 +12660,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "7adde0a15caccd3b8d67e70ded2b2da349e95415"; + sha256 = "1ndgpqwkdjfxsds8l32a70ywljar18h43msggl4bzh9352c69cgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -12801,12 +12864,12 @@ discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "discourse"; - version = "20160811.2150"; + version = "20160911.119"; src = fetchFromGitHub { owner = "lujun9972"; repo = "discourse-api"; - rev = "a1c16af8f77986fb94fbc34c1e6ea36fcd97e00b"; - sha256 = "0i2p97cgrqz65l0bc6zgixvb5bdya4ynq18ygrs3v66xp02rxqc1"; + rev = "a86c7e608851e186fe12e892a573994f08c8e65e"; + sha256 = "1p4crd7v94hmqzqh8bc7jx1pfhallmj4kn36f8l22z4r2mkyycxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse"; @@ -13319,22 +13382,30 @@ license = lib.licenses.free; }; }) {}; - docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }: + docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20160816.105"; + version = "20160911.1215"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "d5d6f8ecdc5fdae19ff03ad3b242fd50fd618c4a"; - sha256 = "0sczy87n9ymckw64fh3lxbpjawfc26xsja4qylzaj5pjsixrnpjh"; + rev = "7d9b72ed0e7afa992a6f15066bfd974d5f2e1696"; + sha256 = "05pll1a7j9clgjn00llhra59svkwqhynyyjvsih0p3rhp3vg7297"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk"; name = "docker"; }; - packageRequires = [ dash docker-tramp emacs magit-popup s tablist ]; + packageRequires = [ + dash + docker-tramp + emacs + json-mode + magit-popup + s + tablist + ]; meta = { homepage = "https://melpa.org/#/docker"; license = lib.licenses.free; @@ -13466,6 +13537,27 @@ license = lib.licenses.free; }; }) {}; + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "doom-themes"; + version = "20160917.159"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-doom-theme"; + rev = "246cc37a8739ac4343ddcc11a2f185cd42f07fb4"; + sha256 = "1zgl87lk5783qn4s9fmh5hylwyvb33p94y6i0cbqkgkp1n0zpm4m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; + sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + name = "doom-themes"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/doom-themes"; + license = lib.licenses.free; + }; + }) {}; doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi"; version = "20151231.1255"; @@ -13807,12 +13899,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20160821.1324"; + version = "20160915.245"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "f425ba445ae201a16e3fc3b4f5fb8bea93579d39"; - sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; + rev = "eec2e557d769f3379e6c208334650f3041d28d54"; + sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -13851,7 +13943,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1759610"; + rev = "1761331"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14599,12 +14691,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20150717.648"; + version = "20160913.5"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "7dad2da09da33d8540f25bf7bb7dd62900669b80"; - sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2"; + rev = "1dcfebf13506e6ecc7e76e668665cff9cf79acda"; + sha256 = "0grk10s0fzcdpcimdk1dblq5f8k999h7mlqhhjvvdwjbypmy9891"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -15070,12 +15162,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20160822.849"; + version = "20160909.937"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "33b8df4e13257a0e893a4f49a1d6aa623e2bca72"; - sha256 = "059vhx15rvp52s3bdvhz62jvkxi6ab9ly7pmab9cpdcpagqq9gaq"; + rev = "ec36eacb1455b551a2084f8b7cc79981723dbd38"; + sha256 = "0pv0a8d0czk3kyliynbwmcqmr3adaw0pis2wgbdy9qz07m2k64s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15131,12 +15223,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20160831.817"; + version = "20160915.1214"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; - sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; + rev = "ef949a189d51d00f6ebf56870caf6e6917f11b4c"; + sha256 = "0qhksfb4ngmncsi4yd19i8fqg97q5yhk4lyc7xh34mzn0bjz7xyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -15194,12 +15286,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ejc-sql"; - version = "20160603.742"; + version = "20160916.33"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "a7509abcdf76408acc03f1f198450b9064bcd5c4"; - sha256 = "0v7amrmzrmj3myikd0a3g30cmkjri84paxxi4qzldwshj1pwypn4"; + rev = "2dfcbe4776551bf65ce3ea3a0c1689ae65236ad9"; + sha256 = "1dwfkyblz7zdsirnvny4cm862i9j322kz7wz81g4clslrjs07x05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -15236,12 +15328,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20160827.1305"; + version = "20160913.1201"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "0ee06a6f8890d3a1eca913e42c7f22e9d1d507e2"; - sha256 = "0dv4ags1hfv2fyypqn75cmnjgskwjkx6kjz5r1k93siz3grny8kf"; + rev = "a6ad0bb2430a89d1711c7c3b1396fe864e2c9b87"; + sha256 = "196m3lik015lbgnvhj7qb51cja65yd9sww83gnmak7g4hfx67pb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -15570,8 +15662,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "4f8ced25619b34ca6b36f8446071c2cb75e23906"; - sha256 = "1lvlhjdprlw3dqz49h8gncw5q33mlpqwx9pgi7jj79hrsfq8fqml"; + rev = "a23a5b92e0efba55314bc621502a373e28784d1a"; + sha256 = "04dnkrrxim82ysdzwcqhvhqabxm3f97z8nqgn8g8idj0m1as4wm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -15650,12 +15742,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20160826.1719"; + version = "20160911.1353"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; - sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; + rev = "f45deed1694340df010e5c60776bfef3784a2c7f"; + sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -15724,8 +15816,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; - sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; + rev = "f45deed1694340df010e5c60776bfef3784a2c7f"; + sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -15850,8 +15942,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "elisp-slime-nav"; - rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432"; - sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"; + rev = "8a1c2717a6fb50b654b8d1ffa12a40420ee32990"; + sha256 = "1nn97aqfawygvwybr5d51y82az4pj774d6qmwsqfpx7yppd45hsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav"; @@ -15909,12 +16001,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20160906.36"; + version = "20160917.429"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "7e0da96f483703930919f04943f60f6eca3cb842"; - sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3"; + rev = "bd85bd55a03512e2fe00b05faee8ffe0878ab4f1"; + sha256 = "16x566c9ppfz6bhj1hwninpg5p93qf3ik10pkssibwj5igfg7cc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -16081,8 +16173,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "elpa-audit"; - rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc"; - sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy"; + rev = "727da50e626977351aff2675b6540a36818bbbe6"; + sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit"; @@ -16119,12 +16211,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20160511.2204"; + version = "20160917.10"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "d735bfaa848d93abde5848673f6bf8e50aaf8530"; - sha256 = "1l1wnnmz62crr2gzpf0gzqp2pwmd50xp9knpswwz7l482gvfbzl7"; + rev = "9cf096448b69c795b20aab89557e9add6029b13c"; + sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -16144,8 +16236,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c3fb8a8a4aaa7aafec6a38d22ffe1731e7a8cf20"; - sha256 = "16c5pzrnnjg4dy1k07wn64nmvb8h86530krdyp5h5v4vlpwd3m67"; + rev = "4137f5aa88fc219f84effc6a6f79def8249bff6e"; + sha256 = "1jfn3pb0hh5sybgcfmgba7xairpwpcx56xg9gbrn0sviwbcmyjwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -16206,6 +16298,27 @@ license = lib.licenses.free; }; }) {}; + elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elscreen-fr"; + version = "20160910.314"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "elscreen-fr"; + rev = "698b4028d5d15943c0701ac7b87d0fd9ae7e43fb"; + sha256 = "005zj0sa60yyxp0vj8zy2mr217a9gvpxd3p1blk2zxdafqn0p8rm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr"; + sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm"; + name = "elscreen-fr"; + }; + packageRequires = [ elscreen seq ]; + meta = { + homepage = "https://melpa.org/#/elscreen-fr"; + license = lib.licenses.free; + }; + }) {}; elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-mew"; @@ -16563,6 +16676,27 @@ license = lib.licenses.free; }; }) {}; + emaps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emaps"; + version = "20160910.521"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "emaps"; + rev = "728eb6eeae46194f32a01bafa349ece520bc7a10"; + sha256 = "1asl6wkibfcxmf1kwnppbh8qpa454ssyxrqfh2d5dna3gxaa2cqm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps"; + sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw"; + name = "emaps"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/emaps"; + license = lib.licenses.free; + }; + }) {}; ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; @@ -16921,12 +17055,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160904.2344"; + version = "20160918.444"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "f791ad4c741218668dad4ba8db65161da9a5b010"; - sha256 = "172p422889wikj9hvq973whqz9jnkaxay8lsa5zdk26i0b6a2kk7"; + rev = "f99320138355660c06e382d70a60bc1b6e407a36"; + sha256 = "1grk1rbfjp11bvag2nimnzsb82fa2xdglszl9y7hx6vigcinyj8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -17143,12 +17277,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20160905.704"; + version = "20160913.609"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "adca2a4dc74edca2a017374543bdcb45a3ffcabc"; - sha256 = "1wlm4c5pasvnh3mrkwvzhs5phyh3h1a6hyksm4lr7ynvgyn7nslz"; + rev = "a38910d51226bffaf33b3b3c50a27a41123192ba"; + sha256 = "1z3f4i8b0058bwdfyhb6lxs7l12myw0fqp0w1qrpzmvk8may28kw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17424,11 +17558,11 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20160504.1145"; + version = "20160909.1503"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "b237cf8118fd"; - sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8"; + rev = "dbb74dd91c5a"; + sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -17675,12 +17809,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20160904.854"; + version = "20160918.749"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "d85ff3601f5f6c4771a3e215640f6bc026e02822"; - sha256 = "1i7599pddh5klad0a0lmkcb978ckc898nknlrbcbrh7r7gm70242"; + rev = "822a84c5ea76b7ae7de8843ae143ba80bcf92cb8"; + sha256 = "01k1kxyzrhrd93wysb44r5cb4m768bn005sk5x0g6zsgwca4hfsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -17738,12 +17872,12 @@ ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ergoemacs-mode"; - version = "20160720.1613"; + version = "20160912.1007"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "6bb3eb24c8a7e881024d6d0becb01c84c37c95f0"; - sha256 = "0pnv4q30aab18c65vqrd16dbvl9mfkni13zfcm4sgabpmhgh7r8h"; + rev = "9eadbc060248ac20bc1f47b2c1f6f9661d464c70"; + sha256 = "0l9qxqcskmdzjks234d9nf0l9pqaqpch60k278qdh3x6mwlg5p6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -17784,8 +17918,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b834a527c2f420a80806fbf36d4585c1e530061c"; - sha256 = "0n1mrsgbk5r663i2zkxqn4q0dimpr2n156822yb6f38ay6b41c7m"; + rev = "fde238fb52133a6c7a2a3f2a2e16f1c1bef62394"; + sha256 = "1iiwrkbrwcc3kb7r0h7nr1y1qqmdsaxh7b9m477j09gjgkz6sbzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -18280,12 +18414,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20160905.1519"; + version = "20160913.853"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "14e80d605a9f0d3912526f1eb4bfbeac9290d450"; - sha256 = "0qlpl2an7qzq9q1ib29z2haqd2q2hqciblxvh982f3yghscn7wgr"; + rev = "c83eed18866e3a14e75c3faf3028edca97cd1359"; + sha256 = "13lv31x46cb0cmvxa2f4ibhkp034f3yy4cvv0fcx4w8ps46lfal3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19407,12 +19541,12 @@ evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "evil-search-highlight-persist"; - version = "20151215.238"; + version = "20160912.807"; src = fetchFromGitHub { owner = "juanjux"; repo = "evil-search-highlight-persist"; - rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"; - sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk"; + rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc"; + sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist"; @@ -19491,12 +19625,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20160501.1704"; + version = "20160911.1224"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "eda6b0d6ca856d66f32b2718887ff02ea5c94d16"; - sha256 = "0nqa5lqr2rplsinxh5nh1qkyl2b7lg64q6pxi2mn3rgvhdq7hrm9"; + rev = "3812140e11a1b30878701cc028a4305ec3280a35"; + sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -19512,12 +19646,12 @@ evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20160825.1024"; + version = "20160909.1407"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "064c7388995803ccf9959e09fe8aaa95c53e001b"; - sha256 = "0nqj70yw0jalw8svkbh46240kr0bhs60yallrribxakiz5iqyb33"; + rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133"; + sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; @@ -19656,6 +19790,27 @@ license = lib.licenses.free; }; }) {}; + evil-tutor-ja = callPackage ({ evil, evil-tutor, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-tutor-ja"; + version = "20160916.1832"; + src = fetchFromGitHub { + owner = "kenjimyzk"; + repo = "evil-tutor-ja"; + rev = "99af7d82e02ce3bcdfaff47c5c80b57327a7ea8d"; + sha256 = "1cms98cy4p5dxwfc1zhgdaln8vr2nxzcj0d31imyabb4mwliabfw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c98605fd21b38aaa200c6a0ec4c18f8575b0d7a/recipes/evil-tutor-ja"; + sha256 = "1yd8aij9q1jdmb387f1zjiq5mf68jvbgbyp5b49hmag4hw5h7vm2"; + name = "evil-tutor-ja"; + }; + packageRequires = [ evil evil-tutor ]; + meta = { + homepage = "https://melpa.org/#/evil-tutor-ja"; + license = lib.licenses.free; + }; + }) {}; evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; @@ -19810,8 +19965,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "9700a076a932d4c8bc92d9e12f21978232056373"; - sha256 = "11w0wn2q7c80h8czkbipp5j5vgj47jx0azfqk6xpw66dh4205zp3"; + rev = "5836fb1656493be4152e8f20b5b0ec3d49ca2787"; + sha256 = "1laii7pvw18pp71r0fssw67lgw7wb5wqbjrpdrg5xr7smx8fxccc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; @@ -20014,12 +20169,12 @@ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ez-query-replace"; - version = "20140810.517"; + version = "20160908.1329"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; - rev = "1c0cab96d65105b780e32fdd29d2c6933be72ef6"; - sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi"; + rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3"; + sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; @@ -20687,12 +20842,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160809.526"; + version = "20160909.1355"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "a32ab79cfef0e1c5c8d9055fb99d9cad005815de"; - sha256 = "0gdsribyrvapinjkpm773rdn6sbrr9gsydpss5jw4p9a16nkl8a5"; + rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d"; + sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -21374,12 +21529,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20160904.1622"; + version = "20160915.515"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "f0f31ecb7a08111961961a0455f02d094c115619"; - sha256 = "1ibrdzhbpwlfgaq5rf15177c7ahramgxmjbagwp54m5n3r6rmiz7"; + rev = "4681aaacbd8f628d595ab53e7f3fca33f3d00f4e"; + sha256 = "0cw6af8l3js0dbzxcprmjkfljinsny8zkvsgvs0ca6q50v6aqhda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -21819,8 +21974,8 @@ src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "2e863429cc953cf4c14783e249df56d1ae669868"; - sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw"; + rev = "33cc9c2d7101e0448e5e49e23487c50df163f7db"; + sha256 = "0fjm1ll2958rjs2kzn8zgdl9ifjah6rrcsgfb1razbhf57qwbc0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -21882,8 +22037,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-hdevtools"; - rev = "ee311ac8d8be5803f13c649b8260839c0024e729"; - sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb"; + rev = "fa9759f4d59764949539a0c37f037c80a6fb5e9c"; + sha256 = "1d7r0virhlz2vg1cbmsi55gw51lzsj84svn3i19fk44svkkmx5yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools"; @@ -21924,8 +22079,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; - rev = "78392ba2c0c177c47bb795a1a191c29846837f57"; - sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv"; + rev = "cba408d61e26cf7c31c4a6f82a28a3a32e145c05"; + sha256 = "0ysc2hwz0xmmlwfwd70nfqvd81dvf4gfrynkrfgg9w6hp7y4z522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; @@ -22067,12 +22222,12 @@ flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-package"; - version = "20160502.135"; + version = "20160917.1722"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "aeae7de23483a44126740f452e79266fc6fd0d9b"; - sha256 = "1x5lk6fdai5jvq4hlcgb88ljjncwkq1lkqs8d3wkqwyc3kh3rwjg"; + rev = "086a98a100d7eab708e3951c60ee93454cf20e8e"; + sha256 = "1pmsa8hp3cpqlsl1f4yk57gla1y9jhg28fr1n7qck1c955x6qrgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -22155,8 +22310,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "2ad60d92610596672b830328b5837b58350ca7cf"; - sha256 = "0wca22jp0alknmllfl22j89aasiwms6ipqyv1pnvbrgmrbzcmlp7"; + rev = "2a92f6e2f8cf6a1019358c69c14c7ca835d02955"; + sha256 = "017869kcd4cjyv0hx4pkpfln96cxp6ra4ps7rx6xwrxa24f0bhrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; @@ -22232,22 +22387,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: + flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20160816.236"; + version = "20160910.956"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "2a0fb6bb82785fc717b0acc7427e801b08a13017"; - sha256 = "0dyjamgmgdj0sw9l7ay9s4akba95n0apnza4l5qcbkmz28qw6gz5"; + rev = "0f134b8c96d6913891b53262e275502814e2084d"; + sha256 = "1alpi6s691za89j0lw0zv22ri2bkjc40yxc85wijny1k4nz907nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; name = "flycheck-rust"; }; - packageRequires = [ dash emacs flycheck let-alist seq ]; + packageRequires = [ dash emacs flycheck seq ]; meta = { homepage = "https://melpa.org/#/flycheck-rust"; license = lib.licenses.free; @@ -22298,12 +22453,12 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20160622.1906"; + version = "20160908.1953"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "2e8ec9818f25c57516c48612f8b0963df177123d"; - sha256 = "0dblxsny6immyg9l1mraahqipbbybg3drny87gl5vsvqpd94g4px"; + rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91"; + sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -22319,12 +22474,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160808.754"; + version = "20160913.130"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "83041d5da4ea4637dbd8b018a4762051175dba1d"; + sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23775,6 +23930,27 @@ license = lib.licenses.free; }; }) {}; + fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fsbot-data-browser"; + version = "20160918.213"; + src = fetchFromGitHub { + owner = "benaiah"; + repo = "fsbot-data-browser"; + rev = "d1a61d1c4f6f4701c3ce98502ffafec5c9b9816d"; + sha256 = "1scsxkdxqv99pdgpkqdvmabpx0mwr8jizlz428nmbwigcgwj9sji"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; + sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; + name = "fsbot-data-browser"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fsbot-data-browser"; + license = lib.licenses.free; + }; + }) {}; fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; @@ -23831,8 +24007,8 @@ version = "20160825.254"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "98be09e8eab968cfd6c4c8d9ed0d894297aea82e"; - sha256 = "0gyfi59rd61sxpgw0dz6xk5n2ickrxisgwh443zx9jainjrqk5f9"; + rev = "c590ad120194f28634ee475a7f9b00610528b16f"; + sha256 = "0mscfrbjdd06n2c4ldkrybgxxmiz7bm5yc706lz0p8219vnyzb2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24073,12 +24249,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20160714.557"; + version = "20160908.806"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "022798e6ed0d03fcb896635d7322f0b79f6463ff"; - sha256 = "1vc0lh6cr3d7fyg7w400750glk3jfas0y58qxh2wdsnfj8qvarc3"; + rev = "383a050920e9b99d37c21d041deb7f38b202485c"; + sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -24281,12 +24457,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160907.532"; + version = "20160916.753"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "e8913a9f57cde590cd932704ba6efd7429572435"; - sha256 = "0djf7rz918z2xchf05ir8q0jc1zmrdvvmpmhl8a8qfav9146ffi3"; + rev = "88223d95bf661b64c24b831d228375433b84b28f"; + sha256 = "0wgwx2bcavyl6rlbai7cih884rb3b3jqr7y39nhpqn8rydrrl42f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -24386,12 +24562,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20160617.1840"; + version = "20160909.813"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "b4ee572a6b2e70d3db6ce11f73e6f87b73a13273"; - sha256 = "07gbnymgc6lfv1vd37kqfm5bwg5zn5603fs2amrcc6jz3jyqfn0p"; + rev = "c697c1d55a95daa5bbe214153c8bbc71ba5b9ba9"; + sha256 = "13j64bsnc2dgkmbdidw1kghyh0r0la3f4xbpzn0s41q2nmcq335m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -24453,8 +24629,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "8be4cdfe5f051f29a2488baae8a106a914d83ba8"; - sha256 = "10f5492r6pb203669zgpy49csz2jfmjxp53pnyk2rwyzfy0ci3v6"; + rev = "b7cda9e9b9515ac2cbf8a0cf0ffe7cd4ba52844b"; + sha256 = "183ssyryfqzz4dacirkfn6ycigsm6mfvr6mx4hivav9jzyrd9n7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -24743,12 +24919,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20160821.1338"; + version = "20160917.2127"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "1c05b110ef5629e607feea0384a19ac2c036cc51"; + sha256 = "1pnbi1izp5ywd343hklkg9m4m1pbl2m98hi8gbva6r36vjlp9w44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -24911,12 +25087,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20160813.1502"; + version = "20160911.1640"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2"; - sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260"; + rev = "f5b62320b45cfdfaf8db5b4e91f536bf0043ff0f"; + sha256 = "1s18x9cnmx4jjgyi7jnsg4qsvjlxq9aablg5c3z458w2fh25h3rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -25205,12 +25381,12 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20160519.303"; + version = "20160909.56"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -25244,6 +25420,27 @@ license = lib.licenses.free; }; }) {}; + gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "gitter"; + version = "20160916.1128"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitter.el"; + rev = "18dcb779350367af49d34b4a1c6c3f576657c327"; + sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; + sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; + name = "gitter"; + }; + packageRequires = [ emacs let-alist ]; + meta = { + homepage = "https://melpa.org/#/gitter"; + license = lib.licenses.free; + }; + }) {}; gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitty"; @@ -25619,6 +25816,27 @@ license = lib.licenses.free; }; }) {}; + go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-add-tags"; + version = "20160908.1754"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-go-add-tags"; + rev = "86b51a94832b4533fa70f11e4244e5c041075b1d"; + sha256 = "1jnj7wml7cynkkmp8bljdlnb8mhbammbycw9gr5cd5dmzip89yac"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; + sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; + name = "go-add-tags"; + }; + packageRequires = [ cl-lib emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-add-tags"; + license = lib.licenses.free; + }; + }) {}; go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; @@ -25626,8 +25844,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; - sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; + rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a"; + sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -25772,8 +25990,8 @@ version = "20160715.854"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; - sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru"; @@ -25810,12 +26028,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20160715.205"; + version = "20160913.944"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "737611ee2f8ffd6ae573e37cc04c4ad4abe7697d"; - sha256 = "0wljlakm6gjgjrvinpi7vgs1n08xj87cvqq149gzzjwa9dq2gk15"; + rev = "004575eb128ab01a11b4a4d278c544f91cf752fd"; + sha256 = "0il6hbk1lvmqb6c45zima372g7my14bm13c9mlcsxghpp0hs1fj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode"; @@ -25897,8 +26115,8 @@ version = "20160307.744"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; - sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename"; @@ -26208,12 +26426,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160824.1707"; + version = "20160909.1358"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "7e156e840d597f413ef3debd7629adf8de63da5d"; - sha256 = "1yf7z7mwn4qq9q1phiap565nvs8yrw7p1y8i7wwi2xbi91mjc232"; + rev = "a1e95d9f01550b5170db052887be3d45482dddc1"; + sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -26373,12 +26591,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20160808.1810"; + version = "20160909.1241"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "582151d8d15324ce497ee6d7c0297b2fd27701d5"; - sha256 = "15g4p7hjimnapcdrl8r1cixjyj3glqw2fribk8mws3f4sbihw952"; + rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1"; + sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -26541,12 +26759,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20160906.810"; + version = "20160916.1139"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; - sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; + rev = "d9c54538b61d07935292bcb03377b58dbe9c5e2a"; + sha256 = "1y0llafgmw0bp9h4zlrlazl3spz2c9mlsii86h397bsqd970zzcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -26883,12 +27101,12 @@ gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20160907.315"; + version = "20160917.2225"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "b0e67e42a44374be7176e199414a40309cd8d6fb"; - sha256 = "1h2whbp1qqlfgs3z7nxk31jgq7dqhsac8pxamr6wvxpy23wvj9x2"; + rev = "9b0526be614190cfc78d06024b2254802fbc706d"; + sha256 = "0xfansmy336g16smr47bf5pm8allzb6imzbyny4jry2mvk7q74p3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -26985,6 +27203,27 @@ license = lib.licenses.free; }; }) {}; + gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gulp-task-runner"; + version = "20160911.430"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "gulp-task-runner"; + rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; + sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; + sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; + name = "gulp-task-runner"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gulp-task-runner"; + license = lib.licenses.free; + }; + }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -27030,12 +27269,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20160828.912"; + version = "20160914.1903"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "eddd0ad1664b305e2b8c05daba3fd37971ee8d24"; - sha256 = "1xwzdlbn19aq66v2b1i5kl6jk9zs6dk07ryy14yws26d1ajvm8rg"; + rev = "038c69283bf54b902dc42de0b6ec7d567c4629cb"; + sha256 = "15n32p8ap6a4da9hsq0hhcjaqfmy2y6x8j02sqgi13mh1rlp0g4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -27387,12 +27626,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20160827.1033"; + version = "20160915.741"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "80225e09bf06ab3962b24812f014f948218e0c80"; - sha256 = "1vb6wp35l1vhzlyfs7h5hcnmm2mk47sxxx5waiclmafc7y8j35al"; + rev = "365c2270ffe30fcfe2158701c3d83d00cf6f5a42"; + sha256 = "0qjg6j0x4wb96zslchjvbp1fz81qa9ffwkacwyhrrlfpaq1f6lx4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -27655,12 +27894,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20160906.1118"; + version = "20160916.2319"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; - sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; + rev = "7aeb35f0f5490f4d7cd7037880845ec885ce3d89"; + sha256 = "0iygx5s6kpgni542qxqm826rnb6zb0yyxm0p9zrd4zf541687psz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -27739,12 +27978,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20160809.337"; + version = "20160917.2126"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "88e422ad5a76a7a0d8a5cd766d29c22206d8135e"; - sha256 = "0fmhys3ikjcqnsld8fc04d9l0kbb8gs1n3yy06kxf5jzc8cnyi84"; + rev = "4086ec0bf3f680a0e1eca0b3f514e82514da4365"; + sha256 = "1hbgm3aywh14cpzyn7437nr3xnyfqxy5yvgbgwr2100kqbxcvyhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -27844,12 +28083,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20160823.900"; + version = "20160917.342"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; - sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; + rev = "e3351d11469df31104ac27faffbb93ff97a6740b"; + sha256 = "17d5yrdsv2ax2mbs6s0p3bsy25c46r2s953b5i2jdcznh4s2fvzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -28033,12 +28272,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160902.2037"; + version = "20160912.1935"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "375b5666e333398a60e9ddb9a38cad677e2f60a0"; - sha256 = "0vh3whp4qr56ijjkx24g4yis3qvkjgzhzx535hl7kqnrpf4apjry"; + rev = "eab25fb6bc151b467a1d6a16b8d7a9e39f6ccdac"; + sha256 = "1hrvlj38rifyh1fsjcl4l77xlvnjavgff9wx5i6da20zkz2kqzf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -28201,12 +28440,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20160906.1004"; + version = "20160913.219"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; - sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; + rev = "7aeb35f0f5490f4d7cd7037880845ec885ce3d89"; + sha256 = "0iygx5s6kpgni542qxqm826rnb6zb0yyxm0p9zrd4zf541687psz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -28306,12 +28545,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160806.913"; + version = "20160916.713"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "7771aa53d4f2828022504132114fa99e178be892"; - sha256 = "0dp540vah2lnza4g1p65ping09jk944fvpq7yp965dj62gsjbjgn"; + rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; + sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -28793,8 +29032,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -28875,14 +29114,14 @@ pname = "helm-growthforecast"; version = "20140119.1944"; src = fetchFromGitHub { - owner = "daic-h"; + owner = "daichirata"; repo = "helm-growthforecast"; rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b"; sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/935d4c6bff4adab531536ab6a695cb690c72e0ae/recipes/helm-growthforecast"; - sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/helm-growthforecast"; + sha256 = "1qlyp263rl0892hr53kgc16jlx3jylw2pplbzlx05a60k5348jjv"; name = "helm-growthforecast"; }; packageRequires = [ helm ]; @@ -28894,12 +29133,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160726.844"; + version = "20160917.2238"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "fb0079054518b966a1b8a42f5d970e5fbc522d37"; - sha256 = "1nw0drvyqdjwdq4q5ypj1pqjvkgmgz64i70r7dnwnyjpgvk3d1dc"; + rev = "1dd22dcc97a593f920f10acd7afd167f0e060f7b"; + sha256 = "0sixfcs6114x9af9m8frjj0cz1krzrm5z704crlfjlbw8a8a16l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -28978,12 +29217,12 @@ helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hoogle"; - version = "20150919.32"; + version = "20160913.1022"; src = fetchFromGitHub { owner = "jwiegley"; repo = "helm-hoogle"; - rev = "f4a02784dd7c3f6e8ecda31dea23b2faae260636"; - sha256 = "1l85kip4zd08d38sk7cdafmx0v68dh419cs86g7x0mgi0wn00kfc"; + rev = "882b729b9f0f23d35e808e0dcd51047954486135"; + sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle"; @@ -29233,7 +29472,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "152395"; + rev = "152787"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -29313,12 +29552,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "20160803.713"; + version = "20160917.2152"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; - sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; + rev = "d2bff4100118483bc398c56d0ff095294209265b"; + sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -29359,8 +29598,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -29422,8 +29661,8 @@ src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "598e88f0c0dcb37a0af8ee890be71d8522bd2748"; - sha256 = "0ab083b5n2jxqxbcvrriyw896j3gsb86k3ngwmjvvfk4bdyzgabp"; + rev = "48b77b5154547aab641b4ba5f77cb5946f1b92d2"; + sha256 = "1l4z8y5dfp09ic368fcqh0akgn4y5adk2pg8dnlnh3hl9468q2a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -29457,22 +29696,22 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-package"; - version = "20151210.48"; + version = "20160917.2232"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-package"; - rev = "117f5f26c96c0854aadaf9c52aaec961195d5798"; - sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw"; + rev = "dec1600da71301d14a7c17052286ac4a25378b7c"; + sha256 = "0qg7q01i48x8igfv3sh3gx77af76hj3yrwwc7f878r56k3w9d2ca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; name = "helm-package"; }; - packageRequires = [ cl-lib helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-package"; license = lib.licenses.free; @@ -29520,22 +29759,22 @@ license = lib.licenses.free; }; }) {}; - helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-perldoc = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-perldoc"; - version = "20160712.2137"; + version = "20160917.2256"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-perldoc"; - rev = "90a0ce4d2f4c77c486869ed3ecdbcb3f2014005e"; - sha256 = "0xkxl07y9z6zdh41m3dg9q35df2lsgbp298svlfygdm6rl5i2z0v"; + rev = "1979f9f67814c11ec9498502237c89a5e1153100"; + sha256 = "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc"; sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb"; name = "helm-perldoc"; }; - packageRequires = [ cl-lib deferred helm-core ]; + packageRequires = [ deferred emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-perldoc"; license = lib.licenses.free; @@ -29565,12 +29804,12 @@ helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-proc"; - version = "20160514.718"; + version = "20160917.138"; src = fetchFromGitHub { owner = "markus1189"; repo = "helm-proc"; - rev = "0a75a86e4f381143134e0cdcd8c84c5b5b0fb2d6"; - sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2"; + rev = "a096066d352174cdc71f3107b089913d6b0b588d"; + sha256 = "02rzbjzfvpszgh6gdnklsgmcxyzl1w4j88fkh7jkk3jdrrapysdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc"; @@ -29688,22 +29927,22 @@ license = lib.licenses.free; }; }) {}; - helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-pydoc"; - version = "20151008.724"; + version = "20160917.2242"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-pydoc"; - rev = "8eebf6535b4669b5d9e50bbe4f319cd54a2878c7"; - sha256 = "0admgfy0p13nilb4fi3dq8pm48w1fib8h8avi7h9ybi9k5h6x4ii"; + rev = "85480a29b56dacde425655bc8f5a597c785afdf5"; + sha256 = "1wrs2d84xzjnsmw255bmnd1wcpwd36m0vyni48aa7661d4dh10x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc"; sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7"; name = "helm-pydoc"; }; - packageRequires = [ cl-lib helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-pydoc"; license = lib.licenses.free; @@ -30066,22 +30305,22 @@ license = lib.licenses.free; }; }) {}; - helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-themes"; - version = "20151008.2321"; + version = "20160917.2245"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-themes"; - rev = "a6449a40c5a219b43a92c975917a07337f864b4f"; - sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w"; + rev = "1160af42590b0d845a55e65e1e782d9e4027fd6e"; + sha256 = "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes"; sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j"; name = "helm-themes"; }; - packageRequires = [ helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-themes"; license = lib.licenses.free; @@ -30236,10 +30475,10 @@ }) {}; help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-fns-plus"; - version = "20151215.637"; + version = "20160917.1126"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w"; + sha256 = "12hjki054sm7gaky7q3b3sp8y4lxpnaq1vphjg85pfvad72rz71p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; @@ -30979,8 +31218,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "4ef059b127d54cb9dcb3b6ecfbc7f8bc1681a0af"; - sha256 = "0vcyxzd9wr15mqqfcnshm3xlc4pqv7r3slzfrbrac0a9n6xns0g5"; + rev = "2580027fe01f3c76a01e2695411f0b0b4b60e1c4"; + sha256 = "0f0n36rwvw72shiyb8zfzfyjil64k55brh9r33x7r2kksmrbfxys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -31021,8 +31260,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; - rev = "432de36799fffc920e5bff7a4691f3c67236e59c"; - sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp"; + rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f"; + sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; @@ -31552,12 +31791,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20160806.1753"; + version = "20160911.1900"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "62d77713ecb99871f2b05c111474445c15781164"; - sha256 = "07n1xh6q2v25jarjlkgjzn40niz958jw0r69d5c2mf66fr7n0b8g"; + rev = "addf09885e019a7c279ecd3693c35eda1c642e25"; + sha256 = "1kjlppsrddgvljd3qqfa198h1dlpkvqh97b7g0z2cqfjlsn6sxk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -31864,12 +32103,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20160828.154"; + version = "20160913.216"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "3527b321ce02b796e22a4adb2b4c3f17899ca935"; - sha256 = "04r8bpznqfv5xlg9y9f1b690943117hhpxxfif398j8yyx0d8jpi"; + rev = "dd5f703d5257e5fbedf3e2a400a68f2e7663077c"; + sha256 = "1h4lyr0mflvmv53x1w9i2dln090q2a4nfdj5p7vzpvran8hxrrwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -33109,12 +33348,12 @@ indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20160606.2318"; + version = "20160913.1754"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c"; - sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f"; + rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7"; + sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -33345,8 +33584,8 @@ sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local"; - sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; name = "inherit-local"; }; packageRequires = [ emacs ]; @@ -33564,6 +33803,27 @@ license = lib.licenses.free; }; }) {}; + intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "intellij-theme"; + version = "20160915.1707"; + src = fetchFromGitLab { + owner = "fommil"; + repo = "emacs-intellij-theme"; + rev = "8e86c414aebb37543656f672e6afab0d54aa40ba"; + sha256 = "1iqzcjyawj02ayzff3h19abc7fxwi074yjd17yj4rzfqcy67kbd1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; + sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g"; + name = "intellij-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/intellij-theme"; + license = lib.licenses.free; + }; + }) {}; interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interaction-log"; @@ -33609,12 +33869,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20160905.137"; + version = "20160907.748"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "a82fdea78717047cec33c3b3c2b5fc5739e21022"; - sha256 = "18p7dmiymmw63dcn2v1wfy3i0prg6ldvbjdk98irvjg4mrfif1nb"; + rev = "fcac7d023c123f8b510b64bd68d2201cb1162493"; + sha256 = "0rxmrg2dvcrp9kddpa7687yqqqb37q52wg7i0m274snjf8dxik12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -33858,12 +34118,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160825.1209"; + version = "20160912.904"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "03cf7216c93dcd907ce9e13e52b6de545a5593bc"; - sha256 = "17a6mpyk2pj479jjzxc68v2c62d07609ys959kb33c719w9djpb9"; + rev = "51e11dbb4219f9bdf185c4a37d3fc9855ecf6baf"; + sha256 = "1k1smdzm4mbm3i6iqwzwcgdylzn05pp503r09d0s83d0jbhz682h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -34146,12 +34406,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20160905.940"; + version = "20160913.535"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "f180451217277e63b067aa3d06d5af69140e320d"; + sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -34167,12 +34427,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20160823.900"; + version = "20160917.342"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; - sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; + rev = "e3351d11469df31104ac27faffbb93ff97a6740b"; + sha256 = "17d5yrdsv2ax2mbs6s0p3bsy25c46r2s953b5i2jdcznh4s2fvzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -34188,12 +34448,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20160905.353"; + version = "20160914.536"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "568e639a31828e4e7155c96d3b9e0f10fba4c2cd"; - sha256 = "0y1w84v4pfj4fazz0k43l6v6as5jpd1ccpnb4z2dih0460rgbddz"; + rev = "7382e07a887d4aa3485e52ced8238de828f549c4"; + sha256 = "1v4n1rkkhrf48l28ps22lxa4b03bndp7rdzb0l1gh0wz8iqv2hxv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -34213,8 +34473,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -34234,8 +34494,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "f180451217277e63b067aa3d06d5af69140e320d"; + sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -34290,6 +34550,27 @@ license = lib.licenses.free; }; }) {}; + ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-xcdoc"; + version = "20160917.355"; + src = fetchFromGitHub { + owner = "hex2010"; + repo = "emacs-ivy-xcdoc"; + rev = "5ea22af36c4c2737fb0bec53432c233482d8b314"; + sha256 = "1m5ljx395yw70fx643pnf7pk709s9v5b77zvvv3j21d0cjnppqz5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fd855c098ca65293d84c3b526b0c39f7b07ade/recipes/ivy-xcdoc"; + sha256 = "1my45325ys2m2l5y8pmi5jnbplqm16b1n7zll37163vv16zwnd53"; + name = "ivy-xcdoc"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-xcdoc"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -34414,22 +34695,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20160808.129"; + version = "20160916.1606"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "e5204d18a9a9563af2ba5d5f985d6161a906d7d9"; - sha256 = "0l0q4c98jil0scr4spc3z3rgy4xy4w85zrsas1z8w142arvpiw70"; + rev = "8b654ed00d4854c82c97a3c331709bb34f83c97e"; + sha256 = "1fdr0hnq4fjmc74flsypf0jwmcwb0i6mk9v06qv11p4jma1aaqdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; @@ -35104,22 +35385,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }: + js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20160622.2316"; + version = "20160907.1705"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "83978912073d554f3dc1185a8a46222317a90539"; - sha256 = "0h0dfq2rrnlvdbm39l2wqmhzrps6z6ha65j26bnblwa03jr608l9"; + rev = "2f293bde7ad99fa1f3c8eccf2c4d4782b90c515e"; + sha256 = "1maxypb349k5aw8q72k46zr4j3wmw2c81lghpb5j2jq70ndnpj4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = [ nvm ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -35212,12 +35493,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20160525.113"; + version = "20160915.544"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "987ed3be5f78d412fb73906cc0d077ddfc15f02d"; - sha256 = "0yzlcnana3ildshzmv60vfgfjkmxki42r7waxsmphjz2hcknbmfg"; + rev = "87dd27a3f4a673c1bebe82eac67c66b17a321a70"; + sha256 = "15vgvhfpkg6a1cm790fjzjxh7zw34rjpv9hzvycm0f4d1i23mzn1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -36238,8 +36519,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "20eeefed81847f52b8d003fdfaa20cc6a927b311"; - sha256 = "0b6dgpl592fgz54j5hnhv6hylqjj0773j9zn7mk275m5c10is3cp"; + rev = "3a6b569a48eef9d7295690496d4b0dd013599b2c"; + sha256 = "17l5807hl1wsdlg6nhb334kcy07v51w615b97qjqb01c3nv36d98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37091,12 +37372,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20160827.205"; + version = "20160913.1431"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "a41db665be150c8d4435dad6b4d15824034f296b"; - sha256 = "05avd08kvi74ivi0dwdygwi984ga1vxb1xc3cqpx4ircknilbc9a"; + rev = "e33f4dcfc5c38ddd66c583f725d68eb3c88fa443"; + sha256 = "0myx4slbj3i4ik8c7n4sya6r14yns2zqwy1yv4p5kj30zkmds0va"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -37155,8 +37436,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "c097741baa2a6757c94d01857139e8401b018294"; - sha256 = "1kamlps1bzsvz4kc7c0fzv1930zg92w2zgj20ghwmlsk9bl14zpx"; + rev = "ecca274eabf1a6ee60145382aeab9522ba3bce25"; + sha256 = "0wlnb8g52qp34a089wa7923x2fvgrzbdm3spdrwlw8g7396gfw5l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -37468,12 +37749,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20160906.743"; + version = "20160915.435"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "2360ae987f8c7a10bfbd716592982777bf6745b3"; - sha256 = "0skzfh26qwjbaxmspdmzma5bgqbibxqj8i24b8kmljdmij8z0gzn"; + rev = "9c5d64324fdc0f15687b7db68bc4246e47d03e69"; + sha256 = "0wgfjav689cr5lxzm7dnbnr9gvqqns7n6w7xi6wwr2lsmi1r68r5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -37868,8 +38149,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "9313182d938463d6fa1ba7ee75d002af37a0bd01"; - sha256 = "1m8ah6r8c1wscnrv3vbk9f02bls509zz5fmwrkgjrsylp3963vx9"; + rev = "305b3f3b5aa3e18be856fd5bd9c289145310188c"; + sha256 = "0dvncv0l4azqi40yf827mp27vi533pnn5mrhzs8q7zajndgsphww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38487,12 +38768,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20160902.1451"; + version = "20160918.722"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "7da77eeb5b75278f6ef99d4fcfc0f38882759355"; + sha256 = "0c5zm4iyxgvbn1qg6a19yjgavxsbrbmakxjn871p4qvzp03zn8br"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -38666,8 +38947,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "7da77eeb5b75278f6ef99d4fcfc0f38882759355"; + sha256 = "0c5zm4iyxgvbn1qg6a19yjgavxsbrbmakxjn871p4qvzp03zn8br"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -38764,6 +39045,27 @@ license = lib.licenses.free; }; }) {}; + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, with-editor }: + melpaBuild { + pname = "magithub"; + version = "20160918.117"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "magithub"; + rev = "d73b18b64fb89a86f11422e30082cadedabb76a4"; + sha256 = "0zg9g1h0m03l5x3102ha27m7rabpn0fjjy8r39zpp2pph0d139cr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; + sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + name = "magithub"; + }; + packageRequires = [ emacs git-commit magit with-editor ]; + meta = { + homepage = "https://melpa.org/#/magithub"; + license = lib.licenses.free; + }; + }) {}; magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; @@ -39439,12 +39741,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "20160516.844"; + version = "20160908.1538"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "f9e2c7f86f94cb9a23be6bb618cb31304a491841"; - sha256 = "0nh016z84hx86rd09xvwajm44259viwgl1dx33d6z9dcjpp7f1mm"; + rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; + sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -39767,6 +40069,27 @@ license = lib.licenses.free; }; }) {}; + meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "meghanada"; + version = "20160916.2239"; + src = fetchFromGitHub { + owner = "mopemope"; + repo = "meghanada-emacs"; + rev = "3c7ffe201735d4b6dbc1e449248194eaa40e6c07"; + sha256 = "15yc312lixa2kv8fij6yp52dqgwi4pdf6w4b776flbqd14y23amd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; + sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; + name = "meghanada"; + }; + packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + meta = { + homepage = "https://melpa.org/#/meghanada"; + license = lib.licenses.free; + }; + }) {}; mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; @@ -40492,6 +40815,27 @@ license = lib.licenses.free; }; }) {}; + mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mips-mode"; + version = "20160913.1514"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-mips-mode"; + rev = "8d9298d09d63223fb5dbd567f2dfc7af7499e025"; + sha256 = "1mkav9n5zspbplfsbqkyfgh9ha71bgfaxclabi3b3y75cc651zwd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; + sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; + name = "mips-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mips-mode"; + license = lib.licenses.free; + }; + }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; version = "20160719.1606"; @@ -40719,12 +41063,12 @@ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "mocha-snippets"; - version = "20160211.832"; + version = "20160912.514"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "ac1f196bc0214cf7ec99bf34aafcbe13d53dffc4"; - sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx"; + rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71"; + sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -40902,12 +41246,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160814.2212"; + version = "20160907.727"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "c27112439d1567421922bd582ea525f4597ccc5c"; - sha256 = "16f4dphpnwpq5kw8k5pchq3l909b4qcgzqnycqfjgdr7ssjp5n4i"; + rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23"; + sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -40962,6 +41306,27 @@ license = lib.licenses.free; }; }) {}; + monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monitor"; + version = "20160914.923"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "monitor"; + rev = "a7141cd2043625d3b2e1421f501ffecddd956c3d"; + sha256 = "1lv1cn8lcnbv9468kc19cicfr7kimp1ww1shx3hd4yn3zpiqhqah"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor"; + sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643"; + name = "monitor"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/monitor"; + license = lib.licenses.free; + }; + }) {}; monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monky"; @@ -41299,8 +41664,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "73a8154b79b0b8db6cf8e11d6f1e750709c17518"; - sha256 = "1vn4i0cj60izng4zvpjgbdrlv3v6wilpkzxvb9mz5a8adf3myv5h"; + rev = "d44d0644bf6d73d1d32e55115e2463526a1427c0"; + sha256 = "0zzmrqrx69hw1ycsirw7w16nrzka805dmnpfrqrn1m2nky7ykj4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -41484,12 +41849,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20160814.145"; + version = "20160909.918"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "12d3c458e8a45440776f6560c5f22a090ff24769"; - sha256 = "0iy3lslr3w4npfqasgn3bv5akdc7h7csx7amcybb21dzwi38bi23"; + rev = "9e21a31f3a3dba0c6a7c496d8503299b625f0575"; + sha256 = "1jppxzi9pya7ap92j8d6j8v6zmnwlx3jnj1araivs02hgml34695"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -41505,12 +41870,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20160604.243"; + version = "20160911.41"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "04872b79273ec81670e0ea19ed2c90ba74467c57"; - sha256 = "00ylq8ay7j21winii1g3c3hcaihcnq209mngs7g1cgykh1fpbblg"; + rev = "b695dcf4688e288488a6dd1583de3782df0a4549"; + sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -41586,12 +41951,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20160831.1826"; + version = "20160908.1139"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "e698e94ff34ab432bed9a11626c3a0277bd45fe7"; - sha256 = "1rq4bpa9bfyc9r3hwa6ik3yk74aizz2k1crwmafqy2wqlr6zx04q"; + rev = "7c03bfb2fc1c682ad78689325eac9cf302970ea0"; + sha256 = "1lb3kal8747z61l55dfpfzcn8m5114vrwgm8ar126rqp7hxa97xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -42185,12 +42550,12 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20160403.1113"; + version = "20160916.728"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "49225f379efedf228636985a92ca6fb84cfdea5a"; - sha256 = "1g8852c68ca4b4wf781aiyhbgk2a3g39jw1mijzpp0lmmnsbmmwc"; + rev = "e5e2f0a23c56cba750f93e74442104222f7f30c5"; + sha256 = "06xvh0r4589kxb6pr8a4xxr4msxl4jfp3dh3f9xxvp1icwlf4j9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -42622,12 +42987,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20160906.739"; + version = "20160918.751"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "f2cec77d0c6ea843e37c584470b2c65561a457a7"; - sha256 = "09ll5l0vd4iybmgp43jdf55crgn0rcdcqs42v6yfknf9n6wf8w4f"; + rev = "d3ef20cb25f1e0f48318e50cd36b72f161a31725"; + sha256 = "1rs7x2vj6k8kp3anbfabxvy2a1jvmpcvr2qhpjzyirzzkii79f1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -42664,12 +43029,12 @@ netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: melpaBuild { pname = "netrunner"; - version = "20160622.642"; + version = "20160910.1632"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "netrunner"; - rev = "202ddb1005ca54da3884f38627c6d1e5ba85d56d"; - sha256 = "0xj52211ca7fgr6zkwaf3rgn6zl8c3w2j3lfc4fkm2wlkhb9xcks"; + rev = "c64672992175c8c1073c0f56c2e471839db71a0f"; + sha256 = "1jj8qsq4xa93h3srskhw1l6igzf9jhwl8hfa73zvqr8dhqhp149k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a8b1d8c31383b6ec3788ad6c9adf0117190484c9/recipes/netrunner"; @@ -42745,6 +43110,27 @@ license = lib.licenses.free; }; }) {}; + ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: + melpaBuild { + pname = "ng2-mode"; + version = "20160910.820"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ng2-mode"; + rev = "7ae7b79e6f42dde659334d7b153e69010ae365cf"; + sha256 = "1l0g7psl6w2rskdq418am8xdrlahr3dkv2byjj12bbw9fafr3484"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; + sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r"; + name = "ng2-mode"; + }; + packageRequires = [ typescript-mode ]; + meta = { + homepage = "https://melpa.org/#/ng2-mode"; + license = lib.licenses.free; + }; + }) {}; nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; @@ -42829,22 +43215,22 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20160827.1217"; + version = "20160913.1422"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "208f42612b66b2d2cfc25381035f94b75c6364f2"; - sha256 = "0rcvfkknvy6pwvgl9h66lky5kw4kcjanpj7lisva9s5a4iq8z0jb"; + rev = "04507a391fcce5689890a1d9801f13ccf965e33b"; + sha256 = "13v2da45vn4p8xb081m920kk4hslhybxvr68qjjylkn1an92s2qx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; name = "nim-mode"; }; - packageRequires = [ commenter company emacs epc flycheck let-alist ]; + packageRequires = [ commenter emacs epc flycheck let-alist ]; meta = { homepage = "https://melpa.org/#/nim-mode"; license = lib.licenses.free; @@ -42882,8 +43268,8 @@ sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer"; - sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; name = "nix-buffer"; }; packageRequires = [ emacs f ]; @@ -42899,8 +43285,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "312bab008d835dd9c8939b803d2bc7af4f82a811"; - sha256 = "1vj7dwrv0x4zjaxpn5baiy1dhzdhabdcj28yp2dykdvymmp3zx8x"; + rev = "0d38b4c7926890decbe2b03ed8f84584a5ce9b8a"; + sha256 = "16fkh4bxdmhrxcb1srz8bf9snv4kjd97q48swrzzsyy042v7f9hm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -42916,12 +43302,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20160223.553"; + version = "20160914.1324"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -42941,8 +43327,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -43165,11 +43551,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20160904.423"; + version = "20160918.657"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "fce8146a8b738f2317034fee6236cdbd3597849b"; - sha256 = "04iscnc83c1yhzwid83m71bgawnqkzwvikffgqd6kiwj140ahx2r"; + rev = "a448879e49fb838a302b4e68d73e63c6b75d9175"; + sha256 = "0apq1fani13ddv3lmq1d9nd0x8hxyfj9ii3xg37b1lyahhh6s67z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -43515,6 +43901,27 @@ license = lib.licenses.free; }; }) {}; + ob-applescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-applescript"; + version = "20160914.1327"; + src = fetchFromGitHub { + owner = "stig"; + repo = "ob-applescript.el"; + rev = "bc708af6cf45707d4e8d8f00ea59a7e413bfaca7"; + sha256 = "08q0kglajvgpjvzij89z9xiz65r15ddxz16bjk2b59p0vzzy51ij"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23b075774be913539c3f057dcb7f24fbc05c37a4/recipes/ob-applescript"; + sha256 = "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc"; + name = "ob-applescript"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-applescript"; + license = lib.licenses.free; + }; + }) {}; ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; @@ -43706,12 +44113,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20160703.639"; + version = "20160917.1053"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "12e764aa231d029368056796452f644a3adba856"; - sha256 = "0k1jmacvfl2kxbc9xan93nivvnc3j3k17qp7xjmhrlrx1gdx63lr"; + rev = "6b7644a06af90fd51f7396e980a0ed505238a1a5"; + sha256 = "0szcdp49y2j0m63wmc1lz7yj84r3fgh6n886ysgh8acyd6z7hvzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -43916,12 +44323,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160903.25"; + version = "20160913.1700"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "56bb9a20ffa257db484616eeb62380deadaa5856"; - sha256 = "0mnkinwnjmzz9245ja0zf51cxxq3agk7j25aqvsdxj6p9bxpavfc"; + rev = "02955d24bd204d330891ec57921edd56f854f721"; + sha256 = "02bz2jgpvrhqwp6jrdb8msr272mz0g2q6857m06yg7vcxpj4xlkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -44315,12 +44722,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160905.220"; + version = "20160912.1758"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "696c19550f50e1960327e007750c4b80bd3f14bf"; - sha256 = "12d6icnhmvpvpnfyai1ni5d5g3dqg1d7775rm5vd12hf9nafidj1"; + rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; + sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -44513,12 +44920,12 @@ omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omtose-phellack-theme"; - version = "20160820.812"; + version = "20160909.505"; src = fetchFromGitHub { owner = "franksn"; repo = "omtose-phellack-theme"; - rev = "2c2da8950d7429e710dc785c92d38fe9ba254a4b"; - sha256 = "0zzj1kjzqdjjvgm5yq44fyh4gb8gqkx9wjzxd0yzz3ihklgz3d09"; + rev = "e28c8a72cd6893cdd565f3f790145d2749600a89"; + sha256 = "18r6x1pgn4wyyfcnyl4y40gprcpl579k6b5n9l0fy7b2r10x1fj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; @@ -44636,12 +45043,12 @@ open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "open-junk-file"; - version = "20160514.1525"; + version = "20160912.1859"; src = fetchFromGitHub { owner = "rubikitch"; repo = "open-junk-file"; - rev = "249e0b39208224f540c982fc13d35dc7f4628891"; - sha256 = "0r5rsghqgy99jwjf3dqkw1q10smsvs242aafmz142l4ipsqr3gi3"; + rev = "31b6a88001d66cda95eabb444df188a61bde6346"; + sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file"; @@ -44883,6 +45290,27 @@ license = lib.licenses.free; }; }) {}; + org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-board"; + version = "20160917.1011"; + src = fetchFromGitHub { + owner = "scallywag"; + repo = "org-board"; + rev = "77fe2a8e2c163c15c7faf282615d6d1a407edfd7"; + sha256 = "1w4n1mmplim5wqj908k85xhnwlb5dnbs3jgy9hmcrjk5qjzykxgl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; + sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4"; + name = "org-board"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-board"; + license = lib.licenses.free; + }; + }) {}; org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; @@ -45180,12 +45608,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20160814.237"; + version = "20160907.1021"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "ec2dc69b7a49054bc0d34c6533cdcadba708db67"; - sha256 = "1fdzn8qfhalk15g5cfyywi99wmmgx6ck6b24zsgsr38jphcih0k1"; + rev = "115433394221da8071dedf7e3f056e37f097a272"; + sha256 = "1y2654ihc0py9nhl8178bmqvaqwx2wydyfqydd6vsis31hahxmnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -45261,6 +45689,27 @@ license = lib.licenses.free; }; }) {}; + org-easy-img-insert = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-easy-img-insert"; + version = "20160915.1308"; + src = fetchFromGitHub { + owner = "tashrifsanil"; + repo = "org-easy-img-insert"; + rev = "9f8aaa7f68ff1f0d8d7b1e9b618abb15002f971e"; + sha256 = "1p0hzfzlcdmd8d01a4xqg27n7qcnv7a03n8wiicv0dnicx179952"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/512db70609fc451972405acb4b186a9b3c6944fa/recipes/org-easy-img-insert"; + sha256 = "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54"; + name = "org-easy-img-insert"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-easy-img-insert"; + license = lib.licenses.free; + }; + }) {}; org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "org-ehtml"; @@ -45303,6 +45752,27 @@ license = lib.licenses.free; }; }) {}; + org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: + melpaBuild { + pname = "org-evil"; + version = "20160915.934"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "org-evil"; + rev = "a8d7dbe5553f8fda196154ff497d6b5c25fc21d1"; + sha256 = "1jmydmkw6ccdr66s8rd4nnassb3dypaj6y10qy6v2f97gl0l8s9k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; + sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn"; + name = "org-evil"; + }; + packageRequires = [ dash evil monitor org ]; + meta = { + homepage = "https://melpa.org/#/org-evil"; + license = lib.licenses.free; + }; + }) {}; org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-fstree"; @@ -45539,8 +46009,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; - sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; + rev = "a1f51c8655e5e41f3be8eda58654ed6f8bcce799"; + sha256 = "0d0qrchq2hng4yyhp1ralkmf203nif40jddxc0k2s8rnvbs6ayii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -45559,8 +46029,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; - sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; + rev = "a1f51c8655e5e41f3be8eda58654ed6f8bcce799"; + sha256 = "0d0qrchq2hng4yyhp1ralkmf203nif40jddxc0k2s8rnvbs6ayii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -45794,12 +46264,12 @@ org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-preview-html"; - version = "20160906.2327"; + version = "20160913.526"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org-preview-html"; - rev = "0a6bf43046b2bff794f9d414b7171132dd23cecc"; - sha256 = "0xwwkgj4i28dr2wxq5fw7badpn9vk40hnfa83f3ay7c8z2rcz8ci"; + rev = "2b6afbaf1fcf781bcd53074ee62895f15f5282e5"; + sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html"; @@ -45926,12 +46396,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20160907.551"; + version = "20160912.941"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "873337642b9b312803ae743d0d636947e74470b1"; - sha256 = "07s5n35qinihzg4lq2aazdidx48zmzi36vrd3iri50r149ks1gfm"; + rev = "7751354df310fb4047286c54049297aa79202b5d"; + sha256 = "0g9f6pcajiipvw9ija8869hln7ssq75l1ahcx88gh8cfpwhirvvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -45982,8 +46452,8 @@ src = fetchFromGitHub { owner = "brabalan"; repo = "org-review"; - rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5"; - sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb"; + rev = "058e75b7f28d2ad2390290fe17a63d98ef5ab763"; + sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review"; @@ -46678,12 +47148,12 @@ osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-lib"; - version = "20160830.1149"; + version = "20160912.956"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "osx-lib"; - rev = "448dd983427a6130ff5606d3eff4198efedd54da"; - sha256 = "0g7iybibja08babmvdkdhdya97lxxyhywwy5ngis2zh7jkazsy3h"; + rev = "36425bd15073118b6271a0c94c5e3846f6c371da"; + sha256 = "0iyg6aqvcx65kp1p8mc64zg1v50bsakyxmkpd9fhsp9x3gpwx52q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib"; @@ -46703,8 +47173,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "osx-location"; - rev = "110aee945b53ea550e4debe69bf3c077d940ec8c"; - sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x"; + rev = "84e9269f6c66e52e8bbe8a0cd55932e7b3e7977e"; + sha256 = "0yixzqx2b5pnc4qs2qas0jm7sxls511x9ahasqizsawcnqd43apg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location"; @@ -47018,8 +47488,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "652b43a77aab502498656117aa278f8f09a517db"; - sha256 = "11xgz0fl8biimkffmbfccinb0gr3zb5a57lrb7br1j22ncdacmyh"; + rev = "bf128a3b60d36cb68e18519bde5d8f58ffe8c22b"; + sha256 = "1lysc7qd9czr720cgii8698slbgqz5g5ai4a71f757zra0jashag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -47375,8 +47845,8 @@ src = fetchFromGitHub { owner = "dakrone"; repo = "ox-tufte"; - rev = "fe7e7cec0559acdaeb89d6dc99e50ad698723207"; - sha256 = "0fm0qmqcq6alk2sw3vlybqjlkwxp14zaqgi5r2lnmq4z0lsxa5sv"; + rev = "12277da990095faa423f0ec0cde258d90784a7cf"; + sha256 = "1xgvg2qr2v0fq0r6ixrwryw6gzpwcvq0mw419jpwaxl4gwzckyir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte"; @@ -47392,12 +47862,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160820.604"; + version = "20160915.207"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "ca98e2c312c6be1165b956f655a4becc89776634"; - sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3"; + rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; + sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -47648,8 +48118,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "67b5928a7f14568baf2716b5741e13659a86b9ea"; - sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12"; + rev = "9229260e88fe84b53d384677fe5eda4a6652f015"; + sha256 = "11gg3bc41cn1fa04b6gf6r6bf5di1ffwbagmh2bb0n0i42idlcw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; @@ -47895,8 +48365,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "paredit-everywhere"; - rev = "79ecbfc15d2cb338f277f3da50d8e757f07151e9"; - sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv"; + rev = "94c92095c2096713fb3e2f7662ddd994f4b694c6"; + sha256 = "120m6vs6bb9cav88wpv97kd7s8vvmg6pry6pmf7jk6i7l1wj0iaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere"; @@ -48812,12 +49282,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20160830.228"; + version = "20160917.1147"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; - sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; + rev = "dfa6c66a038d84d9b7f17e0bc1471f3efea7acb6"; + sha256 = "1nplmw0n8ap1sbshb7p1mrdw835f7a4ih1zxjg13wx0dls65zpa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -49232,12 +49702,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160831.819"; + version = "20160910.1801"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "182c0b583216ec02e259dc5bdb16c72fb92814b8"; - sha256 = "1zni6yb83bj09pw9p9p6i4jwq2l0k62bnc114jd8cbsmr55axla3"; + rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36"; + sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -49635,8 +50105,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "pkg-info.el"; - rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5"; - sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2"; + rev = "76ba7415480687d05a4353b27fea2ae02b8d9d61"; + sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info"; @@ -49943,8 +50413,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "9c38baf93e46a2223b524f91ff744cff2a0e1157"; - sha256 = "1gghn58k2i887sib2m1agj3d94dm3ac3gr2gxxqyx08cqdm1sxpy"; + rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4"; + sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -50974,12 +51444,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20160830.138"; + version = "20160917.2336"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "3e56c2f3c6ca4e28997320480a4115e4edf1a63c"; - sha256 = "0hxv2p8bwxz86mzq7dw8jdxai71ny5g0ig7171p51bvxx34xm7f8"; + rev = "076edbc8150ce0bb1c6cbfe8d4fd1b3afd2cab9f"; + sha256 = "1fa0xkjqc527an3f3wnradwas5fa5q6563z3rhgppscsnzp9lx1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -51118,6 +51588,27 @@ license = lib.licenses.free; }; }) {}; + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-variable"; + version = "20160910.1005"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "projectile-variable"; + rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; + sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; + sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; + name = "projectile-variable"; + }; + packageRequires = [ cl-lib emacs projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-variable"; + license = lib.licenses.free; + }; + }) {}; projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; @@ -51202,6 +51693,27 @@ license = lib.licenses.free; }; }) {}; + prompts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prompts"; + version = "20160916.341"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "prompts.el"; + rev = "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26"; + sha256 = "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2395402e72d9b0f7ce2ca5fcb4497919f90a8fe2/recipes/prompts"; + sha256 = "1fz5sbc45jiq64y89lm8nj6lsanq3lzyjzahxzrgqvr7655pphzm"; + name = "prompts"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/prompts"; + license = lib.licenses.free; + }; + }) {}; prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prop-menu"; @@ -51272,8 +51784,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "74638a253ea76baa0aed78491b92d157326295a6"; - sha256 = "18xz1ic5cz2vlypxwxz81z3m2cf36wl8dqw7fbbgq20z6c3zl76h"; + rev = "c44ca26fe89ed8a81d3ee475a2ccc1797141dbce"; + sha256 = "0r6k1ivy3b8gr3vijifq8f2wpg5klb48yhd0v06iir96gca34l8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -51289,12 +51801,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20160720.1502"; + version = "20160911.544"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "78df84316807f0efc0f39450172cc2e2f17c9acd"; - sha256 = "0z725mmwkb9b9py65vfs3pkn8pqd39ayc84v56y49gsqd0krdqhf"; + rev = "3f605b16e792b098eae127441046e690bc4818f6"; + sha256 = "02i8yf169b2g65cfvpnbc04vbaa9na9hv4ss1rl2ps3lwkijng84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -51415,12 +51927,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160723.2236"; + version = "20160915.252"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "4a25f6b0ba51b87d882d4062de1601c49b2a822d"; - sha256 = "13rkmi7ckchd42zjl6lm7wdf6402xwjxvi1839lkzlmlb49xf47b"; + rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; + sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -52006,8 +52518,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "537885ec90ba7d949a929ac560760d0f4199a936"; - sha256 = "0cpalx34w2jhrmyc04a3108in8xv0qfsia388ksid373l7zaqd5z"; + rev = "e83d50da12642cbd8e18472e04a828516142fa45"; + sha256 = "18zvwjahqjc5rbp9ajsisr0i2zrik7wcj35pr9ikcdrd5yql7vnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -52149,12 +52661,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20160901.1048"; + version = "20160911.1032"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "ef8df01d62097e38ec76940822440c9cc1e895b4"; - sha256 = "1yfcv70yv73cqmnwlvgqpda18xxkd7cdqn3jjp8bicillnpl04xz"; + rev = "a9cf4f5183228a6c6a31f676e3f5a47d7322a213"; + sha256 = "1yisakjmzd75mbdq2wrwdq06dkvyfzxkqg02llwv9wg8s2pbbn30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -52317,12 +52829,12 @@ quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "20150801.1325"; + version = "20160913.638"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "cc363fc72b6824122aadf6b7d27dfeac38f61901"; - sha256 = "0y7mdizx6km3000cqjrirlgwzkq56asnzl8n1bl56pk5d9grfx9h"; + rev = "75c515a30a77aa4661e41d67e5bba13f422bdf60"; + sha256 = "1932vjindz0mkfizbs1d19af9p78kl9cd05isjbd5sjwzs420bd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; @@ -52447,8 +52959,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "cd9052132dbde7c8526309a0c21fc5a60c709a46"; - sha256 = "17l9kdfc2zc4d4alg4pfi7s6wlk51yxll6bdlcr4rbn67nj5lacj"; + rev = "487a74c7db513ceba86e849c8f42f834234c1f7b"; + sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -52884,12 +53396,12 @@ rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rc-mode"; - version = "20160906.1227"; + version = "20160913.1218"; src = fetchFromGitHub { owner = "mrhmouse"; repo = "rc-mode.el"; - rev = "70b1e93f40d2f24dfb5619605fedbb1dc05cbe60"; - sha256 = "0jpsp8zbcdf7yrfakv9dycw606yqcb497k9w5aj16a8r37xg089l"; + rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; + sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; @@ -53391,12 +53903,12 @@ rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rectangle-utils"; - version = "20160427.1024"; + version = "20160914.2108"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "rectangle-utils"; - rev = "5ee8a0955967181629393e1fd6589a6e2590a56e"; - sha256 = "0i336qakdkvxgyhjfq6b957xqlll156i1a8g1f5xap46v35d6gh3"; + rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; + sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; @@ -53493,12 +54005,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20160905.1415"; + version = "20160912.1847"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "80cce07e97ef1816c86c851b525461c6dd505849"; - sha256 = "1vk6hqjsc6dr9n1hf4wjhihimb9pyi0qyqfwrj8y5b1cv2rzvc01"; + rev = "bf3529c1f4b21bd1ae037fafa20af1096fcf4d78"; + sha256 = "0vsykyy93fx9n0063k94l0s78phhl5m0ikmggvw34s57iqks0z30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -53618,12 +54130,12 @@ regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-tool"; - version = "20131104.1434"; + version = "20160907.2129"; src = fetchFromGitHub { owner = "jwiegley"; repo = "regex-tool"; - rev = "62b292d93f29e4c4767b0800d53c656b9f626892"; - sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l"; + rev = "0de0716dc26b1182f7f986d8442345aad135019e"; + sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool"; @@ -54080,8 +54592,8 @@ src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "be789b13ff6358e13a2b7d57224072fb1b108f09"; - sha256 = "1a2myx5isiwr29yhplmv07bisc8rvrabzz9dn239jf4gvr8x89ry"; + rev = "0dc6d689cd7fa080fe7c19431863bf7186f910e9"; + sha256 = "082izk2wmsdspyizfbvqw34rigvbfwq2963zf4iqlniqv05p88pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -54511,16 +55023,16 @@ rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rotate"; - version = "20160214.2318"; + version = "20160909.136"; src = fetchFromGitHub { - owner = "daic-h"; + owner = "daichirata"; repo = "emacs-rotate"; - rev = "868122fa807db32762a68defcf69654a28a5a39f"; - sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m"; + rev = "091b5ac4fc310773253efb317e3dbe8e46959ba6"; + sha256 = "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/771195f360543eab5c49da546bab0c7235f92ab5/recipes/rotate"; - sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/rotate"; + sha256 = "11a0svvfq29cb4630jq0hz19xk9jfhfjnssm7vg0dnlzpxqi3vif"; name = "rotate"; }; packageRequires = []; @@ -54637,12 +55149,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20160904.1233"; + version = "20160915.901"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "046372ccbf5b6a4367a873d23a784810f2bbda1b"; - sha256 = "1b5sfbvgyr2pa74fm24wmmiwmrrqfwawrfva9y8cj0fcnvvb198r"; + rev = "92a7c74b73d8ab6a83a256f526f278583c52722f"; + sha256 = "0sdk4l3x0x2244q5iz1gwklf491qslgh49frkk2snzpnn1q3rnm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -54700,11 +55212,11 @@ ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20160607.157"; + version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56093"; - sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; + rev = "56184"; + sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional"; @@ -54783,8 +55295,8 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56093"; - sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; + rev = "56184"; + sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric"; @@ -54867,8 +55379,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "d73a498143a3a8d6d3a7720104f2f14e70b2e2ae"; - sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv"; + rev = "13288a29478a9e45ab4fd2188aea8d4894e08848"; + sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -55010,12 +55522,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160820.255"; + version = "20160909.935"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "5cfb9197af67e00ebd5bbcb05c28545c9014ea32"; - sha256 = "1pvb6imh89pnmxzdlivyidqqd7f1va29dvjhy5znw2qhw1myf4hn"; + rev = "1587839ba493b5ab98fb8415338172a9a22f224b"; + sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -55136,12 +55648,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20160907.418"; + version = "20160913.553"; src = fetchFromGitHub { owner = "stakemori"; repo = "sage-shell-mode"; - rev = "5dd85a064304af51c676b4a95b1f298e297756d5"; - sha256 = "114ja5gyhpv9xi1gxsxylxbbmnmjrqlwd4daww4a5xc2avi6flxq"; + rev = "00881a50b5c8a9994e318e107e7848c1c9f119df"; + sha256 = "0w1ba3rky07p7qsh2f59xfrhfip3k2db33pblyvs7z0fd0qwwsv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode"; @@ -55346,12 +55858,12 @@ sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20160816.1353"; + version = "20160914.818"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "cb9940f0e8b1346f4297ff6c2c90b406c92abab0"; - sha256 = "10bq04xm3b8awjnfq0mg52zm3rds1kr7q0jfrvhjkbd9rwd1y9bz"; + rev = "420044bc305bd4fe38d2f3af1f76b29172b06ff9"; + sha256 = "02h71mh0w8g9gz1pslgqmk40b5fb5q3g6jl5150cq608m4apyk75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -55371,8 +55883,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "31211c6b7f4767f5e7611c6ed7844dbbb3600ee1"; - sha256 = "0yafxig7wvlps8fsl26n46hyfiqhyzjhi1k2lgwmacf3v7lhjqhv"; + rev = "a5e4def690dc460efced2035d9d67b9a749ecace"; + sha256 = "1l1238qvs6mnckwcbz7qq6c5va2x71l8cnwf18cwz2gajfbxgb80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -56278,6 +56790,27 @@ license = lib.licenses.free; }; }) {}; + sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sexy-monochrome-theme"; + version = "20160915.353"; + src = fetchFromGitHub { + owner = "nuncostans"; + repo = "sexy-monochrome-theme"; + rev = "64570387a30ec5ac685cb11824ee24f8890572e1"; + sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; + sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + name = "sexy-monochrome-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sexy-monochrome-theme"; + license = lib.licenses.free; + }; + }) {}; shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; @@ -56344,12 +56877,12 @@ shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shakespeare-mode"; - version = "20160609.1028"; + version = "20160908.1511"; src = fetchFromGitHub { owner = "CodyReichert"; repo = "shakespeare-mode"; - rev = "ad5f4de2e0b51723deea2c68a2b5aa862bf38022"; - sha256 = "1daqh496m72l71x24czvzwf92rk310lzxp16l50qxlxif7rgpr78"; + rev = "0406a5ac4c98fcd171f0539c5cd88050aa351ea8"; + sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode"; @@ -57189,12 +57722,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20160318.603"; + version = "20160916.622"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "a0941475c5fd71a31280f3219424af4586288719"; - sha256 = "0k16sjbrhxbv3fj5rzjzvs03230nwlzmvw18dhdhzzblk08f28dp"; + rev = "c59bbbc96cea8fb2e9c4f4f7d471faccae2c67ed"; + sha256 = "0mf22mcvhpm5wcsylph2sd4x6bi8101jnqpib6ppjkwha5c2x8yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -58109,12 +58642,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20160828.1136"; + version = "20160918.126"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "6b4832412a896213f3e3d45ef75acaf2aeeab97a"; - sha256 = "06l9ngm37lzqf22ywg20na0bnfq2bcwab9rkfc5w8m51j5z6gn6x"; + rev = "de5d4f39ad1055b18c74ac516244b5ba4a6d45ce"; + sha256 = "1qgcv64jhxagcb3bdw4lpq0qpjd7bzfnwabqq9frbcxx4zbiw210"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -58444,12 +58977,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160902.1855"; + version = "20160913.2031"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "a28ff63f4c3a6492dea38c028e47bb6431ab4c84"; - sha256 = "1vb9b4wclmhqj4p9xqz3zhrh7id1s03k2041nx6pcwr7918dfpjs"; + rev = "2bceb7f266f71cd85f9b328de02797eb457da17c"; + sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -58651,6 +59184,27 @@ license = lib.licenses.free; }; }) {}; + sort-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sort-words"; + version = "20160909.358"; + src = fetchFromGitHub { + owner = "dotemacs"; + repo = "sort-words.el"; + rev = "8ca4cfca859f9cb4f2d51d5af9ad663261152101"; + sha256 = "1g3hlx33x52wsxw45p8dxphmkydqks2z4c2vs1vy7v7y0vwifszf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0a4bd566392d7cebe8a891d787439512e8d34cf9/recipes/sort-words"; + sha256 = "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka"; + name = "sort-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sort-words"; + license = lib.licenses.free; + }; + }) {}; sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; @@ -58871,12 +59425,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20160801.211"; + version = "20160914.711"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "34ee477b3dbc0d81dc44c82cc092f006899cba70"; - sha256 = "10kwjlngp0xsgzj7gpglmzyx0l2vmfl3f6q7gwwad4kymsbh4s8p"; + rev = "679bdaa22b4155d515c9cc1bc42f793cf53adcc8"; + sha256 = "0xdkk1ig70ys4hs68fg5wa4pqjr2nf07jc0ckdlfvs3r1fafs7a3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -58892,12 +59446,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20160820.1041"; + version = "20160909.445"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "6d96877d228af73a2c4c656c9bc33734feacc887"; - sha256 = "0aj0aazky2l8c59kn11qhj8xch40mqxjp6a9gfbyfbfcqnmrvlqg"; + rev = "e339866186a6687e9ae63db927ba3cc4bc75e88e"; + sha256 = "0hkygs57xybwx1shhjm2650aw36plskfvf8h24zah91xjnnsadn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -59116,6 +59670,27 @@ license = lib.licenses.free; }; }) {}; + sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sphinx-mode"; + version = "20160911.558"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "sphinx-mode"; + rev = "c6e0e29fb0b64c05488b0bcf9f0b78335da4a49d"; + sha256 = "05n8kifpkijsiywrnw6m4wckv68a4xk3wdblc2c1gj9wz6s72lyl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; + sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + name = "sphinx-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sphinx-mode"; + license = lib.licenses.free; + }; + }) {}; spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spice-mode"; @@ -59473,12 +60048,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160904.838"; + version = "20160911.1911"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f"; - sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2"; + rev = "da9273d9da8f84827b840776f398d24ea4c46b76"; + sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -59596,12 +60171,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160831.2219"; + version = "20160917.447"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "2257f951fef62080a97d5e3083889afd53b5648d"; - sha256 = "0c6pmvq7ck3hqcilb7cbb7gc7gi9wzjcb93qkgxy5mlv4m5w328m"; + rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d"; + sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -60318,12 +60893,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160905.2153"; + version = "20160908.2310"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "d7fce267b58614e2b56d2fd260151b7b4d0c7f1b"; - sha256 = "0j0pyvm6pfkk0mq4vm8ajxwclllmsyj6d8wd3sf2yfxy45qacl2n"; + rev = "beb584ca418dcd061641026662d9796f66a5a5a2"; + sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -60360,12 +60935,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20160903.806"; + version = "20160917.905"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "b0d7826ba295fc20f3346d6beb52c169d892a06f"; - sha256 = "0lkny47kjw4q0khndb9swmgiy5j22473djk32yjwy7b6qnfgwcwf"; + rev = "59bffb26368c9e8135548670c0923fdc5299d018"; + sha256 = "0137gbkfqa1kagff1dkg721w35j946ip1zcvhgd4g23y7ldzmbrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -60669,12 +61244,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20160124.236"; + version = "20160918.658"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "1563e8b248bc74613f381e7bd82a43df90064a68"; - sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0"; + rev = "0e24233686980c2a40172c4f2cab8c5f28fa1532"; + sha256 = "13j2a8bxz1d3pfvr0bbkajbgr7by91g7mgvb55z481zihyqsvykl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -60687,15 +61262,36 @@ license = lib.licenses.free; }; }) {}; + swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swift3-mode"; + version = "20160918.550"; + src = fetchFromGitHub { + owner = "taku0"; + repo = "swift3-mode"; + rev = "4e51265c6905e17d8910e35b0b37cf51e20ecdfe"; + sha256 = "0wqwjzr3z9gzsjiyyr0ds4c5zvgifb9hbjadb7vkbbpzdy6qd9s1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; + sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; + name = "swift3-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/swift3-mode"; + license = lib.licenses.free; + }; + }) {}; swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20160905.940"; + version = "20160915.914"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "f180451217277e63b067aa3d06d5af69140e320d"; + sha256 = "0k963y9iz423hm0sr9dzx3pa8s2lki2r2n4p8pws9b1zvrf6iz8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -61399,12 +61995,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20160608.215"; + version = "20160915.2124"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "3aad9b4f41985d8da90432885380d94c24dd772a"; - sha256 = "04baqjk3vg09x3p5v1mnn9yn4wzb4qa2ag9jc8baabrp19xbcl2v"; + rev = "85ee42a8e19b913865387d6662d41177fb0803ce"; + sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -61802,8 +62398,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; - sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; + rev = "a36a20c36265430c36235371957f07c8c89fee44"; + sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -61823,8 +62419,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; - sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; + rev = "a36a20c36265430c36235371957f07c8c89fee44"; + sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -62232,8 +62828,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "ddc53c32486cc23dfa63ed4e5abb19923b8d13e6"; - sha256 = "0gq2zwy1isrb4r1xv1j34ni6byyyy7x4mpvcfw6g2z9h36x7bcsb"; + rev = "205dc19556eac3c0ab2d1965c4636b78f8922fae"; + sha256 = "0hw7rhw0vi9qq07ih8h0v1w3grh5xj8igbp3h5x7k501zilmkx38"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -62289,12 +62885,12 @@ tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20160830.2120"; + version = "20160911.2207"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "170bce9067a6467f190418284377559a9f43c667"; - sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg"; + rev = "80e62305a91dff5f4ca7534f9f694dcd12ae4282"; + sha256 = "023vgr56j5z0zzi6vb5xpin4vf7k9miyckh5q4aj5ym2qsq7hs2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -62619,12 +63215,12 @@ todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; - version = "20150513.1929"; + version = "20160917.1048"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; - rev = "fc83f954aea75065aa9788ee07027c94e76a9364"; - sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal"; + rev = "e74a3acf45029e114154c6471339dcd3c787783f"; + sha256 = "0zx2kg3q5325j21x0vdn7rmd2xx1d4lk22pblh5ra52vr1wgxf5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f934da448463e672de3c87b2ee514a370f67107d/recipes/todotxt"; @@ -62808,12 +63404,12 @@ toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toml-mode"; - version = "20160718.2217"; + version = "20160910.1810"; src = fetchFromGitHub { owner = "dryman"; repo = "toml-mode.el"; - rev = "609d7101cc50b2ce350dad0d6adbd476d20fc811"; - sha256 = "068jcxadwpxk4rk4kix2y5g5dm7g3pd3d1v6dj5jimjkp9zvy1h9"; + rev = "0bbf0618fde844cd2e12765c8ca566df09066445"; + sha256 = "129yws71h5wy2y4z2ayl9kys22xa4hhxkybb7hhp2b3y8wq0717z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode"; @@ -64011,8 +64607,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "a88ba489b47429653c98d72ae8e0b2bcbed02faa"; - sha256 = "1gmwdja53x3mzpfxjjqs41vy7prfyz7a1iy3cf5fx3k1yw9vcfkb"; + rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; + sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -64918,12 +65514,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20160810.525"; + version = "20160916.1421"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; - sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; + rev = "c93d080df2e47702a7952420101cf2d1d3b38bfd"; + sha256 = "12rbhgx350x46lj7777rgjv8akfjs59x86bfm95dwsq4mva7q2cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -65580,12 +66176,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20160906.1507"; + version = "20160912.242"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "2b717828f1878a05759701c249fffff6642fe1e1"; - sha256 = "084g3cn0s7n78s3zg0ln0sh445281pmn8fbr101y8akvp33b9aaz"; + rev = "f7bb1a662893b5aacd3f358f927c05ee47d08a5e"; + sha256 = "1kpz8501w8axr0p0r5p2yl06n5kwjc7712g90fkdcxxcw39lsjm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -66104,12 +66700,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20160831.1655"; + version = "20160911.1302"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ad9b0e43bc07b44094686ed521a4e107aa8efd2e"; - sha256 = "097q45vn3f1bmr67qwy71sn4acxwhb20bs6lif7zxahbd7iaxcv3"; + rev = "c493e0b4bb53c524d99c6ad071ba0a22259f8f38"; + sha256 = "0gngmryqhkhsd6wjvg24fcxdmag3sp6mvp3r6swz1hg2j905lrf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -66164,6 +66760,27 @@ license = lib.licenses.free; }; }) {}; + white-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "white-theme"; + version = "20160917.1043"; + src = fetchFromGitHub { + owner = "anler"; + repo = "white-theme.el"; + rev = "e9e6d5b9d43da6eb15e86f5fbc8b1ba83abe8c78"; + sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/621e32e54be9e1ac7936bf6f4b9d74e2dd27df6e/recipes/white-theme"; + sha256 = "0nmxn35x6pngns1xqnsq8nm69f549c1gmvisd01in3qfvnpr0mic"; + name = "white-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/white-theme"; + license = lib.licenses.free; + }; + }) {}; whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whitespace-cleanup-mode"; @@ -66171,8 +66788,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "14eaf40e0e67539106d3636af440a167105be296"; - sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r"; + rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f"; + sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; @@ -66273,8 +66890,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "cbff3b029c7dc850676c288b5cd0d570a1906519"; - sha256 = "0vj02m8b29vwqv8k54h75s801sh6xz8vxsazqjmhx6a7cgm2l0k8"; + rev = "69b041f240dc1b6239f51159ee4bd97e596ee7d5"; + sha256 = "19b2h6camn6p5vjj5gqamlpc24ika5x61v11fqvpx11smkfki6y2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -66952,12 +67569,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "20150126.759"; + version = "20160913.1902"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "7e2f32dcfcd7986fcee07f1413c6d8eae7ceb8f4"; - sha256 = "1ld5s45f9xh20z9z9k1fhlllzl6jgflcqkzys4x09vvax3mmynr8"; + rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; + sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -67183,12 +67800,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20160906.1341"; + version = "20160911.2224"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "59a4980eabb96361626d275c813fff336b17ae65"; - sha256 = "0yriyizfyp9bd83d4069rdbps4f6hyi3hf6w47xxxsjmvn9s9c2i"; + rev = "54b00b7c5907d875f6c07f2fe73335231e9b286b"; + sha256 = "0bw4xdd5ajhf57zjbrca68sx12mdg8k31923bja1knfldms2sf48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -67267,12 +67884,12 @@ xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20160713.1858"; + version = "20160913.1512"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "b427b84923d349174464d7a15b0f86639f046248"; - sha256 = "1l43crr7balay139xvm3mxz22z516mcz84433vfdb8yczdya2sjq"; + rev = "d26e73bdefd6e0a53559c433b576aa663008308c"; + sha256 = "1gvdx1nvmxxvbbkr4hz4ar7k52cyyc77vcbm1yqw4r167i468knf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -67940,8 +68557,8 @@ src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "756ebae981208f4b9a8038c415107e1191be9b9d"; - sha256 = "0mfp3wpdk0hsrh93lg3gdym85g5g1f7wj08m7j5919dgx745n094"; + rev = "0931e0f4ee3ed060be87f529cac4950af534ffac"; + sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -68144,12 +68761,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20160905.1720"; + version = "20160918.708"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "83041d5da4ea4637dbd8b018a4762051175dba1d"; + sha256 = "1zqi0hs6z9j213p9dcqwzkm3s13098wzqrmvpn4lgapcivga3v01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -68320,12 +68937,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20160724.2141"; + version = "20160914.135"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "d80c7cb91cce840c533d2261de44222c82c002b8"; - sha256 = "1hm0xlbi98czj7s5hb1f9n0c0kqglz95s45jwrljxxx5nxpnl238"; + rev = "e20756e1b78de58d3f82ba4a9d7c0772cb37482d"; + sha256 = "0mm4qx9c6v9r708p6yq6spzznbjy43qpn5k2479plnxixp8dh664"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -68382,12 +68999,12 @@ zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20160830.659"; + version = "20160909.729"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "1dbe8f3b202a1d958c9568a15d72059844277490"; - sha256 = "09kz6yx3ysmdsgrjabq5n30n48r13pi6mp3b5arl9y760k62kds5"; + rev = "493c9510a776954f88a0ecc8e109400d71249640"; + sha256 = "0v3911ylxrggk11x5mdbvjclr27iibvp6dw1p2lxxz83qgfzyv05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -68734,12 +69351,12 @@ zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoutline"; - version = "20160906.743"; + version = "20160915.503"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "47231c6a82f0b718b0bec09f34e40ce68ca050de"; - sha256 = "0jd7izvpc4z3ivp5mdzbmz5vrlwnjxp2r16f3zs0cfbym998i25c"; + rev = "714c10a25112b3da62696585bea289c3f8e74158"; + sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index eaddf4ed61ec..6081c96006ad 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -98,9 +98,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index e310064cb496..ec183960ac16 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1648,12 +1648,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "209663c772105ae87d244cce9247695823914a00"; - sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2"; + rev = "7b399fd7eb4a19f32d93ec6dc0eb3a344d2687aa"; + sha256 = "021iqwn4lwpsx02m3ns8l3bn5dvssii5sk9vg32mh56fjpbi2dkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3565,12 +3565,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9"; - sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860"; + rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; + sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -3636,22 +3636,22 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "cljr-helm"; - version = "0.7"; + version = "0.11"; src = fetchFromGitHub { owner = "philjackson"; repo = "cljr-helm"; - rev = "916d070503d0f484f36626c7a42f156b737e3fab"; - sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha"; + rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; + sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; name = "cljr-helm"; }; - packageRequires = [ clj-refactor helm ]; + packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { homepage = "https://melpa.org/#/cljr-helm"; license = lib.licenses.free; @@ -3807,12 +3807,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "1.2"; + version = "1.5"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c"; - sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5"; + rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; + sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -4692,6 +4692,27 @@ license = lib.licenses.free; }; }) {}; + conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: + melpaBuild { + pname = "conda"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "necaris"; + repo = "conda.el"; + rev = "d5bfe6ef6c2adecd1791ed87e3efb55208c0c7c1"; + sha256 = "1pvhm8j49ixlp9jd1zfjzw0rnhjyy1jyipacagsqcyssq6p6khyw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; + sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; + name = "conda"; + }; + packageRequires = [ dash emacs f pythonic s ]; + meta = { + homepage = "https://melpa.org/#/conda"; + license = lib.licenses.free; + }; + }) {}; conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "conkeror-minor-mode"; @@ -5031,12 +5052,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "0.8.12"; + version = "0.9.0"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "b4fb58af022a60c1c8161475e9c3fa023a0f9816"; - sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx"; + rev = "6c0a0d6cf602666d63a06c3652ce522b3a5a7661"; + sha256 = "1pw96s0675rf35hwaxdzids9s8ynkb0g66yximiiz6ryh4ama0wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -5260,12 +5281,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.1.44"; + version = "0.1.48"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; - sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; + rev = "a9891537f5d49fae2deb631fea0752ab61d3852e"; + sha256 = "19gwhhspkyrnyf277g8kpk57f9l0fp16jaj8va0j1qh1n64fxazn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -6220,6 +6241,27 @@ license = lib.licenses.free; }; }) {}; + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "doom-themes"; + version = "1.0.8"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-doom-theme"; + rev = "45022da883e7ba84a1f832c266e9f2c9a01b393c"; + sha256 = "1mgd6pqqnq28714bvfn70nbfdypw7q57y9a3hgg9v4b60mhjhd7f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; + sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + name = "doom-themes"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/doom-themes"; + license = lib.licenses.free; + }; + }) {}; downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "downplay-mode"; @@ -7039,12 +7081,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "9fc8dd3be4a556d7abf6977c889887a38232929f"; - sha256 = "0w2j0bbqnba1wr12f0zk87zwnxf6xhchx224fwgwqd3kg0x5z0r3"; + rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; + sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -7501,12 +7543,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "1.2.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "940c17f757ddaf9c076503af2bb15d04f299692c"; - sha256 = "0h2xhys3cc9z61ax0ymg5fbsjg6192hwdvfhgmyq7vwibi402r1f"; + rev = "9cf096448b69c795b20aab89557e9add6029b13c"; + sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -8303,8 +8345,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "b237cf8118fd"; - sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8"; + rev = "dbb74dd91c5a"; + sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -8446,12 +8488,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.0.5"; + version = "19.0.7"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "71894a879d6254693791585246ce340dd7414b82"; - sha256 = "0s0s94jsqqpny5z2qdbb62h45cz8lh2if65q26jlcgbyz2729j77"; + rev = "33b39b559a31c38465dfc038218f432c9c60a9ad"; + sha256 = "1swcakbd3m8c7yzh8h1mdbxd1hyxpza1cb993ixqv4ydhz9bppn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -9830,12 +9872,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "1.81"; + version = "1.87"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "5cbc077083775d4719a294455a8a8a53bb3151f8"; - sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9"; + rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6"; + sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -11388,6 +11430,27 @@ license = lib.licenses.free; }; }) {}; + fsbot-data-browser = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fsbot-data-browser"; + version = "0.2"; + src = fetchFromGitHub { + owner = "benaiah"; + repo = "fsbot-data-browser"; + rev = "d8d441fafe1c9a8402269841a4b2285f6625ca82"; + sha256 = "0lljfn31lhp52n0dp6lpd0mx4jdrhpkivjjghk6yka1659vz0s32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; + sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; + name = "fsbot-data-browser"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/fsbot-data-browser"; + license = lib.licenses.free; + }; + }) {}; fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; @@ -12562,6 +12625,27 @@ license = lib.licenses.free; }; }) {}; + go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-add-tags"; + version = "0.2"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-go-add-tags"; + rev = "a6a879889729d579297935598d26b985f900ef29"; + sha256 = "1s4jwpwxlqxi9h5qqjcvxz3i8rgfrs874rpadp6lhizdhpjjp82y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; + sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; + name = "go-add-tags"; + }; + packageRequires = [ cl-lib emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-add-tags"; + license = lib.licenses.free; + }; + }) {}; go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; @@ -12775,12 +12859,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "0.11.10"; + version = "0.11.13"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "84d75daa644c0e73289fc428ff35acdc0943cbbb"; - sha256 = "0dzr1nb1s1sh8rv5wr9xfjd5xna54vp03y3h4q59vmnynsn64m9b"; + rev = "c859592c3fda01594b270e388414a79373b5587b"; + sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -12880,12 +12964,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "c0c7ce63df7edd78e713257b924c89d9a2dac119"; - sha256 = "1yj4iimwfv3d4m24ifmncc2z09dlmxjr1dhryh4afkpgj48x4lcv"; + rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1"; + sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13006,12 +13090,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "6bf34fb1a3117244629a7fb23daf610f50854bed"; - sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs"; + rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; + sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -13537,22 +13621,22 @@ license = lib.licenses.free; }; }) {}; - haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "13.20.1"; + version = "16.1"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9eef80d1a16ac3b41b62b8d79ecbafa62e00c6c9"; - sha256 = "1xckvi2s62hwrrrd6g446gszyqdk6bmd2hcrc6m0qfnyjkvg6jf0"; + rev = "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359"; + sha256 = "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp"; name = "haskell-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/haskell-mode"; license = lib.licenses.free; @@ -13767,6 +13851,27 @@ license = lib.licenses.free; }; }) {}; + helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: + melpaBuild { + pname = "helm-bibtex"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = "helm-bibtex"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; + sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z"; + name = "helm-bibtex"; + }; + packageRequires = [ biblio cl-lib dash f helm parsebib s ]; + meta = { + homepage = "https://melpa.org/#/helm-bibtex"; + license = lib.licenses.free; + }; + }) {}; helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-bm"; @@ -14337,12 +14442,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; - sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; + rev = "d2bff4100118483bc398c56d0ff095294209265b"; + sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -16203,6 +16308,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "1.1"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -16496,6 +16622,27 @@ license = lib.licenses.free; }; }) {}; + ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: + melpaBuild { + pname = "ivy-bibtex"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = "helm-bibtex"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; + sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2"; + name = "ivy-bibtex"; + }; + packageRequires = [ biblio cl-lib dash f parsebib s swiper ]; + meta = { + homepage = "https://melpa.org/#/ivy-bibtex"; + license = lib.licenses.free; + }; + }) {}; ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; @@ -16662,22 +16809,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.17"; + version = "0.20"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "11769bf8419202819a25047f57dd9aa0c98f5ebb"; - sha256 = "09zfvcirz7hcp255yhsf7d04vrc078kk69qhwy1j31ar0rb4fy1b"; + rev = "856846322ea8077ffe6215b54f2f3676db5ccf61"; + sha256 = "03ckvamv61hpk1lcw6z66wsyg471qy979vm3wf8brq9zwapfknia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; @@ -18692,6 +18839,27 @@ license = lib.licenses.free; }; }) {}; + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magithub"; + version = "0.1"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "magithub"; + rev = "c94ff69749dd14200956e0b59a3757618c594730"; + sha256 = "12z9gl5lrvdfvhvk213phhgddvvr3y3hpigpzzcq0jla65db367b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; + sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + name = "magithub"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magithub"; + license = lib.licenses.free; + }; + }) {}; make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "make-color"; @@ -19031,12 +19199,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "b465a4f2112240df9e65f8326160d0c3e09a5a89"; - sha256 = "05cjgjmawndmgw2dl71sx5msj8csn0jr72rfxnw7jx24p4c33nkk"; + rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; + sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -19196,6 +19364,27 @@ license = lib.licenses.free; }; }) {}; + meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "meghanada"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mopemope"; + repo = "meghanada-emacs"; + rev = "3c7ffe201735d4b6dbc1e449248194eaa40e6c07"; + sha256 = "15yc312lixa2kv8fij6yp52dqgwi4pdf6w4b776flbqd14y23amd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; + sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; + name = "meghanada"; + }; + packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + meta = { + homepage = "https://melpa.org/#/meghanada"; + license = lib.licenses.free; + }; + }) {}; melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "melpa-upstream-visit"; @@ -19511,6 +19700,27 @@ license = lib.licenses.free; }; }) {}; + mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mips-mode"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-mips-mode"; + rev = "dcde079176c1419ec24df08b62dd77a897892437"; + sha256 = "0jvbcld3abm45qzsbcaf6f1zd71hgdg5y47v6c0ri4xgwgcwqrvc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; + sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; + name = "mips-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mips-mode"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -19909,22 +20119,22 @@ license = lib.licenses.free; }; }) {}; - mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "83e6232b43902c7124fea16145de0da881bfe865"; - sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a"; + rev = "75ee79ed663bde0bd52f09c5b444cbd9e13a738a"; + sha256 = "09sywhf1g8yqadzp19djar2gm3fmilqi3pbdm0hvm9b7xpq1gg44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm"; name = "mu4e-alert"; }; - packageRequires = [ alert emacs s ]; + packageRequires = [ alert emacs ht s ]; meta = { homepage = "https://melpa.org/#/mu4e-alert"; license = lib.licenses.free; @@ -20413,6 +20623,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b"; + sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; @@ -20539,11 +20770,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.22.1"; + version = "0.22.2"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "b824ecc48f1e838ab19e346b0eec17ff02432493"; - sha256 = "08jwa7fg2wnk5nhzd56lyvsgi6icgmzmb30mpvpvm4v2afwlhbvj"; + rev = "da5029e2ac8dfd8a839de1f6a4701237d0b34db1"; + sha256 = "0fryxrgz8l9397jcink5cybn4l57lzav6a4ar8p6rj5p9f7lr0d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -20790,12 +21021,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "0.2.4"; + version = "0.3"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "98560075eb0a9dc5ad1e3102ac1154543692d74d"; - sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja"; + rev = "02955d24bd204d330891ec57921edd56f854f721"; + sha256 = "02bz2jgpvrhqwp6jrdb8msr272mz0g2q6857m06yg7vcxpj4xlkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -20958,12 +21189,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.3"; + version = "1.5.6"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "1553934954ea47e4d2de676c42324ed4790cfd14"; - sha256 = "1n978yv19bsy5876lnp16xs1qg1frdbicf9c9h2rvil5myrljhyj"; + rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; + sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -23142,12 +23373,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; - sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; + rev = "dfa6c66a038d84d9b7f17e0bc1471f3efea7acb6"; + sha256 = "1nplmw0n8ap1sbshb7p1mrdw835f7a4ih1zxjg13wx0dls65zpa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -24123,6 +24354,27 @@ license = lib.licenses.free; }; }) {}; + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-variable"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "projectile-variable"; + rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; + sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; + sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; + name = "projectile-variable"; + }; + packageRequires = [ cl-lib emacs projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-variable"; + license = lib.licenses.free; + }; + }) {}; projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projekt"; @@ -24294,12 +24546,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "48d5977e5efcf3650a1628b5cbffffdd164cd773"; - sha256 = "1wiiarxh0lcxvy56f1rxdbk1iwhdynl2xn6v8nr35bw1l82b1j9g"; + rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; + sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -24966,12 +25218,12 @@ rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rc-mode"; - version = "1.0.6"; + version = "1.0.13"; src = fetchFromGitHub { owner = "mrhmouse"; repo = "rc-mode.el"; - rev = "b9b48e24a55083e4911f2b497ed4d9676a192e88"; - sha256 = "06ln916fim58q44g67zlnsipfxcramyrqbm9adh52mdbk44j4bf9"; + rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; + sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; @@ -25932,12 +26184,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "stakemori"; repo = "sage-shell-mode"; - rev = "26303698cbd807b4cbaa241b0671f7e542a3bbe4"; - sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr"; + rev = "00881a50b5c8a9994e318e107e7848c1c9f119df"; + sha256 = "0w1ba3rky07p7qsh2f59xfrhfip3k2db33pblyvs7z0fd0qwwsv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode"; @@ -26265,6 +26517,27 @@ license = lib.licenses.free; }; }) {}; + sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sexy-monochrome-theme"; + version = "1.0"; + src = fetchFromGitHub { + owner = "nuncostans"; + repo = "sexy-monochrome-theme"; + rev = "64570387a30ec5ac685cb11824ee24f8890572e1"; + sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; + sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + name = "sexy-monochrome-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sexy-monochrome-theme"; + license = lib.licenses.free; + }; + }) {}; shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; @@ -27504,6 +27777,27 @@ license = lib.licenses.free; }; }) {}; + sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sphinx-mode"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "sphinx-mode"; + rev = "3d6e3059350593dc077f06f54c33869b9e28f7bc"; + sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; + sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + name = "sphinx-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sphinx-mode"; + license = lib.licenses.free; + }; + }) {}; splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "splitjoin"; @@ -28173,6 +28467,27 @@ license = lib.licenses.free; }; }) {}; + swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swift3-mode"; + version = "2.1.1"; + src = fetchFromGitHub { + owner = "taku0"; + repo = "swift3-mode"; + rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9"; + sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; + sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; + name = "swift3-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/swift3-mode"; + license = lib.licenses.free; + }; + }) {}; swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; @@ -30908,12 +31223,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "106d313c0dad532c2da3cc78770a8a2f0396aa85"; - sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f"; + rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; + sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 7cf85d3cdab2..03121edada0a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -91,9 +91,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 700e494cfa73..fd9cfdc68a29 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160905"; + version = "20160912"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20160905.tar"; - sha256 = "01zm7s5qbh1xvxddd93i6cmz3m7x2s67zwzah5q5l3hgnvbx750q"; + url = "http://orgmode.org/elpa/org-20160912.tar"; + sha256 = "1xawj0pdvqrgzlixxgbfa01gzajfaz47anr5m4aw035rhc6s02r7"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20160905"; + version = "20160912"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20160905.tar"; - sha256 = "1wx51iqg1cfrf220yslp2lq9s7klbv6bbxq0d2ygj47yjikkf39r"; + url = "http://orgmode.org/elpa/org-plus-contrib-20160912.tar"; + sha256 = "15id0gz60hqbhr183vnz4winpisa2kwrh47zqz37a5yx5b8fc84r"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix new file mode 100644 index 000000000000..b0cfe9979081 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, emacs, texinfo }: + +stdenv.mkDerivation rec { + name = "tramp-2.3.0"; + src = fetchurl { + url = "mirror://gnu/tramp/${name}.tar.gz"; + sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi"; + }; + buildInputs = [ emacs texinfo ]; + meta = { + description = "Transparently access remote files from Emacs. Newer versions than built-in."; + homepage = https://www.gnu.org/software/tramp; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-24/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch index 2d8099b73736..2d8099b73736 100644 --- a/pkgs/applications/editors/emacs-24/at-fdcwd.patch +++ b/pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs-25/builder.sh b/pkgs/applications/editors/emacs/builder.sh index 545520cca7c0..545520cca7c0 100644 --- a/pkgs/applications/editors/emacs-25/builder.sh +++ b/pkgs/applications/editors/emacs/builder.sh diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs/default.nix index a8d994012e27..4a729ba3da3f 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO -, autoconf, automake , withX ? !stdenv.isDarwin +, withGTK2 ? true, gtk2 ? null , withGTK3 ? false, gtk3 ? null , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null -, withGTK2 ? true, gtk2 +, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: assert (libXft != null) -> libpng != null; # probably a bug @@ -19,71 +19,68 @@ assert withXwidgets -> withGTK3 && webkitgtk24x != null; let toolkit = - if withGTK3 then "gtk3" - else if withGTK2 then "gtk2" + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" else "lucid"; in - stdenv.mkDerivation rec { - name = "emacs-25.1-rc2"; - - builder = ./builder.sh; + name = "emacs-25.1"; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz"; - sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v"; + url = "mirror://gnu//emacs/${name}.tar.xz"; + sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr"; }; - patches = lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - ]; + patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch; - postPatch = '' - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - ''; + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext - autoconf automake ] - ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optional stdenv.isLinux dbus + ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] - ++ stdenv.lib.optional (withX && withGTK2) gtk2 - ++ stdenv.lib.optional (withX && withGTK3) gtk3 - ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo - ++ stdenv.lib.optionals withXwidgets [webkitgtk24x wrapGAppsHook glib_networking]; + ++ lib.optional (withX && withGTK2) gtk2 + ++ lib.optional (withX && withGTK3) gtk3 + ++ lib.optional (stdenv.isDarwin && withX) cairo + ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; - configureFlags = - (if stdenv.isDarwin + configureFlags = [ "--with-modules" ] ++ + (if stdenv.isDarwin then [ "--with-ns" "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]) - ++ stdenv.lib.optional withXwidgets "--with-xwidgets"; + ++ lib.optional withXwidgets "--with-xwidgets"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo.dev}/include/cairo"; + preConfigure = lib.optionalString srcRepo '' + ./autogen.sh + '' + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale - preBuild = '' - find . -name '*.elc' -delete + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done ''; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications ''; meta = with stdenv.lib; { - description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; + description = "The extensible, customizable GNU text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix index 23133ec262c3..885538dc8837 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs/macport-24.5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix new file mode 100644 index 000000000000..81e77c725d9c --- /dev/null +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake +, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, ImageCaptureCore, GSS, ImageIO # These may be optional +}: + +stdenv.mkDerivation rec { + emacsName = "emacs-25.1"; + name = "${emacsName}-mac-6.0"; + + builder = ./builder.sh; + + src = fetchurl { + url = "ftp://ftp.gnu.org/gnu/emacs/${emacsName}.tar.xz"; + sha256 = "19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33"; + }; + + macportSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34"; + }; + + enableParallelBuilding = true; + + buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake]; + + propagatedBuildInputs = [ + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO # may be optional + ]; + + postUnpack = '' + mv $sourceRoot $name + tar xzf $macportSrc + mv $name $sourceRoot + ''; + + postPatch = '' + patch -p1 < patch-mac + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + ''; + + configureFlags = [ + "LDFLAGS=-L${ncurses.out}/lib" + "--with-xml2=yes" + "--with-gnutls=yes" + "--with-mac" + "--enable-mac-app=$$out/Applications" + ]; + + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; + LDFLAGS = "-O3 -L${ncurses.out}/lib"; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp/ + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "GNU Emacs 25, the extensible, customizable text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.darwin; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + + This is "Mac port" addition to GNU Emacs 24. This provides a native + GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later + already contain the official GUI support via the NS (Cocoa) port for + Mac OS X 10.4 and later. So if it is good enough for you, then you + don't need to try this. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 023d6412ed84..023d6412ed84 100644 --- a/pkgs/applications/editors/emacs-24/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 679125b5ec4e..7689ebad0f01 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,8 +1,8 @@ -{ runCommand, makeWrapper, geany, gnome }: +{ runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " mkdir -p $out ln -s ${geany}/share $out - makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib + makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib " diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index c023da0bc958..32998700c23e 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,7 +1,7 @@ { avahiSupport ? false # build support for Avahi in libinfinity , gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, pkgconfig -, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool +, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool , gnome_vfs ? null}: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; - buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] + buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index a5b0f2e400a4..055816a798d3 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - buildInputs = [ intltool pkgconfig gtk ]; + buildInputs = [ intltool pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 9644cb2d5c79..68f5e14891fa 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index cdf1daabea76..44c61d16ec8d 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, fetchNuGet , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip +, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp unzip + mono gtk-sharp-2_0 gnome-sharp unzip pkgconfig dotnetPackages.NUnit dotnetPackages.NUnitRunners @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { for prog in monodevelop mdtool; do patch -p 0 $out/bin/$prog <<EOF 2a3,5 - > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome.libgnomeui gnome.gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk ]}:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH > EOF done diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index b2ac66c1e083..989d3e42a6fa 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: let version = "3.3.7"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; sourceRoot = "scintilla/gtk"; buildPhase = '' diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 1f4be1ac5085..9cf5bd97d0a3 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, makeDesktopItem }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 4eb428f37d88..c1d29b2f42de 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect, gksuSupport ? false, gksu}: @@ -6,8 +6,8 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3114"; - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; + build = "3124"; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0xrfx76ilw5hlx26hv9zx1kw8q9qf76646yyjmn36p6mq9vs6y0d"; + sha256 = "0ijhxddjpswqr8v1bjv3vqfskdcq4k9m52ykpf7ns880n94gdz95"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "0nmi2gkpz56a47a0f56nx6nl3sl7gif035517gx2v82113y9nh66"; + sha256 = "0ysivcz0fl2drxqlhacnq7jj3hr7cn59vnvjkrrpwsrrc2bc0rl4"; }; dontStrip = true; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 8dcc718e7bbb..a9f236a57ae7 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }: +{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation rec { version = "git-2014-08-20"; name = "supertux-editor-${version}"; @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ]; + buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor cp *.{dll,dll.config,exe} $out/lib/supertux-editor makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \ --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \ --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') ''; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index f412a9bada22..54f4ce1ca3a6 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }: +{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }: let # Textadept requires a whole bunch of external dependencies. # The build system expects to be able to download them with wget. @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { name = "textadept-${version}"; buildInputs = [ - gtk glib pkgconfig unzip ncurses zip + gtk2 glib pkgconfig unzip ncurses zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index f0d76eae3b4f..b7c87092e892 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby +, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -79,7 +79,7 @@ composableDerivation { = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; nativeBuildInputs - = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau + = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 1c81cda7ce97..1511b3865792 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.1585"; + version = "8.0.0005"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1kjdwpka269i4cyl0rmnmzg23dl26g65k26h32w8ayzfm3kbj123"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 41994563ee3d..72a4bfe57b89 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-07-15" -, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08" -, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd" +, version ? "2016-08-24" +, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e" +, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp" }: stdenv.mkDerivation rec { - name = "vis-nightly-${version}"; + name = "vis-unstable-${version}"; inherit version; src = fetchFromGitHub { @@ -17,10 +17,9 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - unzip pkgconfig ncurses libtermkey lua @@ -34,18 +33,38 @@ stdenv.mkDerivation rec { LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; postInstall = '' + mkdir -p "$out/share/applications" + cp $desktopItem/share/applications/* $out/share/applications echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ - --prefix VIS_PATH : "$out/share/vis" + --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; + desktopItem = makeDesktopItem rec { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = stdenv.lib.concatStringsSep ";" [ + "Application" "Development" "IDE" + ]; + mimeType = stdenv.lib.concatStringsSep ";" [ + "text/plain" "application/octet-stream" + ]; + startupNotify = "false"; + terminal = "true"; + }; + meta = with stdenv.lib; { description = "A vim like editor"; homepage = http://github.com/martanne/vis; license = licenses.isc; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 78964e316c5c..f69c9706e370 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,17 +1,22 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: let - version = "1.4.0"; - rev = "6276dcb0ae497766056b4c09ea75be1d76a8b679"; + version = "1.5.1"; + rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877"; - sha256 = if stdenv.system == "i686-linux" then "1k228kv1v2765qnz6zw41h79fddwx5pcy9v9jyhsrwyla83fx4ar" - else if stdenv.system == "x86_64-linux" then "1v0am0xpgnlwb3k35v7wxlv22035444ii3v5gv6hf1xbnybsa7lm" - else if stdenv.system == "x86_64-darwin" then "0395wnq8wi9x382l51wf8wiaclx7bjf5p0j39gq8y6j2ww8y2z7n" + sha256 = if stdenv.system == "i686-linux" then "1a2854snjdmfhzx6qwib4iw3qjhlmlf09dlsbbvh24zbrjphnd85" + else if stdenv.system == "x86_64-linux" then "0gg2ad7sp02ffv7la61hh9h4vfw8qkfladbhwlh5y4axbbrx17r7" + else if stdenv.system == "x86_64-darwin" then "18q4ldnmm619vv8yx6rznpznpcc19zjczmcidr34552i5qfg5xsz" else throw "Unsupported system: ${stdenv.system}"; - urlMod = if stdenv.system == "i686-linux" then "linux-ia32" - else if stdenv.system == "x86_64-linux" then "linux-x64" - else if stdenv.system == "x86_64-darwin" then "darwin" + urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + + urlStr = if stdenv.system == "i686-linux" then + urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz" + else if stdenv.system == "x86_64-linux" then + urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz" + else if stdenv.system == "x86_64-darwin" then + urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -19,7 +24,7 @@ in inherit version; src = fetchurl { - url = "https://az764295.vo.msecnd.net/stable/${rev}/VSCode-${urlMod}-stable.zip"; + url = urlStr; inherit sha256; }; @@ -33,7 +38,9 @@ in categories = "GNOME;GTK;Utility;TextEditor;Development;"; }; - buildInputs = [ unzip ]; + buildInputs = if stdenv.system == "x86_64-darwin" + then [ unzip ] + else [ ]; installPhase = '' mkdir -p $out/lib/vscode $out/bin diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 880053e05c29..cce683067e70 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags +, qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: stdenv.mkDerivation rec { name = "qgis-2.16.2"; - buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla + 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 ]; + (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH ''; src = fetchurl { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} ''; meta = { diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 79d6ff06578c..2a78f509429e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: stdenv.mkDerivation { name = "ahoviewer-1.4.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg gst_all_1.gstreamer gst_all_1.gst-plugins-good diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 3c121211e3f0..a27590ccd4da 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/batik-1.6.zip; - md5 = "edff288fc64f968ff96ca49763d50f3c"; + sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; }; buildInputs = [unzip]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 4866ba92addd..1f28e3d4c07d 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, +{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; - buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg + buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 6200048c41dc..a8f38d61f9df 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5 + [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.1.nix new file mode 100644 index 000000000000..6bd572e99bba --- /dev/null +++ b/pkgs/applications/graphics/digikam/5.1.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.1.0"; + + src = fetchurl { + url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; + }; + + 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/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index c7113801b615..b9cf229e8c86 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } : +{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; -buildInputs = [ gtk perl perlXMLParser pkgconfig ]; +buildInputs = [ gtk2 perl perlXMLParser pkgconfig ]; meta = { description = "Simple GTK+2 color selector"; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 952d23bbc484..9149e19819ff 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2 +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 , lcms, intltool, gettext, fbida }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gps" ]; buildInputs = [ - pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext + pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 48278f5aac57..662e214ceaff 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo + [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext xorg.libXpm @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? + passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? #configureFlags = [ "--disable-print" ]; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 1587ceb4037e..6c892f1bfd4e 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib, +{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff + buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff json_glib ]; meta = { diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 80391ae061e6..801e9c5f502b 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, pkgconfig, gtk, libpng}: +{stdenv, fetchurl, pkgconfig, gtk2, libpng}: -assert pkgconfig != null && gtk != null && libpng != null; +assert pkgconfig != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. -# !!! assert libpng == gtk.libpng; +# !!! assert libpng == gtk2.libpng; stdenv.mkDerivation { name = "gqview-2.1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - buildInputs = [pkgconfig gtk libpng]; + buildInputs = [pkgconfig gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 25cf3a990d11..36995f0bcc8b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip, automake114x, autoconf @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext + pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc + libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif automake114x autoconf ] ++ stdenv.lib.optional boxMakerPlugin unzip; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index f5987684c002..a446ab5dd185 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: +, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { version = "0.8.0.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl unzip ftgl glew asciidoc - gtkmm glibmm gtkglext pangox_compat libXmu + gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index be8df8ef16dc..8abdb3c7bb5a 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c +{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c , lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages , scons, swig }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk + gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk python scons swig ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 3fd9d47374a3..25c6fc36c6c9 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } : +{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } : stdenv.mkDerivation (rec { name = "pqiv-0.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; }; - buildInputs = [ getopt which pkgconfig gtk ]; + buildInputs = [ getopt which pkgconfig gtk2 ]; preConfigure='' substituteInPlace configure --replace /bin/bash "$shell" diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 35c0ca2aff98..9d147a635f3b 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } : +{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ]; + buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake new file mode 100644 index 000000000000..28096618c9e3 --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake @@ -0,0 +1,4 @@ +set(GIT_BRANCH master) +set(GIT_VERSION 4.2.1050) +set(GIT_CHANGESET 2d0e5e4feeac9801994d82c5931531f508deb2e9) +set(GIT_TAGDISTANCE 1050) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index aeb427348ca3..9259b7c76483 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { name = "rawtherapee-4.2"; - + src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = "4.2"; sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr"; }; - - buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ]; + + buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ]; patchPhase = '' patch -p1 < ${./sigc++_fix.patch} @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric jcumming mahe]; + maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix new file mode 100644 index 000000000000..2d664e5cf15d --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/dev.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +}: + +stdenv.mkDerivation rec { + name = "rawtherapee-git-2016-09-21"; + + src = fetchFromGitHub { + owner = "Beep6581"; + repo = "RawTherapee"; + rev = "2d0e5e4feeac9801994d82c5931531f508deb2e9"; + sha256 = "1d9bi3b6cslm0rhhqf0rx47nlnsnky284vqsxyq3mss6bd8880xh"; + }; + + buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; + + NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; + + # Copy generated ReleaseInfo.cmake so we don't need git. File was + # generated manually using `./tools/generateReleaseInfo` in the + # source folder. Make sure to regenerate it when updating. + preConfigure = '' + cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake + ''; + + enableParallelBuilding = true; + + meta = { + description = "RAW converter and digital photo processing software"; + homepage = http://www.rawtherapee.com/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index b5abe34581aa..bd19ef3c43b1 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [sane-backends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index b3a432c96dfd..de07a4f1a896 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 23a37ab43ae6..fc8e7a62c2ba 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib +{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk gtkimageview gettext bzip2 zlib + [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib libjpeg libtiff cfitsio exiv2 lcms2 lensfun ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index cc456465ba63..4542de2d42fa 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk, perl, zip}: +, wxGTK, gtk2, perl, zip}: stdenv.mkDerivation { name = "xaralx-0.7r1785"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk libxml2 freetype pango ]; + buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; configureFlags = "--disable-svnversion"; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 53d0473638a8..b81efb08d8ac 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ghostscript, atk, gtk, glib, fontconfig, freetype +, ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ghostscript atk gtk glib fontconfig freetype + ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler ]; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 053e1137e391..999314429452 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, texinfo }: +{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: stdenv.mkDerivation rec { name = "xzgv-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; }; - buildInputs = [ gtk pkgconfig texinfo ]; + buildInputs = [ gtk2 pkgconfig texinfo ]; patches = [ ./fix-linker-paths.patch ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index d31e9234e094..88bf87b0a84f 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib +{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib , gdk_pixbuf }: assert stdenv.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index a8914a9014d9..3294d18e70b8 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 0df0a5647318..6cc6cc5d9b93 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cat >> "$out/bin/avrdudess" << __EOF__ #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH" diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 14416c24d23e..283e7f199071 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, gettext, pythonPackages -, gtk, gdk_pixbuf, upower +, gtk2, gdk_pixbuf, upower , makeWrapper }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ]; + [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ]; configurePhase = "true"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix new file mode 100644 index 000000000000..09bc8f25b261 --- /dev/null +++ b/pkgs/applications/misc/cheat/default.nix @@ -0,0 +1,20 @@ +{ python3Packages, fetchurl, lib }: + +python3Packages.buildPythonApplication rec { + version = "2.1.26"; + name = "cheat-${version}"; + + propagatedBuildInputs = with python3Packages; [ docopt pygments ]; + + src = fetchurl { + url = "mirror://pypi/c/cheat/${name}.tar.gz"; + sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm"; + }; + + meta = { + description = "cheat allows you to create and view interactive cheatsheets on the command-line"; + maintainers = with lib.maintainers; [ mic92 ]; + license = with lib.licenses; [gpl3 mit]; + homepage = "https://github.com/chrisallenlane/cheat"; + }; +} diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 57f6c229a08f..e62236e7ae2f 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk xdotool ]; + buildInputs = [ intltool pkgconfig gtk2 xdotool ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index cdcada196b98..b6d6e53b0019 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }: stdenv.mkDerivation { name = "d4x-2.5.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; - buildInputs = [ gtk glib pkgconfig openssl boost ]; + buildInputs = [ gtk2 glib pkgconfig openssl boost ]; meta = { description = "Graphical download manager"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 061a10c6a9f2..95cae316a711 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }: +librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }: stdenv.mkDerivation rec { name = "eaglemode-0.86.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext poppler xineLib ]; + librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 782ef4ae3660..09bef975c85b 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { name = "epdfview-0.1.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; - buildInputs = [ pkgconfig gtk poppler ]; + buildInputs = [ pkgconfig gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index f7a8fe4eafc2..1165ced11f9c 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, + gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11 xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 685c0ecb4ede..301695885016 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext -, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }: +, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ]; + buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index f4fec41b9e66..d6a59a89be65 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE , IOKit ? null }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; }; - buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE] + buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index c3f78efd4123..0b6ebe06b88a 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, intltool, libstartup_notification, gtk_doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e894ace0d45c..5d13c18edc3e 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : +{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : let version = "31801"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ignoreExternals = true; }; - buildInputs = [ libxml2 gtk curl ]; + buildInputs = [ libxml2 gtk2 curl ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 10b8065c6237..600a54931217 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.9.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38"; }; - buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ]; + buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ]; meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index c6b48af5c061..5026fea0e358 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk +{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2 , libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig exiv2 libxml2 gtk + pkgconfig exiv2 libxml2 gtk2 libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 789f2d7c3fae..1f263a2b1dd5 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.4"; + version = "18.5"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "0wrkvff3c1w66373m2w2ib07rkn3rmbp3n7ixz72qd1swvbk6xx1"; + sha256 = "0xd97b7rs5i41hyih6zdbvls090903yfr1r9lflq93dyqhmzpdhn"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 03d333e59e67..623cb12f9323 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }: +{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }: stdenv.mkDerivation rec { name = "green-pdfviewer-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ]; + buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ]; patches = [ ./gdk-libs.patch diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 07cecc2d84e2..5db5b25947e6 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; }; - buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia + buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index aa6a4bd689a4..3191c00e9ec9 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme ]; - propagatedBuildInputs = with pythonPackages; [ pygobject pygtk pyxdg gnome_python dbus-python sqlite3 ]; + propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ]; configurePhase = '' python waf configure --prefix="$out" diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c183f70a2895..90cf8de615d7 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "135mrdi8i56z9m2sihjrdfab6lrczbfgavwvfrngvi1zxnx7scmv"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/misc/hugo/deps.json b/pkgs/applications/misc/hugo/deps.json deleted file mode 100644 index 53967d1bff09..000000000000 --- a/pkgs/applications/misc/hugo/deps.json +++ /dev/null @@ -1,317 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", - "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" - } - }, - { - "goPackagePath": "github.com/yosssi/ace", - "fetch": { - "type": "git", - "url": "https://github.com/yosssi/ace", - "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d", - "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k" - } - }, - { - "goPackagePath": "github.com/spf13/viper", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/viper", - "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd", - "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0", - "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp" - } - }, - { - "goPackagePath": "github.com/spf13/jwalterweatherman", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/jwalterweatherman", - "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46", - "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/magiconair/properties", - "fetch": { - "type": "git", - "url": "https://github.com/magiconair/properties", - "rev": "c265cfa48dda6474e208715ca93e987829f572f8", - "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3" - } - }, - { - "goPackagePath": "github.com/bep/inflect", - "fetch": { - "type": "git", - "url": "https://github.com/bep/inflect", - "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69", - "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3" - } - }, - { - "goPackagePath": "github.com/eknkc/amber", - "fetch": { - "type": "git", - "url": "https://github.com/eknkc/amber", - "rev": "91774f050c1453128146169b626489e60108ec03", - "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis" - } - }, - { - "goPackagePath": "github.com/spf13/afero", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/afero", - "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8", - "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw" - } - }, - { - "goPackagePath": "github.com/spf13/cast", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cast", - "rev": "27b586b42e29bec072fe7379259cc719e1289da6", - "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7", - "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r" - } - }, - { - "goPackagePath": "github.com/dchest/cssmin", - "fetch": { - "type": "git", - "url": "https://github.com/dchest/cssmin", - "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239", - "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s" - } - }, - { - "goPackagePath": "github.com/spf13/fsync", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/fsync", - "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1", - "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p" - } - }, - { - "goPackagePath": "github.com/cpuguy83/go-md2man", - "fetch": { - "type": "git", - "url": "https://github.com/cpuguy83/go-md2man", - "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599", - "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj" - } - }, - { - "goPackagePath": "github.com/miekg/mmark", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/mmark", - "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a", - "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa" - } - }, - { - "goPackagePath": "github.com/spf13/nitro", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/nitro", - "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8", - "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/purell", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/purell", - "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3", - "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb" - } - }, - { - "goPackagePath": "github.com/pkg/sftp", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/sftp", - "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472", - "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/kyokomi/emoji", - "fetch": { - "type": "git", - "url": "https://github.com/kyokomi/emoji", - "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9", - "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp" - } - }, - { - "goPackagePath": "github.com/pkg/errors", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/errors", - "rev": "494e70f7620561491c2ca11e185bbef4b70060da", - "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - } -] diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix new file mode 100644 index 000000000000..20d0d8f1c9de --- /dev/null +++ b/pkgs/applications/misc/hugo/deps.nix @@ -0,0 +1,317 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; + sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + }; + } + { + goPackagePath = "github.com/yosssi/ace"; + fetch = { + type = "git"; + url = "https://github.com/yosssi/ace"; + rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; + sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd"; + sha256 = "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "367864438f1b1a3c7db4da06a2f55b144e6784e0"; + sha256 = "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; + sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c265cfa48dda6474e208715ca93e987829f572f8"; + sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + }; + } + { + goPackagePath = "github.com/bep/inflect"; + fetch = { + type = "git"; + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "91774f050c1453128146169b626489e60108ec03"; + sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; + sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "27b586b42e29bec072fe7379259cc719e1289da6"; + sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; + sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + }; + } + { + goPackagePath = "github.com/dchest/cssmin"; + fetch = { + type = "git"; + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + }; + } + { + goPackagePath = "github.com/spf13/fsync"; + fetch = { + type = "git"; + url = "https://github.com/spf13/fsync"; + rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; + sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/miekg/mmark"; + fetch = { + type = "git"; + url = "https://github.com/miekg/mmark"; + rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; + sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + }; + } + { + goPackagePath = "github.com/spf13/nitro"; + fetch = { + type = "git"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; + sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; + sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kyokomi/emoji"; + fetch = { + type = "git"; + url = "https://github.com/kyokomi/emoji"; + rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; + sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "494e70f7620561491c2ca11e185bbef4b70060da"; + sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; + sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + }; + } +] diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyperterm/default.nix index b3e0ef71c3c1..59cd9ac26964 100644 --- a/pkgs/applications/misc/hyperterm/default.nix +++ b/pkgs/applications/misc/hyperterm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fd9077a619c5..8e5c5d6206c9 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk2, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8"; }; - buildInputs = [ db gtk bzip2 ]; + buildInputs = [ db gtk2 bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix index e32f0b7ca012..cb48ff22bef0 100644 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keefox/default.nix @@ -1,12 +1,12 @@ { stdenv, buildEnv, fetchurl, mono, unzip }: let - version = "1.5.4"; + version = "1.6.3"; drv = stdenv.mkDerivation { name = "keefox-${version}"; src = fetchurl { url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "c7c30770beb0ea32cbdee5311d03a9910fb7772695af3aa655e4ae64cd4d8335"; + sha256 = "dc26c51a6b3690d4bec527c3732a72f67a85b804c60db5e699260552e2dd2bd9"; }; meta = { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 391410628bad..5eaad6514e1f 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.33"; + version = "2.34"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0n4rkx2awyq1gbqiby1lkf2zw82brji96s4fkjsahmci528a882i"; + sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa"; }; sourceRoot = "."; @@ -20,7 +20,7 @@ with builtins; buildDotnetPackage rec { buildInputs = [ unzip makeWrapper icoutils ]; pluginLoadPathsPatch = - let outputLc = toString (add 8 (length plugins)); + let outputLc = toString (add 7 (length plugins)); patchTemplate = readFile ./keepass-plugins.patch; loadTemplate = readFile ./keepass-plugins-load.patch; loads = diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch index 872b6c06d788..b7bea38e4c81 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass"); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 1a32d77806a4..1793f04a1708 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -1,13 +1,45 @@ --- old/KeePass/Forms/MainForm.cs +++ new/KeePass/Forms/MainForm.cs -@@ -384,9 +384,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.Initialize(m_pluginDefaultHost); - +@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms m_pluginManager.UnloadAllPlugins(); -- if(AppPolicy.Current.Plugins) -- m_pluginManager.LoadAllPlugins(UrlUtil.GetFileDirectory( -- WinUtil.GetExecutable(), false, true)); -+ if(AppPolicy.Current.Plugins) { + if(AppPolicy.Current.Plugins) + { +- string[] vExclNames = new string[] { +- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers, +- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64, +- AppDefs.FileNames.ShInstUtil +- }; +- +- string strPlgRoot = UrlUtil.GetFileDirectory( +- WinUtil.GetExecutable(), false, true); +- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly, +- vExclNames); +- +- if(!NativeLib.IsUnix()) +- { +- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot, +- false) + AppDefs.PluginsDir; +- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories, +- vExclNames); +- } +- else // Unix +- { +- try +- { +- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot); +- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories()) +- { +- if(diSub == null) { Debug.Assert(false); continue; } +- +- if(string.Equals(diSub.Name, AppDefs.PluginsDir, +- StrUtil.CaseIgnoreCmp)) +- m_pluginManager.LoadAllPlugins(diSub.FullName, +- SearchOption.AllDirectories, vExclNames); +- } +- } +- catch(Exception) { Debug.Assert(false); } +- } +- } $DO_LOADS$+ } // Delete old files *after* loading plugins (when timestamps diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index bd0118c75f44..a3c140b6e6c2 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib -, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk +, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk }: let @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 6bd834846b66..f6bfe61e5aa2 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, libX11, libxcb, cairo, gtk, pango, python27, python3 +, libX11, libxcb, cairo, gtk2, pango, python27, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libX11 libxcb cairo gtk pango python27 python3 + pkgconfig libX11 libxcb cairo gtk2 pango python27 python3 ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index d9b03fd86e1d..6d84ef422964 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -1,38 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gdk_pixbuf, cairo, libXft, gtk2, fribidi }: +{ stdenv, fetchurl, pkgconfig, autoconf +, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte, fribidi, libssh2 +}: stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.3.8"; + version = "3.7.2"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i"; + sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; }; - buildInputs = [ pkgconfig libX11 gdk_pixbuf cairo libXft gtk2 fribidi ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + libX11 gdk_pixbuf.dev cairo libXft gtk3 vte fribidi libssh2 + ]; preConfigure = '' sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \ xwindow/libtype/Makefile.in \ main/Makefile.in \ - java/Makefile.in \ + tool/mlfc/Makefile.in \ tool/mlimgloader/Makefile.in \ - tool/registobmp/Makefile.in \ - tool/mlconfig/Makefile.in - sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' tool/mlconfig/po/Makefile.in.in + tool/mlconfig/Makefile.in \ + xwindow/libotl/Makefile.in + sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ + tool/mlconfig/po/Makefile.in.in ''; configureFlags = [ + "--with-x=yes" + "--with-gtk=3.0" "--with-imagelib=gdk-pixbuf" + "--with-gui=xlib" "--with-type-engines=cairo,xft,xcore" - "--with-x" "--enable-ind" + "--enable-fribidi" + "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" + "--disable-utmp" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mlterm/; license = licenses.bsd2; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index ccdb47c4b608..336b136c56d6 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; goPackagePath = "github.com/michaeldv/mop"; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' for i in $(find . -type f);do diff --git a/pkgs/applications/misc/mop/deps.json b/pkgs/applications/misc/mop/deps.json deleted file mode 100644 index d2c59589dc22..000000000000 --- a/pkgs/applications/misc/mop/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - } -] diff --git a/pkgs/applications/misc/mop/deps.nix b/pkgs/applications/misc/mop/deps.nix new file mode 100644 index 000000000000..4081cd1ddaa2 --- /dev/null +++ b/pkgs/applications/misc/mop/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } +] diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index fc55b275dd0a..5c00bddd9d23 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig +{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig , libgnomeui, GConf, automake, autoconf }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf + [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf automake autoconf ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 775d344643e3..fbb10bc9ceb6 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,32 +1,72 @@ -{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file -, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool -, libctemplate, libglade -, libiodbc -, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, pcre, pkgconfig, sqlite, sudo -, pythonPackages +{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig +, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, mysql, libxml2, libctemplate, libmysqlconnectorcpp +, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libgnome_keyring, file +, pythonPackages, jre, autoconf, automake, libtool +, boost, glibmm, libsigcxx, pangomm, libX11, openssl +, proj, cairo, libglade }: let inherit (pythonPackages) pexpect pycrypto python paramiko; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "5.2.47"; + version = "6.3.7"; name = "${pname}-${version}"; src = fetchurl { - url = "http://mirror.cogentco.com/pub/mysql/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz"; - sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6"; + url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; + sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544"; }; - buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool - libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa - mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; + buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file + libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl + proj cairo cairo.dev makeWrapper libglade ] ; + + prePatch = '' + for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; + do + sed -i 's@#include <gdal/@#include <@' $f ; + done + + sed -i '32s@mysqlparser@mysqlparser sqlparser@' library/mysql.parser/CMakeLists.txt + + cat <<EOF > ext/antlr-runtime/fix-configure + #!${stdenv.shell} + echo "fixing bundled antlr3c configure" ; + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + sed -i '12121d' configure + EOF + chmod +x ext/antlr-runtime/fix-configure + sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt - preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" + substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" + patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser + patchShebangs $(pwd)/tools/get_wb_version.sh ''; + NIX_CFLAGS_COMPILE = [ + "-I${libsigcxx}/lib/sigc++-2.0/include" + "-I${pangomm}/lib/pangomm-1.4/include" + "-I${glibmm}/lib/giomm-2.4/include" + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" + "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" + "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" + "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" + "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" + "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + ]; + postInstall = '' patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh @@ -52,7 +92,7 @@ in stdenv.mkDerivation rec { # used because we cannot clean up after ourselves due to the exec call. # Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --components=ssh,pkcs11 --start ) ; do eval "export "$expr ; done +for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done # Prepare fifo pipe. FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 53b1106a2239..51b29a5c04c4 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 9e52c629a244..1985b6448846 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { name = "openbox-menu-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - buildInputs = [ pkgconfig glib gtk menu-cache ]; + buildInputs = [ pkgconfig glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index bf1bed08ed4c..e6d96b099fad 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation rec { name = "pcmanfm-1.2.4"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; }; - buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 0978da3512b8..919935a41ee5 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib -, mono, gtk-sharp, gnome-sharp, hyena +, mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; buildInputs = [ - pkgconfig gnome_doc_utils intltool mono gtk-sharp gnome-sharp + pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { postInstall = '' makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 4798ae5a0248..9b3766842845 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages, gnome }: +{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pythonPackages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk gnome.gnome_menus ]; + buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ]; pythonPath = [ pythonPackages.pygtk ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index d4da0fbd314d..9d333da01cb6 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { qtquick1 qtquickcontrols qtsvg qttools ]; - configurePhase = "true"; + dontUseQmakeConfigure = true; buildPhase = '' srcdir=$PWD diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 1a42d9a90e6d..584b8f6a2966 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf +{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf , curl, libexif, sqlite, libxml2 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516"; }; - buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ]; + buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ]; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 40810adbbdc8..f72f4fdc5677 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage +, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage , libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp , libstartup_notification , hicolor_icon_theme, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender + buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs libXdmcp libstartup_notification hicolor_icon_theme ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix new file mode 100644 index 000000000000..042401a727e9 --- /dev/null +++ b/pkgs/applications/misc/udiskie/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, asciidoc-full, gettext +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify +, pythonPackages, udisks2, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + name = "udiskie-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + }; + + buildInputs = [ + asciidoc-full # For building man page. + hicolor_icon_theme + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt + pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + ]; + + postBuild = "make -C doc"; + + postInstall = '' + mkdir -p $out/share/man/man8 + cp -v doc/udiskie.8 $out/share/man/man8/ + ''; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks"; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 50749681f2cf..1e7c7f654b5f 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl +{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; }; - buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 5918f3ef3788..e59a3e989432 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json deleted file mode 100644 index 5bfb64ffbc5f..000000000000 --- a/pkgs/applications/misc/wego/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/schachmat/ingo", - "fetch": { - "type": "git", - "url": "https://github.com/schachmat/ingo", - "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", - "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" - } - } -] diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix new file mode 100644 index 000000000000..408b3908d8f4 --- /dev/null +++ b/pkgs/applications/misc/wego/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/schachmat/ingo"; + fetch = { + type = "git"; + url = "https://github.com/schachmat/ingo"; + rev = "fab41e4e62cbef5d92998746ec25f7e195100f38"; + sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"; + }; + } +] diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index e9e34518932f..8c554da03621 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm +, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtk gtkmm atk pango pangomm cairo cairomm + glib glibmm gtkmm2 atk pango pangomm cairo cairomm dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx ]; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 1a71a2756d15..32daf108c1ca 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk +, gtkSupport ? true, gtk2 , qtSupport ? true, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] - ++ stdenv.lib.optionals gtkSupport [ gtk ] + ++ stdenv.lib.optionals gtkSupport [ gtk2 ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 8e3165b75d26..ca0d7775ecef 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant, +, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, gdk_pixbuf}: let s = import ./src-for-default.nix; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk pango enchant gdk_pixbuf + gtk2 pango enchant gdk_pixbuf ]; preConfigure = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8131ad29060b..c0e26af42742 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk, dbus_glib +, glib, gtk2, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -116,7 +116,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk dbus_glib + glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 973669f87cdc..7402a8bae29b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,7 @@ , enableSELinux ? false , enableNaCl ? false , enableHotwording ? false -, gnomeSupport ? false +, gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false @@ -22,7 +22,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording gnomeSupport + inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index bd7e256bfa9d..23f06569fa95 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -157,9 +157,7 @@ in rec { fi ''; - impureEnvVars = [ - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; }; in { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d782f4a7b536..7a87b1df3861 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -2,6 +2,7 @@ , alsaLib , atk , cairo +, curl , cups , dbus_glib , dbus_libs @@ -25,7 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -75,6 +76,7 @@ stdenv.mkDerivation { alsaLib atk cairo + curl cups dbus_glib dbus_libs @@ -98,7 +100,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index b4e683372e11..20cadc746ac3 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 = "48.0.2"; + version = "49.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ach/firefox-48.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "2e06c639284e5258e9bba9f02f3d21df6a3a37e3dc55667b2836e9eb68ad5ab24ccd99f82714da14231b5c6a301a40acaf9763ca19b920bb4f6acf535dc753b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ach/firefox-48.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "d0777aa0a5128f9ea0b0929781a7d86ad81e72bc8c204e8f026d37bac120d0e210b0a0c8ed42aabd378f96fe52237a103ea25c773b49ea814d06862e770e3180"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/af/firefox-48.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "81cddaae3ab0ac26b3cb5faefddfb088addea7f5d112a317d5c56c16cdae2801539e7c9c4fd9d77a14ad77db7a96a75767d5c08b3858455b801adab8a997da02"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/af/firefox-48.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "5020fda908bcc8b3bb937c5ea4f5a78e74cf836488937f3c4c6f6533a57d5e086e88a85fefac3983407254e3f9a9e2a0b03167095ba9b6e30e69b7381dfe756f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/an/firefox-48.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "a47b6bd64f1e654ed9041035c36ddda60cedaf634327fd005f9610390a53433da21f12fbe4a3225d756755544a01b9fea463965c47c08145103b357e5b1071b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/an/firefox-48.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "31d116e6e1950ae3e93ad0ac744967f00699a04f3df89f9e0e4a2cea62e2a9675f7499ca41fcc2acbb91a72cbe3cd74f057dc25a6db947b1b5448fb0d92decdb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ar/firefox-48.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "bb9acd986a258cdc8c368aa1375cee500bf45be31821220c90d562bcc3d526bafc5362c91d4dbd7a003955adc9f26adfe8d62403cf3b9004b82f3880a5b58db7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ar/firefox-48.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "dc4ae811b19887c8f039b046ec2d48d4aaf628f7869e471c97b637e5daaa0e0b0b96fa327ab3b2ba3a184ffbf91213f4cb619d2d2a396b22849782ac41f7f31b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/as/firefox-48.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d9dd79d56912bc65e4993214ff58f7dc725077a62e391495acb6aa4b50c371d1c843811e5c511408dc3b343df0056bf33efc1e8f16177f4549ee49fe7b22ccdb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/as/firefox-48.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "f8278a0141814f2b0e1ac4bb0e94e6d566e97943fabfd7561e249de6a2da9650edfc42456e503ed2473d7df65b4f1949d5fe423b79f9519d59a1ece121361029"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ast/firefox-48.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "e1aca0b09d6c7ef78eff26e88d817a203ffc142f9be998ba08be74dce67da8ae4c728853c6f6f19a4b18fb439ed01fab556718a4f991a206bf5cc069232665a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ast/firefox-48.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "53ab2cc04741152f11fd4f7ad70eec7f927c7aa70997cf9d3069736a13bafa3b26dcabe610cb5dc10243a1b6b00f22bf9d6bc05afd26d0b7de254f55412c5805"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/az/firefox-48.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "39649887ca38ed1beb819227d80f5c75b0fbc08c537d6af48755c35a0ecc195127d9cf4c1af05a09b0e9e604144f5e9e00ad57d1cf895cc3f0142b482c98980a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/az/firefox-48.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "5c75fb1a34fa9fa447f7b279ef57cd0701baeeb95a2dee48b878d01d7e33eeba3d7985ef375317080a1a74732bebc4c26883bedfd00578d1a653deb2a250ca6e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/be/firefox-48.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "7879202dc251f9f2dce656058e51a724b7e49e9b03db8bf5921448b8e48b74186c40425ef51a84be6df810819ce2e297895017ac748b30221e3cad73c80eb0eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/be/firefox-48.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "35291f1c2326af74938c953ecb55e55951ceb8fe10443f39edd2b505dfd137be161f8c4a1e776e3ef75311f52609ce74cc5c13fb78f59893cbf7d7bdcb4c7162"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bg/firefox-48.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "07d630045d9c99655ef04b6de10e34e4c1eb6a38f5a1eed4f08f90ce0f61ca9129235e48882005c0c98eb962273ac644a46dd4cdf76b748ad1b007a018b7f1ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bg/firefox-48.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "457d65bb0afa6c755048191a24eaef286f5fbd9b68b020abf554c7ad978398605947cf276ce09d4447cca4b64f053b956af805196c45617f2f14911598a75f6b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bn-BD/firefox-48.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "a355957e649ab82a6693e8da580b075111fa14bb1efa722397e3fc56c1dd14e6bc4f1315c7a74f1dc47aca228d0faa59db358b7f2baf79939f480c2e4113781b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bn-BD/firefox-48.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "612ef87c01fe221c6e546f110efe228a73e632312af5ee3a4324904aba028365d06c9aaf080eb010b90f653d0aeb4a19f78a0abd15ee02688102cfd4f4c15f5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bn-IN/firefox-48.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "43e41905c397a2e311ab1a326f70070e0a1b922dd38301cfe9af17ae7916f2b697e1f3d218bbfd26741492d10ab5f6623a182691f036dbb653996d87cba10861"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bn-IN/firefox-48.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "29299d5174cc226330f7d89b734b15f934a8dbf6c577e81f37b362ce8fc2adf4d8f901f2ddbdf90d8d43181e369b5e339408604b5cd0bea8a2c6eeca5e319957"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/br/firefox-48.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "38ed922491f7690cc9aa62a4d9703c7d83dd67b067f3901a8ce34a3f937063fefacc0991530a79c66581554a86c564f8d0468f9a3aaf500c56abcc89ae4d872b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/br/firefox-48.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "efbb2ccf082f2ac5b5d580f02642730b934e367fc4b6e841c53fc651b43c129ad092c0028d810d94aed102f01b521838dd81a0137cf057e903ccc78e182911b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bs/firefox-48.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "d9183190513145a246db8592631b22c61cb895fd8b8b5294c772da1c584f63cfdfdf67ab664cea5045611a9366521d91ec3ddeb74079a1046886ede1c0421ea5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bs/firefox-48.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "140a0e65e8995702986e3c85fd38ef5b729911405156a3d3fbc37d7c10685a88300850c339ddb94687994bfa8482fa1f93690e3781d3e02f8f90f8f6eee17371"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ca/firefox-48.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d80b1716eeafb294b2e1d68791e9d84b45285851361f732ec84688b5c440da1c30b669ac01b7a77bf8e065523d77d0a5a4e997a98a82652100b2111177c5567a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ca/firefox-48.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "12282634abc6acbd0877436258657116d1a0ea07f90b04447d8ce372c950e3b5288de9ae76a867b1af5c2d4dc2c85efbb349df616eaca95aa03774d7dd331c7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cak/firefox-48.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "407f1eb4b637a8abdc342b61ed898a5900d9914e5fc67c9c9f44327221dcbcb2fba0e27e9b1af5540d25ad282e9765d1c91bc70ec4a7ac641404ce05d83ea22e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cak/firefox-48.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "a611f37240c3b22e715121d64ed636a650620022edadf8090cd4a51769373c669f230efd39316244b4d727244e093087fb88754aafdeba2948b0bff3316092e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cs/firefox-48.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "e7c7a1564944bbbc5852d11c11480bc03366cfaaacd132f2252a9322fe4f4cc94cc4d7853b56b4c5a130882f254fce4d791a047e5d141dc5143c97d5248da72f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cs/firefox-48.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "d6931627e77fd8e4e0c445573e05a5e96bc6a2a47193cf2fb21403d0c10bdf009eb699d1cad6daee787e569d3508fb85f6edd8ffea80b69d6afed724d568ea50"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cy/firefox-48.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "15df651ea244c39150534bcb467649467c636281b7442af8ef5f2a296104b39ee951202b950fd6a960b10ff54fcea0f37a0b2a8f76cb969fbd9ed57e5a92d66b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cy/firefox-48.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "0b168a6fc6f181303f7398ee3366f18bb2b256d654229da9cfa46ce0b424b4d5d414652509df3ca6600ddc7a9adf823050165d716a3d376a08563457af3e6696"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/da/firefox-48.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "64ef134d5839659c096d556e7060ee07ec160c59adc9ca3105eddbdc1c2b2b166e00996b2a88422461c7bdecdcd71b917e4ce1df8e92912542c413845ace7c69"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/da/firefox-48.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cd477b4c541fa16f8c4054f670143c6605b7beb48fbe1b26948c50435e11f0d4fbcf907f192b53a1419a2be8589daf5c1efcae013366567a8c0003da0186593f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/de/firefox-48.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "6768f6445dabcd1e98ed27a8a28b930a160c7717b688ea38e0930055c59c123fcd7f52d0159dd2b2425978fd9e8e2d0e4e0877e6bba659f840836ff68b2e6c67"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/de/firefox-48.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "6dd6fe70fc26f4b7fbcc1e7ec212263e4e6822d365704364ae8f4ef3ede45a68ea1651e65c02f36e90dc44f2462a874703cfa02bc45e74bf0ab19bc31267e471"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/dsb/firefox-48.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "328e30142ed129560ca2a23de9963f40cdb0ff87454a9257b00b9bdd9b5d566b6f2f263c484f3c58c8e52ae6de5221a1ca936f7960ce01d88f7ba4c9b97f789e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/dsb/firefox-48.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7e57b66afdfca30e7c770ec87d7ffcbdc644c54e01e037bb348709c8f091d82da48a3ff3a3dd8187f12f5ba1f94599f8aa8ed375c7e6bd90a2f787b3b5a09340"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/el/firefox-48.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "ea715903a796e386aa1d1bca22a0dc3cde08690efc17ecaa8380f086fdb0968292a838296adb4c78ac30b7c93baabd4dc19d088ffd890e11c76b58d9baf73efd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/el/firefox-48.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "1bf80e3b64c95d74b7893e2ee36947f293f574c49461d742d7f47ea990d198fa78d9d3f9c04ec3c4d81745549a23b2a502497766441c61098b9ccd5f9169f191"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-GB/firefox-48.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4db30d4d7140cdeafb41353133c9ea5679f5eeae8fdafde86887d6ac3553d1d0db74f2e189219f6f7cb9a8d33f2c2eef58b3280fd0d435593109ab5058404eab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-GB/firefox-48.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "4b9d24e2faff85cf56012baa7c4d32b29173f903a5c19b0ebc20c7959ae291be39ee875f98f08a07d16aacc0fa5e7633245e265f11b30c64f703f22c889abf7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-US/firefox-48.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "656ddb1fc57f2308cd5a6b376828676d9c7529dca18751e5ec6f4b903b47cc31c15f6fb70717605219051f8a54a89d9c579cd70327e2029ca374953671d9d1e6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-US/firefox-48.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "ea8a1edee8ac64720a2694d0ed0ccecbc38d1b1aa6b65fa87969b31189f624549d3e3712052c55e0aebc65119701e88d4397bf01c8526b3ba662e6583acec815"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-ZA/firefox-48.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "27b805f5f89f999bf5a95f174dcc6d611dd297e8ae094e1557300d12311963a3410ad0c077355e2cb31d0e134f0d015fbdf7662e2f172174a1abb24dabdb4040"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-ZA/firefox-48.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "abad4283afed609217799fd3f97e6dd1b89d5844344a68912f712a8796613db371259883b92292fa12a33c923692f7302f63123431fbcba590c780fe4a9e2517"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/eo/firefox-48.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "04fd9ec015150c9c8d26c69e7e0213caeb3a880b162eee48123b0355f73488bf667d5217cdcd2c45cd3cd5fc88c01ad02b4e2cc40b220beb93d55d64689206c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/eo/firefox-48.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "fabb940bc6f392ed1f5e6e0fe23947d28e1b8143f29784509eeac361050921f1fc97ffe18e51f47026b7a69178ddbb367e4dec6cda45feccfc6876e9e178d6f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-AR/firefox-48.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "01015a8756aaaa012fe35ba9d8192304fe8a22af6a512a644b20794446a31738b9142e03492db10e0e237a63cb3ffa2f581e700df00dfa3f4616157782cddf28"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-AR/firefox-48.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "0383d5df8041ee2ba1d32b9b1e090c50a4b911bcfe5354d0cc43a09355a790882afe5a9a837dcf2d9f4456ac75594112c5e3f520400e23d7bc91d37499ac9533"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-CL/firefox-48.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "4d74b9de4b4f0ab8ec43290d7f11c0439a1050e8561ae5192ff4fd3d0576d7d1857c9e616ed75b6fe7da5207e284b9713cb7184e65b093e101cbcb25fd90f74f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-CL/firefox-48.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "77aa56f1fca65c9374f15f012ecf1bbe439b99ed6ebe9823cd7f820e06cb10014033a4f6abb914969d0a5b03564385910af2569eb060c6065b7d1ceab5bbe7ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-ES/firefox-48.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "9e93a646c345a5c129bd9472601dc9d1cf3955ee0e6ad44a4b55f2dec7dba7d133c865d2c8b59383f48b1a870e2e02f781c93ced3811b03873e9c2d241ba0513"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-ES/firefox-48.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "488b79aba6acefe5a7973d63ba034eacc8894fd2e5aaea6c010af84975f45f00c49e85c003e876f1636a00dd396c6071511c84f61c0b6961ab677cee6b31ac3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-MX/firefox-48.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d2c353bc74b35d13f0e018ac8f8a1c3bba211524269b82188504e4b76701a2db2b085bea9c293caee4cd8ea8251d1c871ef0628bf7fe17123a0ca4475611dcc2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-MX/firefox-48.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "6bfea70619b2d9e853b36ad93ddc4b5b09c98279541eb737dda98009e61642fb9066ea097230fdfd942286d94fe512365fb48fa30ffddbde898589a471e02f89"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/et/firefox-48.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "c527a2736b3fabb6b248816e04373235281a5dd0f1275108fc006db1f2e48485bd5f413169f698f94d015aab2d6d8a00ba638a35eb574556453af2b8a2c20172"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/et/firefox-48.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "f3fad1f2f0256d0bdfabb3ce20eb475c1f54c762e3af1fec90565eb18cd7ef3603586c79821bfadca27eb7db42aad3a887abb348f955d394c8bbaad909314ce7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/eu/firefox-48.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "772423ee4b87e308d1dbda39265e6671a6576c3b950abcd2dbabe2491a8cc5b5b6fa8ddbb00504efa2f5f43b59339423ef1347a3a92b8f00f61ea4be5bab2c20"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/eu/firefox-48.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "0b87aff412594848f1aca67e766c2423e1f28ad294a42feb894a69514fbd97efe97e6c119a19daba21c8d09f6e205ecc94bf1c4d150a5b684f7990494dcd2524"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fa/firefox-48.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "9d8c4f63297198054074bf244f947cb92db29f70695c69c6fd54cc18844653e4dae1447543c8ad8b8687c20231d72b6965e59d552aafb6f4c35bde89839b3909"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fa/firefox-48.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "7f3248c02c142ec88a9a32eed0a3f9802b6ad18a6fa56a28f2b5fd580ca917850352bbb4193559686f9e95f53e8e85727afd500eb03e3b5181180a1e5022328a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ff/firefox-48.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "fc160572277bfdb35cd3fb9c5a5b0a39710c78de4782ed679b96ae00c6cdf22b14d99d62462679bb4ab9bd68b8f7dc3cf43fb390a382e31120c91b24a98993f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ff/firefox-48.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "c192466b8f92186a80895f5bfe1094747b214ace2135c72cbb19bd71a7fb7b77491c8af4648a88dcbf2a1235d73a408c6122d7b46fe923633bce8d7113f03298"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fi/firefox-48.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "98bb77f6ad8b39d506e4fb0666386332fa22f01f4b7362fd614ea951c3520b7f692e8282d1aa175d94d43c46c267c941d4cfd0d19b454a7345ce13f7a264b6bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fi/firefox-48.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "14bf0b3a34dd2a6a7b5d0dcf8f5c0313e643f8a730afda92ab94afcf8505bed895724098e991c28344851288180d25e18b5327c44c742918d7e83007177cfb6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fr/firefox-48.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "b6a4ba15cc2c4d0f9aac90789e86f69d983e7dd33b744d213fa856259b57192e403ec67fce870d710782f0c0d3c24ae23a38bcb101d60efc967e87bf9efc43af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fr/firefox-48.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "dba11e63b3435fe2665f5437147d854ac590394e1f270bc0ea9638f0f8622a8639ce54c74fb2ef0b75cc6df2eeaf28fa21ae4aec6a41637fa2b107581970ec4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fy-NL/firefox-48.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "6be75948bacadfb5de5f49f5a1455294e5a511aaa30cd9575823c91b304b1f433fa5e10c146d971497f23052e6e2db2111d740ffb9e48ea8aafac81fd5477ff8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fy-NL/firefox-48.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6e7e28ff66b29d39e87625711da4d83e376cca5521f8734b25b60b34e9bd350fb6b24a982306b902bfacbf367d9ebc3bb0d1de0d9d4f7fec39f5629aaeaec79b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ga-IE/firefox-48.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "22a3def2c74cefd8d7a254f4b746b1d131d9bc508f686c2027ad29bafd31a4e414d10a94d0c8c8ab7a4ac59b8a453e98183ce5e7597fd1624710803c139e704a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ga-IE/firefox-48.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "cc5ada6a14ca46a89a8d20deefd7da57b012ec1cf2a271e6327de676639217b67d60208c9bbf4ea88418b5447ca62dd2addc584613e55a51afe04b3fbafe4a60"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gd/firefox-48.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1c25a5d9c95c38faa1f9ee2709b1dbd2c3adad7b7c0d18a56dfb0e16b61cb0b47683e259d2876e2cce5a25c738fcec422939e417e3cc71229917af043a6425ac"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gd/firefox-48.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "c4f68019652565cb4fd9c3f7da7ff476442a6d2f168531db40f29524bf4b4961b04de98effefdbff935c8a7bd110fad0cd72aa229500348bda16807d55fa5de6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gl/firefox-48.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "a74a1c2f18c2955f643315bf896d7ad2ca2b0f42c84622244c8ecb448911acb9a8aceb27e15b7f643c95293d7afef625ad7c6b927732e670f811a99287ccce3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gl/firefox-48.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "51cb84043f5bccb269c39fd7d043445d70a750ebc13fa85d902aabeafdd72d6696eaf0b955a0e040abec44c9134ba6709b67f7b635b80ad45eb78fa5a1013d44"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gn/firefox-48.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "f05f87f4be059f08a874cd28b5eea0a8be071bf548e726f9e14a47f0d96f9d0d9417cebb92919020fd5fc40801e83455a543270d61ce83652909508eac43d5a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gn/firefox-48.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "29f9a5895df46fb1844e447b1289b791d42b14250f814875afe67873cb00aba43d62175f29debc5d099abb9b0b4050465d2180d25987ec721d747ab46f433f47"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gu-IN/firefox-48.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "b45dcf6d34b54bf69f36f49fd71589257ed6ce039315e50737c2ef4434917fb6b8dac18a4ee903575808d02762282620b9830c564578b87c1d4a5bd5a2234d30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gu-IN/firefox-48.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "efe560a176f13da9995ca59e5b8858d0c7a06c91aeebf361affcbecb0f0de88c977d33b15eb8ec9f80f305000b0ef2b621addf44cfa9ff4fbfb740b937b441f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/he/firefox-48.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "314706b90bfd6ea3c94c28f880284992b0886897a4576c5c55b6bc2b02aa31e7050ccc11af1d5a085633a7fe65dd5fd03a435fc378c64ca5ddaa10ed91853f58"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/he/firefox-48.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "44b716392d79a000732a3ce2737f2367f65d855481c7a0d75f33898812a49abcbe73ed6c57a983035a6628b5f80ecf3921a336e4f45c964a7d52145c71c73b48"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hi-IN/firefox-48.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "03b36a04acfaf4a2e79a0e34368292723aa9aabbb2f4a0f0508dc8a7c7511133d18973ae08fe00b2ea571976ed6acabec44092694fc230c4cdaeee174d6aacb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hi-IN/firefox-48.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "7d1b3d4e3b33c61d63671f4ec4a36e422c2ae99c192231bfd70d98c68b81a8ea61b0538e8efa47a3ad4b23ba58e405dcdd8044a7403aa1ff241aaf4ab76d4eec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hr/firefox-48.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "eb445e988d3ad1b009c1a8f92e07aafc38babcc8641c92b161efede4b7079731e72140d609cadf6220bbba23e3146ccabfd7fe875836c962ca4b12f451e8ac00"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hr/firefox-48.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "dbb8fa4458a36c403f68642c41c15fbd9cf1e7a703805ebdde827b9bf25752885c0263c1a604f37d0508994513259a2e3719b288fa9ed4d0b563d82e0e5f0dd9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hsb/firefox-48.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "e2b7c81ff1c57f1e656169fd206f33660718278468f062e46249b875babc6598857bcfcb884ac658ebe907e745413c82d948d8bf7a0ec34617a55cb0ae90f7e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hsb/firefox-48.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "14544652977e0faa49cb5727e283e1e6cf59df14194b67777ee151e37ea68c53ed8efb2b5000233ffe8efa530ca881d4e84a7b5bf281a0f51d8baffb115f11fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hu/firefox-48.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "072c40fac3ce476abed251140e71b1c537aa61ba29460bc26a6cbf224a43fd926cd2e690929c108e0437537025fe0a45fdda71fc2ac6637385a0e75678330cf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hu/firefox-48.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "e9893aaab901d03e9563bf84839577d55942f8d78d1f520388922392d7e7101d7752354816696f6fb1ab77bc2473b0cdaa7b2c62d6412c33c6616353f0b9a984"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hy-AM/firefox-48.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "bd4f2e7a1c9c7ab1558caced2716acd3e0d3441873dc00f1fcef9e20bc2b25e1d3ec3d520a378c3b8fe9bac36a500d745516f16f14aa9b530c9ad940565690f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hy-AM/firefox-48.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "e36ba4db7706d08d03c84cf3a78c20c60e7e67ebed01943d54b1483ec86e5b2f17dc7a1319c29863e7f6fd3b35ff390d1b462692c06c8ec26c164c0daa251dfb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/id/firefox-48.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "61cba41c80783921039ecb5038bc16da52e8191e38b8dd8d276225fe21f6bf1c8628d0e8f15292e02fa07a962ca355d7173f0dce6cd3b2259f87b823d2ce70ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/id/firefox-48.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "12ca05a297c65780d1a2df33aec2bed06498db34e98283053b1f7082e96fd83f92d320a8db91d7e4bd44405c21c5d276913f47403da479cacb3a082f6d1e43fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/is/firefox-48.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7df3200095a8b8b02bbf41f1a160e4557e059e514ffa4ef25c0dc0e274c319677d134cd8d2583e4ec51bed68091ca7cb8b13bf6e26afd682398ed285dc055da7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/is/firefox-48.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "c55649493a8bd47a9d53ffc8d6c22f741550fc40124f54bce320c96a73316e6c48229e12d0615c48b55e873b3ddddf38320987af5a109db68f53646e3c8206a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/it/firefox-48.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "f42fc4acdb2f30650c62dd8ff440e1def00920a1481f8f008565517bb535459773f8c7a39d7d89edcac91b683f92eeeac41c0c4d4c5d4fbf6d74f66ddf528a07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/it/firefox-48.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "c7828610404f8bf93f3dde1feaf713e3111a7d3a6db792b013ecfc0dc225782d537d5842ac35af292451a7c5e475407655f246881472575d2912d0c607b52c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ja/firefox-48.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "9464f9a33ca3d0fbee32df31d1fe677ff298b21209986db8cc4893ff9414a96b885fa408f36d32c95e68274e2815a77be02c3859754c217874a5d3c0b6d280d6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ja/firefox-48.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "d150ad3102d90bcb755bd91c9960710c64518b7ffa445a6f4e15055a449eb9aeb4203084180cf2234c000dbe98620ac91fc9dc453415cb7e981457c43d08ae4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/kk/firefox-48.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "d28ad5965aa76f2525164045a06118a289cd543b1b9afd7e0681da4739467858a2c1eaf3a7aab1002c3c18d51a3a5623801d974c0230b78a07a664016d302b33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/kk/firefox-48.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "4846ea6f4834cb21b609d1c71b3efbd75bc5a98b63cda04d152c18e0b22ff5980004e01d09aeb83a108ba2c401e655e5b6b2e5ea1a2e9fd707b1bb409c46f3c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/km/firefox-48.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "6d3fca317792c6929e55fc0757f72decbbd2f714f259fe53eeb549d0b85984745dd1177aa15d68bc352a541703d1d3f4983943b03c4d3cdc2edb6e57c1cfc2dc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/km/firefox-48.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "c719b3631626d57da3d14a1ae356122b3df1f3c92a1633e2f85ecdaed9ac83abf066cd2ea5ce679e6e38dbc1d1f6839e2f3df9ff2f8e217f25bd25900693f47e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/kn/firefox-48.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "76faf5f9b98e4a13a42c71df7411fa51c0b6def1d973970c149b18adfa36b2e2eb14c94e3371d303abb3d0c7e226d9d42b15cb7a77d161fe404a4c567fea01ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/kn/firefox-48.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "a772a4adf418adf933bf82379cc3b69c4f5e426ed63d4d6458a87b005a59070cd035a483718dedb433d9401f4da4dbec70e0a5e920f5046478a1aaa4547547e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ko/firefox-48.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ada95e8e3367ac30c91be660a037de18c5bb9edaf10d8a078d8c5f37c954717c3e33b710249274faf5e95409f9f67cef28f28d2ab34e452deae4fb66ab01bad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ko/firefox-48.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "dda86dbbd40721ac85c9b8486dd54a33fc5978ca79312cabfeb7700e0fbba809062c3b6be61e6c784c6b479f435d4ab886c2a6788dd115585af9e9f277ba6192"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lij/firefox-48.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "f9053b301331d36710e31fe6d2172a98af5219e9900d60810bb02eaf1f19e6f4db6e0500de6ef6e77acd4705fdb0bc5025e9db52ef44bb79d82c674b53eee6e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lij/firefox-48.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "63a4b697a1295b92b93d8602abb027be6a07cc58c45ade11957f716d91b3670015901ae6f5a667c4119798f4135c59be128f3c8e97c7ed6dc69b7f2f40c7d58d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lt/firefox-48.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "77dc96b596e3010cdad83d3ce2b23f075672ddae73999652fbff24c85ef7ec0a749c1793b77eb7d34bb9c8beb6803d97c8ccc84b8f6ec02a8629c895d1a3400f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lt/firefox-48.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "f7252d515e700fae4ffe31219b0135629d50487359947ad2b6d7a61e578b20997b95c4c2a7930b93f1b59ab9262a8b28bcfad22c14fc98029043339e3f2318aa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lv/firefox-48.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "44d97dc8855004fd91b96155592edd4f6ac9e92257814eae2727df0a4e1df496e1be13fb95c0e2ba6d0e31e8ea12df659317cc5ac8d005322075c9d8d13a67ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lv/firefox-48.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "1fa86b8f8cfaec70db3c6033276f1b5a943e2065d78754f873c7ca99897f0195e0793bec936d2471b814a90c5a211a9653d8ef5480d64cd1fa9c49d7f8ed34bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mai/firefox-48.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "df4e98b7414b58c145e7fe82b78c66c5d8a7fa8dbb34f78b91f9160ce3bb9e22ab065485de15e13d3660186760a9cb3c88403e8955ad092064eaab29f8dfe9b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mai/firefox-48.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "7bf726777eaa92f4a18107c4be48024cb2a7ae4a3aa9d94cf55a6b0fa46ab7256f097e7f7c610ae1f748c376063b7dd275f03dc7664e86fc738b867671e5d231"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mk/firefox-48.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "7c48c47f916ac8389b5b10bae29d40820b59b3e52fc86b1408c426f4ed662f49243fbe6e7267b17ed3ff9dc179b435fbfa2516dce974972097fb39985039b4e3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mk/firefox-48.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b184dc34a47a9336190ff0090140b47ca345b9445dfe40133ed08ba30bb9966e1f7b5488a5289ddc4d84cb4de0b7121824ed6570afe857f0da8ebf6ab26a5c4b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ml/firefox-48.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "cb363c7b01ba9d252375b4f01d9515561bec11d72655730aa7c05d95d8ac4ba58288c64638543bcc48fb36387e6ea4e4604f34616d8b90ea068e09f7bfb8be61"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ml/firefox-48.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "789aaaf1495740adbcc4ffc90ffe0e3dd2b7d1822444bea6676bddcad228aaecb0a67916560cac892067383f2faca06b066782e8a40f39928e7cdf2370a3f0f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mr/firefox-48.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "d6a45cf0bf37fcf67369bfd9a3e0fd2a3fa4b1538a905e419915d5eaa350f812739de97179f2efcedf5aa2fa0571f555fe4012bd05a39adc331a34bab934808e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mr/firefox-48.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "46bac718bade7205bd307b7c1ec9957d245c18d305f08d9c2263e070128f49d4fb7e4fbd3b1270866a1aeae8e726a21e7befb884af8d86bf323bc6723cc05c63"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ms/firefox-48.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "490fc881444dcdda259719b2545de34b8a3759d6f13a4d66cdd449fb629948bf6ded39576a2ffa53ef6d83ff16854c8c0b8521001ce3f43abf1f35387c8d6191"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ms/firefox-48.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "fc4c0588aeec05fdb2d65adadbacb210d04470e9588b3950d2011ab0e667311aed76262888f9870a4ce409370d8ed19b3d481437bef72960b151f76d0eb7ecb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nb-NO/firefox-48.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "d75931b47ede66d7c5025c4fabfdd918f21b0f66a9d8c2a5e772d3d26d941926da4f0852ac8dab92dc9236a0aec4b5cc1eadf5132d00721a91676cff1d7076cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nb-NO/firefox-48.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e42a91e469b87235a8deed1e4564899287dd568d0ae93ebe139d499d9d5f59aafc327178a86f36f5f44d90ffb404907c80643f00f1160014708f061afe1e17a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nl/firefox-48.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "e0dbe6187eadcf305546f2916c8d21c6ae6dfa634aa30b51002a8d2ddda412cb35fd2c6cf5a44ab42c9805ec3a6c3322132e5121b04476935d7f67d30291011f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nl/firefox-48.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "56b674761390018c7bbfdc8523b0ccef1d66576478cee43a6464d6df3e0da741ed9775e7ab48abf57028f62f43d91d8a0e7b17a8ce301c87ee576f9daaceb1f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nn-NO/firefox-48.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a18693969b1d3f8824ecdc705c3b577dc1288cd5ba47ca0e3cd8e88d0a5a01927f87e56a2beff62d3ca9e6aa325619221f2f134c8c95b0687a49bc0f2cfc2ada"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nn-NO/firefox-48.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "73874b50e63de07f73de2feac7a907dfb4e0eb014d913ea433c2f7d3ce9050b8ba811b72884ff7129a149ee38a30603246aaa55d81f11bb80e9fdfff87ba9120"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/or/firefox-48.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "de8dc3c4b91e96c5e49b32197e1351717cd1b359ba3802c9f0fd39516f25d4df7a9a57b4d4058d32e1d31af3c0ca8e1a8fd3fb4edbdb9718dc51f0881499bb0e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/or/firefox-48.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "999a71a5f978e2cf507966ac465ae170b4c01602c703b7ee85fa02224c8edb0f789d35bb0a20a5f72c86782a95943e9f8f4bfca301fd74ecc7f063f35bfe1f4c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pa-IN/firefox-48.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7378012baf763bdab21238f306244be208c20ade796cb15e2801133f0ac8b00cd92a86403d9591d5c2af94ea6fafd7162953ce88b5e9148fd447118128b2398f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pa-IN/firefox-48.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "b20490e7303aeecb8d7b158464dd1a4f4b70979d74d0c4f2f15661abd0403dacb4674ea1bc2a09ce5b04ebed2987eab4475e839786e63dfb2f1eedfc44ec021c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pl/firefox-48.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "e0cf99f816eeca80e7f2a5344b11202be124e1fa1f7a2c206ffb5c349556e0a2d5a7a3c653538bbb867c0a4d19eb9126c947806e0f021b68a9268d1913a178c3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pl/firefox-48.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "fe27c64b344f6d02e09e240f1a8c45236c9632c2ea9422ede227ef4c1890bb81c049a8c320e4a53cc818c129927e289f8279a64cf15655563958af23b4ca7076"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pt-BR/firefox-48.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "868461b1d4d971ae4af0010bffa03012940758fd5ae10c05045c77fd5bd0f50997775a1c390f1cdc553197eceb583de47659ce84055145a290ca81e6e66a0a36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pt-BR/firefox-48.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ff50b389d0c653db38a4ab8bf3b28095ca81b30340e973315bfccedfc737e9e853711d813fb08c52178e9948f49f7ec1bf7ae7958d611c1998fe938a9478b657"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pt-PT/firefox-48.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "6a786c014c60268c8d24ca99e40106571fcc1777afef117a0125f7a78658f41cdcab4b16bfc2dd4c7ee520af0753b0b4180fcdcf32eaca8dfec7975146a08a60"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pt-PT/firefox-48.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "56e911a6b2839a10c3d06b76bcdf0b746fb45fa0ced80c466d240a31cf7e6aba6df21b98dec1a4d3bf11baba2f530dbf06d1f94706b622acd2b08f2b2ef9ebf4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/rm/firefox-48.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "88fe9ad3d7afc11e195f40ec0bddb4ab5e04446e08f9317f82733e32e536d32b2a68a1ebb235f8cca828555c4b315911dbba178159f12f8bb2cad64a8a44511a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/rm/firefox-48.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "5153adba79e65368d1e901dc557d311b637d8e9b0506ba979246bd1ab6d5e31e2d885a73be704488457e051e81467412bd45a6c74d30e20198d9309f6ce59dd6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ro/firefox-48.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "faea58185a6bf7d57134b218a058ed4a3abf4d51dec96a5f5dde0f04daf2a2c8c76846bef8b8b43ed7fce05b4c6431fad52ee61f4e47ad62be95ef8b8914a726"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ro/firefox-48.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "319792a258e2ba40cceeabf5b0879c2572811484046bf34fa04b213c083391de20da1bcdb654294ac961a8b818f0c9c9287f32948e65eb50f3a85f43b15e538b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ru/firefox-48.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "ec44f3a0d95beaebf99e9492c7457ecf3857899d4587e8d27ecbd2205d5b4a1c1d0159f471ccdff01b5d9efdeda9dcdf28bb84bbd12c73e676ea0baeafe0afbf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ru/firefox-48.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "3525382dcd7b2ee2f3ce847245216c0b8925679d539ef2f83e43d9062be06724db6f66b9b4747f3e20c5e7355e4b6ecabd816c07f201f2afe921570905cd0a3f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/si/firefox-48.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "6cb64f9fa85fe4adddaf68f0a221da8b2dd92625b2302102ad530c15d51c6ca1994ba53a300ab1c054da1fc20c5073deb308a46060ee6d7ab6ca843a930a6138"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/si/firefox-48.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "499dd5b16a48ecca536379fec41fc9ebefc71ae12963bac44dd0d76014709e2ab219869f3b3fb08f5196b051ec8a7e519fb994b15613559b38b35c4e6d8bbfcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sk/firefox-48.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "11a73be8c2f801be0a46831b81980c2a9b2b9a4a645a710d01fb0d9a8e2de91ee18ea57c23b73b25e091bf88b15351a8fa261c349e9768d200172ea053e5c465"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sk/firefox-48.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "07e1462282e2484b58ba6b413034081a3e99ac907d7285f207530cb46d6ee61a6b166bb9d8820ca696789b57a0dcc3c1dc058975688d06b63b32f8a7a65974d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sl/firefox-48.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "64d0b5cfefc8e98c8ede5497164be13854334f72d1e526a08d43d6712e6286ae509347805e9329cb38bb8f4708615d51e56221309198071c0b6ecd6c7dfdfbb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sl/firefox-48.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "d6e727ca07084eefc02b2287a286daf6302ea0cc3c8fcc22f238ce2c9074e95c0ec031068acdeb34277786670a91faf85027c9ae5acb963d150b1a89e534f98f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/son/firefox-48.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "9ac81b861b81d7cd4e9e71b6cf72a1bd8469c8190371b93b41034596148d831ef7f231b84de9cb8e520d7e3e92e83fdaf2290bca5e9c578ade17e0dfab41293a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/son/firefox-48.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "9759f52732b9a84b8c6b3237356b0ec1c2aa0a2a1db79164cee491e761a9e10d88e931f73a5bbf0b7ed184738c44d12e542903577e1f0811f823853d43daf2d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sq/firefox-48.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "c7bc8ec81124127735d49d74bb12b77de24a5a851c34c3728adc752596e04c6b1ebeaf1a361fbca36631135cd9e385664adaef4d3c76ecea4d41cf88d7b6adfd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sq/firefox-48.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "aa7b7c20f372f23d507aa7bfd088b2d2306b267a3cbf1b0004400d29b96187d9ea74a77933b9dcc42ef081d7dcb8db56b397d37ff001c61bed22976a6435d3b8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sr/firefox-48.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "cdef642d72e3c3e33c1e2cfb8a5005249719390ce732b06ffeb15b01a77539263605fd8657ac8cbe8acfa2c92b2e1c0dd2168728ae2578e25453d6d79c06a17b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sr/firefox-48.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "f12bbabaefb8811d3babe7b3673fd7f281645bb8bba0372594cca4fee4e0b81afedf46378fef714c1e624ede6039c913f66bb227a2d076a6950a0e623606adad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sv-SE/firefox-48.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "dac4342478d5a8e2743c6cbb44f58774be0b9bb96d9ec7a94b4ef41d093e76a511ff914d323ee5aa55cd8a00292c477e41eb0bb9fe37cfd91c89fae432a661b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sv-SE/firefox-48.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "44323f6ff400058dad98f2e7a2f82afd52d706fecd34e7a6dd1780f45b6af77d2f6e892e2aa33784e4624f40ec5251e494ad0b8f95bbc11351dca94c599b405f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ta/firefox-48.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "cac58900c6d169d1ef3828b4627c36c86224e21a011141c8bbf9fd3df3ea3bcddb5ba821d7d8ac9f5e6f5e348d1ae3cd92cbf2c151d380c22cb925f595cb637e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ta/firefox-48.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "38fba18d8edc2a4fd614a39b77aeeafeafea98e1dbc3bc2863284bbc2b7b07d28b273da9e3fa0bcabac90bd8049dc295db3d28e0dd0f1f522bb496f06d7e7c5d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/te/firefox-48.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "25adccb31523a1159fa9022791198869d87c8ef44deb8e3d7626a2500ddd82fa977d3c294d755b7e0385eb4dc80e00067091da78c65ece26e45b3ab9f2a4676c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/te/firefox-48.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "550ba329d8c968fda79d0dbc7291f83bfd66227ba60a79c697cfb29a81216d3323853a651e401a0a8d02c658093330470b42bc0b91f4e27bcde368b33072ed8f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/th/firefox-48.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "a41abdaa15a97e55e0062a9f114a80bdc0e750112c15fe7204124aa1f9e54ad3caa1515caf145cf5e5269f41d1b32d8a0c2fa6691612e1b36fbcbc685ba17f79"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/th/firefox-48.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "ecd440389c07042aaf7aad74a135562eaf60c23f840bea0b9b3b62438610c0adf8de1c2ca57ab700f70913ee498317d92fd1c00f92d1af5d6d50a95c15d9bf72"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/tr/firefox-48.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "06b828afd3c9a89aaa448d9a8e18579142cf19d0008c409e115bb0148c4cb298eb2e896bdf20f3593f5f873489eb9b701104643d6088218c98e7b2ed44a6a775"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/tr/firefox-48.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "3107986002dd0b05fc10de856a532c40d5c38291bfbea07948b2c4fefe9cc2d4f5d8567b0e9856ec7fbbc7004078bc485a572b1a1dacf444db5c71aa7684edc6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/uk/firefox-48.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "9e6d5854a468c5ecc942735c89d740fc8e304053f6e07a9caa3960dbf95e4cb9a6c7c0dd2e9e951bb49314c4cf0385a5a99ad7df6700ba21b9816f6aa3c77689"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/uk/firefox-48.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "ef021c365d2ef8d2eeaa6a92ac5d9d979361de30e2de06c7442f2085d66719a9fa876f77393737778f5b8afa29cff1898a0ac638df2e45b6c54e0c25c7c9b2b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/uz/firefox-48.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "d15770f8b6db9f55ecaff13d27a0c2559c032870873930c420fcd2d94c79ef3853138e42fe4205b5ac8af33aafcd6b2130c712025ef49801717b153e416058bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/uz/firefox-48.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "4b47c53585f3ed44d80d0099596ab710dc6565499c2f9ce0ed38ac24274882d5bdab16260c4c67c73b1b93b4fe9a8ceb0ca135b2d432fdae28c91025d1cb2e9d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/vi/firefox-48.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "2d2dfc0c5515dac6bbc337acb41d72aad101837caa75257a1e369991ca93dac0bbc4cc3b31c8457f76ccba18afc9751eba33b9f602777a65d65da5ce0c208858"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/vi/firefox-48.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7afafaee8de0e47d8e9919bb60da7cd361b18ee15b764522d9609e44e1aeac3ca8b5ffa97c23430a66efc4f38c28a5ffdc05bb4a46734ad2e3388f587b16110f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/xh/firefox-48.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "b86ceb71c96d19e92af81604925b005eef63c7a55ce5fd9c1176017c9938389c30a5d91134c3d900a4a0635dcad7b25233f39848f9b50fee4e1ca1520dcf2c95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/xh/firefox-48.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c6ed1a65b72d6d63b4c031da93fa1e07cca97027d2a3dedc15e9cd2ffc21b371236e1b2cdeae02534e37c7efe6112cdbce0e5924e872c76e057cd59445ceef04"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/zh-CN/firefox-48.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "90ea550631d4b3a314b56896d1eeff147e42e41667a94f6457fd18cd2c4bf0e18ca3134e4dc20696a2a30ad9795cfeb454908cb99c580b30bd5eb147e53004cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/zh-CN/firefox-48.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3ef020131a05958aff64d5d313aa8bcb92801d1ea0215406532efa55cbc66291d976e7aaa9bb11b38d35634d3e2ead7f838a7d908066e0b36b65d41767d38583"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/zh-TW/firefox-48.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "8725261467ff069d523d6e813ca04a8912a21df2fada21cfc8c9442aada3a882fbab7468fed376a2a16be121caf68e74de21fffbd1b9345bd68923dffa2c4a31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/zh-TW/firefox-48.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "172fe85c404b8ae7e073e11953a74896a07238c89077fc487be2dbb52a43fa183dd1ec17fb43971b2ada95c8c85a6aeb2b5bd9b637f0de8a3322a57b18783255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "0de4b3f60fbf1064e326cfc33ce7d70298658e371db915b2122ee1a1d6de31d4e8a0b02c07588404ef57c69fde4eab5a238c03eee2ee2657cfacdc2d265f985c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "2c847a2fa2a384ffda0c85afc7b733cf8b124d0b613f2c216a6db9dd954d2aecf651479512c84d1521d33ddec1ab2d779c62a49a79459ab1609a9b0ac7c5c178"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "b13aaae5e3d858aac792046acf349a80bd6eadb09c806940e658b8bef6baa35aadd9b522b6022df715dbd987ab25edaa9b94804d4563338430345751b3ee02cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "7c1d7dd4676975ccdeda9e3c8ce9a222e820e10b2f31487dc75bd1237107b97631aa6f77ca68190b0befebd3c684d069fa339404220449a85fc967e4e439f792"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "648309ff9f8fe4882a12cee33e2d7b25bd5d7e6b95e7954e72db4288543b8710d05d229a20ce8f5670e36851f6eb6cdb3cc6443333a85e949762587ac2e1d982"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "beaaf6446c5781ba3c3cfbd9ba8ccb235bd304833013fc85f7fd2825a834d273cbb26dade2a69c3be3e8b6426e63ba2c7415939230ac9e306c7a28fa2c891fe0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "0da217c2e4861ad3c44ad9c5affa5faabb92f2121fa7f8d36bb2a56ffc117f9d5042d7be35e9f5f195d40e837a4068e0ff6fdba4c366fc4afeab0e3933b52364"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2c9e86534dc7f52073926fed39b83a0ba311f64296ef3601c17cdf6d6f3d8a13431b9b2ca6ffcc8fcc013cbb380de1424a22c8c13c434ed55f1f463fabc3ebf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "b15eb9fda35c60e2c1cd773b829e52e9af04e79aa2bdaf376f8a23c63281329bbfc293e54e24aee3b7bf07832186ba8380829d5da54073c7f0628c55ceab5bb0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "47cacdf0b8dcca68db49f1f5f0d895703983031cf4acaa0ff9b020434a90bd811f32fabe07333f0557eb4a2600cc80a16e958ccddd85a0567fe69463a174907a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "8d2e4099eb57c3d7799fb644285649c5193ec2335dbf12e30b5a970c6ea2c3eaad4ee5148bebae0e61c5ae9edbc92b25218e3b923c6b44e8ec236ad321451c86"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "619f4df87560cb4b515fefa62ae4367cef578bd06274fb9d1551d2f9c9ee2d45f856a3d7d8cb9db614e2d2aed872185c1dbb900a075748a0a48b6589aae86cd1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "eb34881fba6b7a87aede47075125c1c1a66b066521a389246d1093c3a882fcf8112617de50412f1b7588ae71393d09e49a8f680ff62e186e977b09cd117a15cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "a37b2dbc0f5490d71130fc767049d7017c34d7e8403f6da69ce541fcda8166cf7884308e692087960834637576dc1387185e5cc81a40632675432d767901700e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "7d5c4ca76355ac8ae1c961f33b806376d0741b479c24ba012cf3f8b07f9f49fdbbe52ffbc65216d3cd0e1f6fb71b74f5de4862fd6ad64ab7ee7ed6fc2c25dc70"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "ec04b7df8404887d96ec63e77dbb9c7e61c33b9de495579e8927e0de0c3bec45304d4a8c6310d832e3e256d3516c2f0938ec490e6b748d0d7f9ae105276a9c95"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "0d1e23364fec592d2b72e6af08214c446b28091fc984a09edc23f5289460c0b51bc542cb280ab99fd48a856178eb548be42fdf2f6534f506035502770d768db7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "bf585697d2361accd737e5bc6c23a9d07fb66f7e1e1e1c43b72b4ff746775141b3160378df4da87d8cf3c7d67f0c77fafccdd1f4bd10db4b1ad9a8b95e928a54"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "5376bfb90611243c73b9251c6c8bbbabf7fff237cdeb7f51b46096b7e09424e44da8d5f266e28c6343f533f1ec254e41710bd2317b6c63165a16d6e24b810538"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "309b7c3b93bc7eae54efafba450d6f3d8e0fcde06c1a5caad75436c89f9a74f6ca1c20b024ce4052930e74eb98cce653cc94e3e676c99edaeffe1637dc6dccbc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "4e3af162c46809af920f7d5f0b2539dd0ffc1709b416483f2c35cbcaa3102849a9b11507bf8b38bec2d5bfb2afdb9ff054edd8060f35bd07ae9a1d6c6b9379f7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "94c633d5cc99fd7fb7790d48261bb853b19338313b68216898118574d8b9c2e0ca7d4605cba6dc93adf6da43c0931c45f2100077c8a4ca9f14415d873e383272"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "e1a0bffb1c255d8a53757866ab66d3aa3b023a2d5b8a46d165ecce41d3a1f2ddcaadca9eee0992de50867eae80a4e75cd13bb70a49ef3f5642a2d5fed21a0da2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "a2bdc5b0aa3fa63e19a6c53738f087324e29e12c9a75b3c3baf6c34c265efe0d707a77cdc0a669dca4b3fd188590ac185c53e0a0231db3f4ebabd8c9d6f5856c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "81e2400333ca920427f1726d1df49471987ac3a16af9c9725dc35c6a93132860c58f6efe3b925c07b6fa9347f0ae46fc3e3c31a567178acb011e2b4706f876b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "272c756fbae4010e48352a2660700794f0a84e8613eecc176dcaedeed182f76124f696596569c2ab98c54f5808adc83a1cbdc4635e7e3e573ba6da63028c735f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "a4a828bd92157a74dc4bb6a12c9a3ef56f7ba9e12d49953b4dc8eac87d451aded29db4bcae24083a8901032ea991669b6d08daf7ef9aa8802dce2a4e9e239366"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "057f41ad9f98627efe254a796a35b366c391084107f09dccd400255f3690cce4b674cb7d4e1cf2b194aac760b133f239e74b02db26e8b18d0717634b4333a69e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "393275176115bf1a543aea51dd0411946432ac49802924597cec53d7f340e7eeca2e2d09c308f6dbc20cf33939b489bbcce222fd6d82d39edb2301ee2f535596"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "78d264c1491e35aad25fc46c24f56e2206c99c21e1ae7fb250f4ffd827d3178c66ace6a198eb431e3cc0bc7d6d39873fdac4b840fa203e66225de40a2e779ac1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "bd5aa94770c99491a22d705bd2d4c64cf72664c5db2376aaada18a541552415c65713a3dfc8b47b6fdbf4f21e550911a5768dc5a9bc6f78b4805ee3511764434"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "68f664261acc8caabd634ef4f206bd09040b55190c3041877e8902168b6c82ffae37660ee8fc19395ecc52fcb6ec206309b90a88e6e4ef080c1306b62c415f2d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "fbe182f455db611a4b8494bf9d1bec1921c793a62a99c65059c3f39884f304a15774c9ee0394882b752e8788da257451633a47099c0b80fd515e4cbb326103bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "d22cd7f5685c9e35a0700688ab44ea1d9c352bd9277af8161f6a2f1f0fc0beeb79ffb2fdbaa0ce7277cec8313d58e740e9caf9117edcf5320131074027e48c8b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "f40fb48953771ddf2060089a73ecc9323410788f02dc85d6f1ef3fdba8b680eb052ea4bdafe719b503c1e0ff39657df0c351fc94c2e5862316070edbe68c6338"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "88169c6ef6567b3e9b22b210fa6be61886ccc1c4af457fcbad48777d7685cf90360cf7d30ec51caaff4d322ee56899596b2a641c45c75dd92752acc256f73d88"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "4dcf5d29b5d1d536b19f0a671f8e517e667752c444f2e43be1e26014ff3d5c20e7522709c377268a7d9466e1f651c777849d73779fd86d7caaab0e99a9f87fb6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a64027f28f9736a074df402628516afe13711d026bf7092427a714768edd0b15bd15a8daf37514cb22ad75ec9f8e386b2dd37896091ea5b1e909ed3b3c36930f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e09649bb2d027f112e727a30ee4a35f4695da548d9b9888301051d97cd39ec247162c4bf614be7306a62439b1a37f2fbe85b53b67ee577dd2c56d5fe88e5f435"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "c60267ff5251de8553558595fb78ea5f4fa73eac89bb894bf1aaff6707937fbaf41204ae7a834b81baa0353a1576c18cd66e1df2340f5909887e137b1cd77da7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "2ae8271f66f1d4b38e960116db885b085d47eacfe9cbbd1915ffeb372cb5db1fcbff8ec86854bd96891284b33bbbcbc4954a84f6474755b070dabd0feb64bc4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "10bb074ea81e4ef030a3044de565239124b63be4e7e19ceddebd9ab2cded7f5b895df8ad4db4c3998be296abead6c81b2d98532d15b0a6105b4732250513e2c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "e19a0154605b631dcb3ac0cf35a81f00adf9ccdbb43e9847c3f6f29efff92f6336577f685fffe491dc371af8f93a70ce1de753d7b196f5c6c341140c403ea8ec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "fcd028415d4ec616b5e6ca32be6ac9a29ce6d7e970c3040daa449ac7dfd61a71632a32e661be4bd290620690dbcb7230b83c3ec9f089b562f409b5696bc94074"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ce2f2789d098e15950ef4c26f97db1f77e5e2517c6031b3087d9dd455ce7009508bc4e1532ca5d2c7eea3b85fe2a20ac7753fcbda8059454bdfd4ecf22943e2d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "2c9969affaed0983937ad6d859e9b1c366fb0aa2567f36001794b15d3f311f9f2f7ce5e928c3f7e8a2dac2ae02b296768b7fd0e515cf2891fe9614c8e7169a5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "4adf57d0744848e5a73b57ff86211485673fbe0244d850dabe0570b385e0ace62d75f24d2eeebecd9fde395e293c79d8574f633f0dc3c292265d17e1d21512ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "a06ff42e2c14043d2a67d770440b2cc8be5f50add760ffdf1a2c6745526e9b3781615ea5d0c1e67115b93efbfaacb2a3d1231a97ffcfe0eda000a366858b8b3a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "49b956a1e12571fdf73002203b506969ad07878909884fdb94678851ebb22b0697d33e73fd6e7776505125c61c6705bfa0906f2792d42ab1e88359eced4c9cbc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "3d753b8a8641e5b8c4d9797c06e6bec0b50d1991da754d5edbff7eff38a790cbcffe1182eb4578d5f0e32d5511175b6ed7045c25b3f6015120702110c262b57a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "699447ddd3ed4488481d3cb5d8cbe3fa38a122faef8917489d4165263922aa2186699f611abb645baeee160c20f1dd9e8174ebef5cbfe1cafb5efd966b94c55a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "3dab7fc2e16b83454e1cc238a8ff7344a939e303324e6553c0cf2511a03f6fd3b34719d539a5d3edf2bcb66f20f6faa440b36cb0c5857c34d24e944ecbaf62c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "0d2f165890fc8677cdf99f1000baa7737dbdd6fe500506a3c1e82c7eb546256059f5178fa398c8ec197f4516163db4b01db1e6824c00697973ce656034b2205f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ca2b3327f1ffdf0d016bb8c8a239c64840d42193ad0cad2bca0af6d3f8dd3d4448c78dae13c840f76c28ea4c7dfbedcc1edb67f42592e501a969de0294d553bf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "17500df7d02f24c128fd4eaf2cf154b8a7b5137a6b9b7f2533cfeab660b173e303e35116bb86f0934df282f80c73fb77aa66ab5258391fab6249691279595e92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "5adfb6e35d905fd079f476a93b24aa6075156299aeaf7ffcec11ffffd50b3b558ce17b48226340408389abe7af59fed291d5e502a596bc330842b5c7a562dab6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d2c7c1c9230cb9fbe0b26542813a271f8eda39d78143e8e9040a77ece578035986a99996af9f8593b0d2d74806f2b83eab71b2266c32a20fad9aa2f9e7fd2aa8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e0c9b6dc6913657d38949d3d14952c379797d1184c1831c157f158f02d5f94484d48b09583f3826e577ae4f038f720c5ffbd78b278ee1c64177ba90229ae1985"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "2ff369710e0641035e7dc8218b9b96cf04b7b8e9ff6184e6ac4b7efe8caa788df1340f0ed6d93db84c3b073a7dc00332973f7349de9c6a3d522ff413d4ac9f08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "766e777e60d46b05e02994d38b315a9b947914d4038841dc34b4f09690cb301a3414c526ea7455c657b87bd9f4d3e96c5b9db23d5b6d379daf8ea9f47573e261"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "8ec8fc687476fd2adc3bdfddae74c376bcc540fba879b63cbce0598e1004b51d2670255dca9a4be2ba9d082bccbf96ae6f76cb80e3b21070f484ced213d03b5c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "16c86569ad70ba63f9e940cb406412fd165228b04748826cc5873760cd7b421fb1cda353e87eefb2fc70da81889b226650f66603e5552bc620750bf631ce623c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "26ae56026e801e88ed1ecd5857dfca97f727959c9a0bc91e2a440802da2095e1924b26c0766ccaa8fc4541cd1af43580857c963188b7a6daaba6f159af7f67b0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "120f15fef9cb017321941088e965fb39a9821d1b3dcc9565a252e596c96949369731a328a6bf55220c7d9309882714c781fe67dff861281e60b17e98ea14f8d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "4f104ba5038ab19b7c2e80f45f49f8a4204d534f985ad1549d8e2d2cae4158bd1dfcb94cede2f4fa5eb18fe03b866816d0df52a1f55d41a24a1132ce21e13ef6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "30b37e75b6e910320de0797dcf83c59044def6bfae7986d66762b6d054f293d70c737a8b370ccb8ab25d8d65b755d64416a709561bbd75160dba4fc875d355e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "9052466f4859282e91865e18b49e4c7f0465e064db48637be08f1e8990ebd6ba08d16eadd526fd2c3696b0c842c0f9fb337abf3970139c8dcae55d9aac26269d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "cfa5bc3fcc9c23a60b82f150e552ff423e2bdddfbd6d859023ee4816b887a38f481652b4724395f90ad6831e4cc25d3beded66c240295c770d93d7601d7cf0b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "95b55315d17dc2a03a0b09b6fa51f4da19bcdce1d6f4b5f1a574b384750152b6bb0a09c13b46ddcb0ebd84cf7a104102e3ee47e71ca19ca875b71636288958ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "520f892a64d55ca415ff4e823fb89ace9fc707171026f2bf9c9f30e5054a45575f8d1027a2abd868275735431b34f68ad5d804e8744ea4289b7e7adf20e103e6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "e20688b13f20f287052ce83538e5101924d5238124c7ad412812d1f382ee0129d42c1dde3fa3544750837586a56b2a57f4c54e2cad14d9db953b0e3f95b36ed3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "0bad216865e6328c6b98e33c189bc2a53ace4cf98d42bb6c9e8372ec1f10e4fd27e57b1b552cc72cfaede1c8a7ebc4b0d45915cbbce942f52e90a70eb0cb7088"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "f6726be3f741039cf1c95e883edcbf9452559388dff7abcc4a010b3c99af23d5b1413d8d99d4e7f7ddf6ac5a09e60c10bc034b3bbe94695b354d3cdf3d14ffe3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "afacfa1fc3ab56c224ba31664561a7a547cf2477b088b1f3ffd0d803ddae21629f58da3b1848610dc0a3fdb455d9d22105a5e830b49d2a0ade65a1c37ed9ffe4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1e35dec7e1099ba9d872570075eedb5849862d36571180b584a2e1c8e0647247fa76fa2e4d3167a1abb42291a3e0538111177516b1ce1cc22bbc5c5debff7940"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "1ba70715c42ea1fd837bd9f391860d85c683641649060eaab8f03350157131c2750d9d3d074178ab732df1c558e001553e106b7d34ac222a144f88de0434e826"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "2792d9e3db2ea15090aff0a9e8b33077b470bf7ffeaf3ebb29f24c1aeb16939058c11679a453ed3c86f698db08fd18a7dc8dbf0a4632294c202a26e500b699ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "40fa9b800f545047aa13ce0d76f589856abd0d4bbee9767d14dd9159b3781f2d1b4dcf5486ea811d57977cdf1f9a968cb39c64a187c0fc376f5299cf9d4034cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "1dcb48e443d770c1a397f3934a27ab638e1a3248741430b98d15186246e1e524c702c1dd524df0a47a4e26e85bb8ca6f09a0a1aa11ae83f159054c843f2f7eb6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "2b450301e0c15eac77fd7b779630fb71ed8caf3d287b101c244d6fc61522b8d6604479172e9efcdb11264f761b1f07884bf4d0e37863533cf3fce9cae8088bbd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "3016282a5cb7a07048f0de763cf4f5b0f0d611d4c239191a433554a92d67873610d21e4ea59b10205019eba88b4735a0e01a4a9233ddeaba48dbfc459c3889a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "08978ab2e2cadff40c6dd530a0b786e513dd8c149cf7613703597f35209ad5134a4dd359afff939bf125cf167f32d465455a78e65f7acf5b2daf522a73ea13ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "1a77741f6637970cb2c6a5a2680b7b3a6ed93267226a4317e61912de4c8cb1b3d238dfc96522b9b9c70aa03d82648a9dfb9f3e040af8c06612dffdf2e8a98058"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "c7a693ff576e3c62872395c998f3983d185aef007d7ec6c106a5273bb16b47d5cf0113162953444b80da9373872225f2a7e66b36a29db09b514398c03fdd5474"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "6971e749ea6ac3087768140dfc780ce3bda68912dece50a1369a4210b8b1964fd34d0c802f917cf79479784e2ac2b3bac8c7d9822db5bdadfe61a96d8f53f6d2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "6480c342affec24d85114f216720e2589f6e40b08417771db56423540d77a40263a23ee9bc6fe9c5928024cbb863d4b8547f737896e879c941a196ec5f5f6c14"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "cb9cd262c7f899b9ca9d80bc5f8eade6eec6b894fdfced93976495f00156d8767e6c4e1b07e6c337dbb0f62100af7a762095fdb68dc35203a15ce7c2fbb12de7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "845ceb67c7a1a3caf010e161e89728734d604924f4224ff0bff4522f66401e4a0315c6fef50d741b9de27adcb15a5f9a01ffd298836e78888a4e8b18c70f313c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "87f89f24becfe0ebce48471e5e1a507cb650ba5e5e049928cc8ae05b53ab4291f7c035f8eb96209ab3412db0136e64a1b06644d050e73c06b974a3a02cc40bf4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "61c27597e07353d4b27c022ee1a928b699214cd6b7ebb5c977e5d7b5c55fa6904c34c2f5934d4b6ea852577d491d03846a56790802b04a003cb186d04c60be38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "187cd9d5548745fbb954e9b3723f1037b43c2a053871db5f516f868b4855fc7e32ef7cde5da973414118e38e7ff0e211e0af11dd28f794e9063023b6c2303aec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "bb16cfd64c3a3a523d686cbbe309ca398f370c8f7442a71ce5bc200b2e45559bbb7601f912214a2fa21edd884b8a559cdd58d4a233a07881fe10e4f5b3faf4ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9516ea2ab1c48a3fe58206e9e07eeb9c9e25e18c6bca864e1e2c1350e8eed810a0d047e547d75832fdb377fbdbf693c0c15bfe330eec3e3264ebdf26e38dbe81"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9c11b5b92b865bc15a6beb1a9bff646a0500370c4eeb405d84d5df8fd565caf23f3759f3caf6720494f103ef17f9cd669f5d796b5ad323b179bd53a0ee43fc22"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "fc45f56bb500825914a68fdb1a75f65a2f5fd9cc64a2d6c629a8f02c33752a7ae49c51cfe003d6330c561656e1e9294d578390caf6e63f3abe8ac18ca79b7113"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "8671748ab56f46d361c91c9042a0393080b5a4550e4575a57fade16bafc3bd206c10b54e86f4647d15b7c290c88a503c3048a2205326c07bfb3067c899e5d79a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "de203e27ef8cb1e0a012944100c28113f337ab3b9fefd992eafe66db08d70d217c52cfc923e9c6a3d490d665084ebbcb7a42d62c92349ad099fe4dd3a737732b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "3fdf455b85de94f1595e13e7d7c97a9061fce8dfc4903bd0d38d3f68ee4a831acbf9b5707cb6d0b1dc13f0c7a291d94a781e8ee1290df4d83346dca1e36887b7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "fa553ca4302f77fe45378c3f4221df18b9a96329669dabed2d7217adfffffc4420f8240c477e778f3e6bab80462694d3cd20e185c3a23fb1702407f4d3f070a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "aed0a031e08a9106060fd1e33f92956550ce4dafe8a74fa92947fd34c6b5c60a5d648194b6bc2b216ea8e009329c4fc88d24b91700f6c71079e58723d900f149"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "b687027583cc0b2908c6e8db06cfbbc60359a5dfd6e25655ba7eb25caea27c1317582133ec55c968a1048f7ccdcba093b62207de3e7ce34cc9a96145e2e34499"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "ec42b7b2851518c66eba8a08fbee6b02167789a09aa46fe3f764cefe33f6407898a6022038d78bf0b7d2a81d80ff7052dc21e1a82945e771c802e1f7363c5cab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e27a02e1e3ff296c6e4c56aa2daee07bf4f6959eab15c03a9d5abad314b62524ab53f0cbffb79e500dd1c870a51284d50c67e9af68d0ab8ec64e97409963286b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f71c0b89ca13353f0397e06bc225986979999a1dd11dbc8f629e2779cf202874cfbcb3bd33cadfd17a8217676c5226bd8c0dfcd2b669c7850f4e0dfccc66f743"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "d2fc9038ca023103ec73407d4770f5c4ac8fa378576b8b2508c4a8aa24d0527c9f62b5af2806768dacb8e8ccba384ff7aeb082f45326fad262c0d52b1653ece9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "d0a777294088003e1a5026a3051290e5a0fc82491a61db841d47b1ded75536b94a6a1ce758ad3bae12f3f289829adfe6f1e7a06972e441bd8c342120ab00470c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "9a3670cee1660dbeb8c9448cfeb6932dd4785f9710c802c162a7f0d2c2887ebf17440eede2e4d505432b9b0a12ca98f4b1f87ec9e398ece5411694c7dde06de4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "71a347038f590e4d044ecdd19527dcdb40bbf45062ad6133d9e3025be9a4970bc7a7ec6507fb187e5b4bbbdd37468d37881d1989dfc37eb1b7c155887ec75a43"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "de51011e8d546717e489c1612bb09d7df92f5f65293375bc58a7a0db72652a8be1d66403c27b623019a497ad7222d4e8d850b9c8b1daa7f1e634cd03b18f9f18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "d24d4bd2cc237c2f1b4293b6c2b166509f1e614bb321aad1130a755ad98f60be3034483a7ce1c27c65a3f08203557a0e707e6d4e98e52a36a975c86968e6a2d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "f6d109c3c841441c54397817072926528088b458c89e64553c2a41c6e3821ab5bfee65e8b5b5ef8feb47a7b644e9cc25a058898682df67ae7b182a07cad0b240"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "ba794f0d8d6ab6ff8b0f8c8d646e5f5276353e4c99a373b549a24bdda82cc6c8f6335eed21bc5d70209e811152a7569ea0ac11296cf9a0b8a8749133257f7d13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "ce901d13cee8134aabb0d4de9c99ff20bc18ee80fc6116e74cb51b2b5796f8308a2e14fed82929b5e8d6420232bd6e0fe73f550136d6d2541e32170b7190f50a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "f5a883b827c0aad23434661c850dab6a773f50cc803873ddf5c2bf27d7073e33ce76290f93063602c033bfd1a0943bf2f919e9e7dc3d6dc0caf54bc6882aafe4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "9a660cefcc250e3a88ec6de6872c5fc65ed929c3ac391497c0612972bc1b990c8f3d7dc170f5f074006d708b6b83351c4cebdbce4c083b0b665896a3f10ae351"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "74d8df7764b8c0741b730b199e9a3a1ab4a1d341b6bae90df89bcc3a091dab1065dec944e11f85cd555b216addd17830c6c90c73a1fde15888c7e3007f954548"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "a3f209b1f75dced843d10691cba702695cf0924fbc74ad832b5d45659264eabbe6c8ccf1860e9bf44dcd7a7d87d89cb3fa25dc78c62dc3a2b1e674c4cd13a552"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "7bb67079b57e9fc32eb48a7d2ab5db02ab2b05808c744537958657b9b65cd2fcad668ac06c2aa9b8499d9f5b6d88dea1b54146e07414a5254d3a078f2fbdf5a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "ff07c58318b57ce5a7964f56d6edf540ac8dd5d0dc3fabc1fbbc802a929f3866ea62b5ea5223ef6fd8d3cc2ce83d958b8a35eb04b8685cb30b7df3703749337d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "ca7ef360f166fd1ec186b904f2d46e4b3aea7366f4d4baaea2e5b178b19c975390172e08e80f97207bad86e20b1749003644311bc8fe494bfaaf4eab16407024"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5ac35262f9455f77df983f66a7b528e14fdeb72501740a9bbf7c4f9843231a1e05819105f37c0b1b926621c847d474880265e899037d8775fb9701f060252718"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "2370e61afac5b0132cb975d30559b7348a352becf16c52ac6048579f90008e97b02e69bc9fee6c335b9d70e9e018ec943541adaa4a3a384292e9a85c3888dbc1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "b149eb16f6d823f212e75feee3ceabacd832fa836e662c8099966ba95dd7cb3cae37950eadfa990a5cf1f09ceba6db8122ea79f5061ee9501ff91af0aee389af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "026a115b8777e757178cf45feb9651c2972b1d697e133600050054a154124923fa49cbd45ed45170e3a87f91ab36e4788ef2325a5c1d0747606e4afd4502d16e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "7ab80a3ca3272ef28ea6365ba2937712c6173d9f77980f9b89112ffcc783eb473b2986e623a2fecf4028e73ac0225d427b71286b236f474314c355c53ed517bb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "02d9f2140017ebd441138525f1db9015091cd3cfe26ba9ed417a2932ffec30e55b88b974cea4f86c6c15989063087835a439cbaefb25178f6f818dfda77eecac"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "2d1158a7fd17acbb54f82b2050faf8b3e9243e280baa2034daeb4712b1e5a4fc37ad6985c26f107b37b4667f172d6cce4f8f8a34af37b4944eae72ff78783cf7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "691c8d0300ef15b700565d7710a518e45a23ebd8254cd5530b5d87145a2ea4a17a4bb658f384c6b4d79857f818d27d3819f21a58c9bd4e6c1d67cf707a6edf92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "adac8fd20a29b0a24c155ce4ec5e2986612e3d0385526acf9df11a02dc3a7c37db7d41f6caf93db5e2f0cc432b248bd0bcbb21858c2ca27fc1e06b76e60a0449"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "74a31e0290983a20f48a4a2b3cb5705228ced4106258ce9257fade03975f2c5f4b5beba87580ce94a02e02fe1e99c995ccd39c24a11e91e659791eda521ad0c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "5926f86abf71923ad51422949e3d7cc795561baf73e1c36f6b1d8daf3bedfbc82128f418e5636da75dc2f0a4fa7fc7833ab005b8d06ef91bf12d4896405596ff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "77339241b3d9936b0639e681301a8f55a0ee858be45ba50716fe8511f695de0820ad9bc882622265dcbccaa965c34e003aa59553156be70cc8312b69e59af656"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "710d2c4fe282e7f46b2e6729dd2afc140c5762aabdbbf6a688573e278d6562589e21363854d5fd7b1d4abeb05cebf446f755471fc87df508c28362f574aa29ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "7bf4748084415c6a7c4fe725a9cbd23aef96046f450d953d50c226c4d7663dcf3d03e891c69db08477d75cea4a6e079b78d80e7b2ac91fd0b7a864719994b87c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "97ac5c96ce39ca3ce60ee54b8a48132cf8ce94d9201443d517e46baeb1d2051ed2f7f242a0d54bd1f06696cfe5225f702a4d28acd6d83b610b0b62ef6de67496"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "638483fe15467a1966a9a4d25c8eb75853e405ddd4cdbb63fe5486e46b4e6941ed9ad14ce5d71e048503b031995a3131e3a2d00db60b59b231a1c92c74c98e7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "728e14721e88e0b32fc1cd0789a073be866b2550cb3a4d6d89d5b697c79fbb9a4680553ea0f182351177a8e97b45643f07377cd6676c5bdbdb3a6fb79f0d3ab7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "de7922b294d5cc7d85c29e6bdaf625658f89587911ec5f8b0dd5c5d0448d4b413509d3acf51b212bf6c93d852120c7e16b967f491a0bd90b55d5656f8d988ab8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "3906dbb7182d101b23bf1c8e2b098325d5e88dc981af7a1ff8124212452cf3dd13ed6ae175c993de88d1f5bb2580c50897aead0143ca5fc4f0dde61c090c7a50"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "6a1bbc231a78d5c1fc650bdf569360df1ed43132f9fdbc4fcb79958bf1c1ffbd6a8dc7cab5c7cd0eb265c4577c4ffe20f58e1c7ba747c68b922c616f56a1f180"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "012771a2ec6f82ed2f79fe02a34c1ef1a014f28c15ded0a0e7d458ad46b6555f752fb9ce21e0a9f4517a1a1bc01158cbec2fd4c835106d960ae2e2d7f56a3122"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "046a3ac58669f0208fb54e6547ddd0eca137b3f74306d22858d4d0fe8365b2f389a2243d56f46c666e6d01bb02f2a28f9e8c4b07a276c46311569e6d849a4210"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "c250c3f305d307b8bdd19ba8861158ebc18c20b64d254a157d7a4cfd0adb37202bafd7e10610e9b7a448a2022332f768eef576b2b0bd145b3eb0028872ce6a87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "d185e937a21cacd995874255b6616752dc12ead176158627710958960b7e733d4ccc73181d8f9c5cc03360d84faee9859892c3fed1ab8100df44ff18bb4295d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "a07858c741dd44df8c42c931dd0268903427cb3dd8ea6a885e86da61568a9a945f43d49cdb3f098960f2bf07a3d3306a0746375eebe0296b17aa38d9bc3d3ad5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "7458a2f46eba8a79fe07a077ea50a69ab40bd0c09ec76e4bbb410a75aa447aee8400f72a606fc0e50a22bbb68e8ef3a207c3cf586a548cc184609c695ee4a0a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "237d8a24a7dd2be32a3ad863a2022ffe1caa81e77c900c50d6231dbcbbad2eaf8a98868b549b6cc2a79dfd555620733faedc8a9b54d6d1790e21cbcb2bb5c08f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "e79a5a444d56d589c2db98bb50fc1cf54e55ffb08959302a07c526762fe07d565d939c068a2f1699e939a565eac1225c314e32189f681d5a46515d8e8eda8ebc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "eb792db87e22e0d939182bd5fd9095337b92feb1923331f14972aafa20d7d764203114fbb40584e1fb5566baa30a28e3cde6dec4c15aeb5fc2a22843518f4c02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "8468deee172136ff95423aa7bea8f9a209922ae70090dc9b769c68faff0e7c28dcc6b9c30437647fb1d7c6bf3e67c47c87bcdc180f0716e1910384eda629c889"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "ff0be3dcf7d0e126cd0b6c7e757ad1ba0fec41f819658fc415fea83f11a08cc82c860bc91258bfc483e39a1873b43243e40a872f54ee816d9a7c932c5d34c02b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "dd50f8d1c31c3ce56e019059c3e23f17c9bf53e8052d7d1538c4defa4a4cbdc94886bcc98883031ee758495610c6cb79b6355ff5ec5051ce989ea1d5e377d016"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "634b42e5553bc1566f4e55bff9ff7bda1e03df0ff61efc699e2c02110c71781cf6f427e300b1fbf7e87076a5b439df31d1eb9add40d2a1c4e2dc37a7022a6206"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "8f995325826c7cf9e6945541b9a7fe7fd83602653b4ec3ee7a27c5d52c30b05074bccdbb0f4f47f9b173f6c198c905de1b49b74dde37c496153f493df0a1ebd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4ec1a24b9f24ef57d65d1df2706cc90f7c21da63d43d21631a69ef04ac3172f634620379d489c4372e07dcf4ac9f2325e490994e3fc0fbda6d30433d18d92b97"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "7ba23562491adb883c1ae1ad8334ede61289600590f6d11e326b22c7d326996ddad97b3ed3816fc89f3a93e0d09def8b2ff737c91a6da39fdc968f2c053da647"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "53f793d3e12b4d1b967dd2164e31e317230915029e7bace9bcfabdf62920ecebe9e5fda8996e4e6f829706934f4ea12ce5a7ac0d6202fa1434d3a5e2f05af842"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5d202eaf08d57f9bf17f2969270e4b8b758a64f6a9786945a2c59bf180a269f8270bce9259b9cbbae48dab00ced791ea203060eeb8627afa701f52caae9c7079"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "2d2fef54549ea51ecb97a4989a4a0351abbde3ca0fbd954457acc778394a7618b9095f3bb6c7f7b5cd5460138378e41d3651c1e2b101921cb3c9f443f9816196"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "9a0f9061004c574f20466f3446e68e2cbbbe4634cbbd25c6d84f0561d3e6cf15c4d78f7ecdc1b2b97ab08645303f00727cae48379a20e4cd9c9f1e8de19de615"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "fd2edd89c31109f9b220347e658daa298e4412c6fcd7075123183ab1e7adc521814c3722f675d8a3a3c1ae9ef401947f65454afa2af785808c21717c50c9d002"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "044ce18d72eda4edcb1abd70e9edc9fc333002b76a7396c868094fe6438252caeb05a4cae688c3cc020717f725f69586b7b30e2f6d484c7de01cf32b0ce1928b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "f62da260ab3a3620ff2531e4ebd068974cc631311d7273878281e30dca1525c689160621ff5f11812c95581a095c07101864c73bcaacc74abdf3fa1fa33830d3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "2a681ad749d7a1dc337b1e10c25a2dcf087373ad38a2a2faf617ae5eb5e5b5f684e02b1ccb920fb7acb54294acc973b189f0ec0a40c63a151038e261a5967abd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "593fe014b889a5d98e74ef6365027e323ef2274b88767310e8ca9f70b0c662660aa4dc1589c94e4270323efe94979dee37f1e451912405b835aac268de3a4581"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e809b9ef6387df3bd5e22dc6dfded307961f9d520ff72cae380291e9860c1504058c37a0d2dfb6d4313bc8201adcb6e7ca769d3abc7f0b5bf0b9844a622aadf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "15704edf3db53565185c7fe47513e4bb4a16d5c8d3ec36dd0595acb1b57b3e5fc0c49bb2fd04436ced2315b65d3a9b9f1e82bb1ba034996b01a5e30b5c5b37da"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "1235150e280cea5aad9bb256a8625d2ad98135c8f3f7a082ffff0329a8231a3b8f7c617a5ac8d7248060866a446da80a730cc7aebd303101e2179c964fc4eec0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "f5c1dcf2254c2ea40c3a0e3c9819f055c9df85ce0a14da36a52004ea810fde181bc4fa4f10c67d5747ad3361faab58b8af8b7aeeefee5aad5421722d44ff939a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "d14d418d76ccc5cc01c20e160110f63e0bc5c3971c6546b534d8a7a548416e15d3c40868c3b43b06b7e99bfdf36d6b25a50b09ac9501f3c07b2ac21457163d4b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "5f9c48e37cd521fd80adeedb73b748052b2da7d86ed35810106b107d2c245a69f6e4e8b8644b6100959c3a18229cff4e2b7db3151b03f4171f71788e5edf8098"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "b0cc910bb5f5fe8df35e90e6ea251621bd911ed7ff0d7724920cc16d760db93722d69a5f608a9b0d5e6705ff019fceeb92fce00bf062c6b0fd25f02c9354bfd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "6d073aca109841a710b1270e5f75b2e7321e17f4396341cddb61a04b8917baa7e3c61c6fa22c532cd77d9507147aa4052ae10544b2042064d7aadb1d78204b1a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "daa5d346d1c478df7d94b46b7d35fb91833532515f1896cc18d1bd13d30f23d8930b1c11042aaba3c12ab62ab62301f62251b6a2bc3ebfd6cfc376e92f371a4b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "b35638ddc431024aa5def1aa22b115386fa9d4483ec26a22f9f9873de8408d380442c4e668ba45a7313c74dc38cb14f3d47a74dd5851c56981a866697d98b520"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "f64b158140d68650e7ccee71f62ef19b9521b83232d6c9803e32793fc6c003bddbe405726480de1a5eff58e8eed904524b85107445d7d7667290b8697cf18262"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "86d3d0e9699c3c1a3c9f13aa1c11bf73ece726cd44f244f6c4aeef80342c3ec30b164752021a29de9d6123d2dd3192e1967127858872ce73c94f6a88268c52e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "7546f7b69dd8a7b45e73d8dfe072dea1927f688fcc191e0990263efd24d282a4e3f21d004d0b837452d5a38ad6092b59b7550e2ea22a451fe17d8181d7f346bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "7863c3f8c20927e1b19f4e25df381423053d61351fd36a52efeebefc9c3068fadf5d6aee57987f51d92ab46675bda3b62ce56b0768f08862269535e55916dbb0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "c09d3e319db1ea16a08eba8e4e16d270033867bd70ab8201260d8daea8ddda7b37e99543769514a4503911687e6897b8ea06aa6ed004924bad1852e5a4d149bf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "493ec5f786564efc20d892ec80aab173ae4b67282e14e8dc3549c89d54e9129413ff585c1c0905bffe107f52db6af088330cd4225be6b9e1b1fac1153b2ad3e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "1412390a1e86a258111bc27db53b71532384ab60bb2fee9296ab4dc32b2173bb7926776537b0456a27e98febe77bce69117a9cf983023dfef6d5638c2b4554d4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3e93c560ebb4..d12c3722e403 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL +{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -30,7 +30,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa @@ -113,6 +113,14 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "$out/bin/firefox" --version ''; + postFixup = + # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. + '' + patchelf --set-rpath "${lib.getLib libnotify + }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ + "$out"/lib/firefox-*/libxul.so + ''; + meta = { description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -121,7 +129,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; passthru = { - inherit gtk nspr version; + inherit nspr version; + gtk = gtk2; isFirefox3Like = true; browserName = "firefox"; ffmpegSupport = lib.versionAtLeast version "46.0"; @@ -132,14 +141,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "48.0.2"; - sha512 = "d5addb0cd01e2aeb0fd9387800e82e385f3986716887840322d261d772a442f6fdb1d910cd53f2373f0fb82ed0b2a45356ac83f3ef230e14a2b9db8999ad8a4e"; + version = "49.0"; + sha512 = "9431f86dec5587131699ae57ae428be168e4d6c7d1d48df643c10540e8e18bc5eadfcd08bb204950be611c87d35d8a40aa8ece454b7dfa3992239639c2d688a9"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.3.0esr"; - sha512 = "ee618aec579625122c3e511a7ac83ac4db9718f5695b6fe6250717602178bae9bb7e5ebe8764f4d33ecf44d3db13abfed0d24c1ec71e64a1087fb6d5a579b0c0"; + version = "45.4.0esr"; + sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c9adde4f15bb..4da733261774 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra +, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -54,7 +54,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra ]; + gtk_modules = [ libcanberra_gtk2 ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 10d50792facf..531c5a7cf3d0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk, gdk_pixbuf, gcc +, dbus_libs, gtk2, gdk_pixbuf, gcc # Will crash without. , systemd @@ -44,7 +44,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk gdk_pixbuf gcc + dbus_libs gtk2 gdk_pixbuf gcc systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index a2e98fb436ed..6f8e327a6c31 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes +{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes , libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio }: @@ -7,10 +7,10 @@ with stdenv.lib; let rpathInstaller = makeLibraryPath - [gtk glib stdenv.cc.cc]; + [gtk2 glib stdenv.cc.cc]; rpathPlugin = makeLibraryPath - ([ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); + ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); in diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5ed1636aa656..aa724c2d3c5a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -14,7 +14,7 @@ , libXcursor , libXt , libvdpau -, gtk +, gtk2 , glib , pango , cairo @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.632"; + version = "11.2.202.635"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0nf2d7jn8g6bp9vilkwwkkh6pm05fg3h73njsn4yvx3285k73lpn"; + sha256 = "0xlaf6152ksknigrv6fsasscyfnjkxml4nl22apiwzb34nrbzk3m"; }; nativeBuildInputs = [ unzip ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ zlib alsaLib curl nspr fontconfig freetype expat libX11 - libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf + libXext libXrender libXcursor libXt gtk2 glib pango atk cairo gdk_pixbuf libvdpau nss ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index d149cd40d8c6..82a1c2712250 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, GConf, alsaLib }: stdenv.mkDerivation rec { name = "gmtk-1.0.9b"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc"; }; - buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; + buildInputs = [ intltool pkgconfig gtk2 GConf alsaLib ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 0f549be9ac46..40955d0aeb0a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo -, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl +, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -16,7 +16,7 @@ let xorg.libXrender cairo libpng - gtk + gtk2 glib fontconfig freetype @@ -26,7 +26,7 @@ let rpathProgram = makeLibraryPath [ gdk_pixbuf glib - gtk + gtk2 xorg.libX11 xorg.libXcomposite xorg.libXfixes @@ -98,6 +98,10 @@ stdenv.mkDerivation rec { mkdir -p $(dirname $preload) gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC echo $preload > $plugins/extra-ld-preload + + # Prevent a dependency on gcc. + strip -S $preload + patchELF $preload ''; dontStrip = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a00905cf9377..f1d40150eb3b 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -2,7 +2,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, cups, xz , gstreamer, gst_plugins_base, libxml2 -, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk +, gtkSupport ? true, glib, gtk2, pango, gdk_pixbuf, cairo, atk , kdeSupport ? false, qt4, kdelibs }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] - ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] + ++ stdenv.lib.optionals gtkSupport [ glib gtk2 pango gdk_pixbuf cairo atk ] ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index fcaaec63b9e6..ae6ce3dd2c30 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: stdenv.mkDerivation rec { name = "surf-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; }; - buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; # Allow users set their own list of patches inherit patches; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index ddaaa68f60d4..55dfb05cb3ea 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking , gsettings_desktop_schemas, makeWrapper }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; }; - buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e2d5061b92e4..c98910cb08c2 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings_desktop_schemas }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; }; - buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d9f694a7eabf..29da56b4d73c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst_plugins_base, libxml2 -, glib, gtk, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf }: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg systemd + atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf patchelf diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix index d258c493aa1a..1caf1ce0bc8e 100644 --- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix +++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix @@ -10,9 +10,5 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix new file mode 100644 index 000000000000..fbb08a9bd225 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -0,0 +1,28 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "machine-${version}"; + version = "0.8.1"; + + goPackagePath = "github.com/docker/machine"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "docker"; + repo = "machine"; + sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7"; + }; + + postFixup = '' + mv $bin/bin/cmd $bin/bin/docker-machine + ''; + + meta = with stdenv.lib; { + homepage = https://docs.docker.com/machine/; + description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; + license = licenses.asl20; + maintainers = with maintainers; [ offline tailhook ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index f8d5dd2c9d6f..b6fcbaafbb10 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -10,9 +10,5 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 72b38a00e0e2..70b810c35373 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.2"; + version = "0.7.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "002jg4iwg4g4hkg4hm3szlkyagqzipln3l44b8azh1a7vh1m8cp2"; + sha256 = "1mj9kk9awhfv717xf9d8nc35xva8wqhbgls7cbgycg550cc2hf85"; }; postInstall = '' @@ -27,5 +27,6 @@ buildGoPackage rec { description = "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix new file mode 100644 index 000000000000..f047bb42e7c6 --- /dev/null +++ b/pkgs/applications/networking/corebird/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 +, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }: + +stdenv.mkDerivation rec { + version = "1.3.1"; + name = "corebird-${version}"; + + src = fetchFromGitHub { + owner = "baedert"; + repo = "corebird"; + rev = version; + sha256 = "1a7b6hinl5p7yanf75a0khki2fvd04km1xlkwnspgx75cmnbnn5z"; + }; + + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; + + buildInputs = [ + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + + meta = { + description = "Native Gtk+ Twitter client for the Linux desktop"; + longDescription = "Corebird is a modern, easy and fun Twitter client."; + homepage = http://corebird.baedert.org; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.jonafato ]; + }; +} diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index eb5d12ed82c7..bb4a4a710094 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { name = "davmail-4.7.2"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 3b64d7af43bb..3f1b5dad727e 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/networking/drive/deps.json b/pkgs/applications/networking/drive/deps.json deleted file mode 100644 index a1d1fde7727d..000000000000 --- a/pkgs/applications/networking/drive/deps.json +++ /dev/null @@ -1,164 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "957d850b5158a4eebf915476058e720f43459584", - "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf" - } - }, - { - "goPackagePath": "github.com/cheggaaa/pb", - "fetch": { - "type": "git", - "url": "https://github.com/cheggaaa/pb", - "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb", - "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam" - } - }, - { - "goPackagePath": "github.com/odeke-em/cli-spinner", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cli-spinner", - "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33", - "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c" - } - }, - { - "goPackagePath": "github.com/odeke-em/statos", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/statos", - "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6", - "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs" - } - }, - { - "goPackagePath": "github.com/odeke-em/exponential-backoff", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/exponential-backoff", - "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09", - "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6" - } - }, - { - "goPackagePath": "github.com/odeke-em/extractor", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/extractor", - "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4", - "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1" - } - }, - { - "goPackagePath": "github.com/odeke-em/meddler", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/meddler", - "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570", - "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x" - } - }, - { - "goPackagePath": "github.com/odeke-em/xon", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/xon", - "rev": "d580be739d723da4f6378083128f93017b8ab295", - "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc" - } - }, - { - "goPackagePath": "github.com/odeke-em/cache", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cache", - "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb", - "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4" - } - }, - { - "goPackagePath": "github.com/odeke-em/command", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/command", - "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561", - "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62" - } - }, - { - "goPackagePath": "github.com/odeke-em/log", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/log", - "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907", - "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w" - } - }, - { - "goPackagePath": "github.com/odeke-em/pretty-words", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/pretty-words", - "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb", - "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl" - } - }, - { - "goPackagePath": "github.com/skratchdot/open-golang", - "fetch": { - "type": "git", - "url": "https://github.com/skratchdot/open-golang", - "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", - "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" - } - } -] diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix new file mode 100644 index 000000000000..ad5a8f7c4e63 --- /dev/null +++ b/pkgs/applications/networking/drive/deps.nix @@ -0,0 +1,164 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "957d850b5158a4eebf915476058e720f43459584"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = "https://github.com/cheggaaa/pb"; + rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; + sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; + }; + } + { + goPackagePath = "github.com/odeke-em/cli-spinner"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cli-spinner"; + rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; + sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; + }; + } + { + goPackagePath = "github.com/odeke-em/statos"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/statos"; + rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6"; + sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"; + }; + } + { + goPackagePath = "github.com/odeke-em/exponential-backoff"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/exponential-backoff"; + rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; + sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; + }; + } + { + goPackagePath = "github.com/odeke-em/extractor"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/extractor"; + rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; + sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; + }; + } + { + goPackagePath = "github.com/odeke-em/meddler"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/meddler"; + rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; + sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; + }; + } + { + goPackagePath = "github.com/odeke-em/xon"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/xon"; + rev = "d580be739d723da4f6378083128f93017b8ab295"; + sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"; + }; + } + { + goPackagePath = "github.com/odeke-em/cache"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cache"; + rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb"; + sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"; + }; + } + { + goPackagePath = "github.com/odeke-em/command"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/command"; + rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; + sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; + }; + } + { + goPackagePath = "github.com/odeke-em/log"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/log"; + rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; + sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; + }; + } + { + goPackagePath = "github.com/odeke-em/pretty-words"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/pretty-words"; + rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; + sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e"; + sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"; + }; + } +] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 4e6be596fbaf..ae01e3b121cb 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 = "9.4.49"; + version = "10.4.25"; sha256 = { - "x86_64-linux" = "0gkm4jhcn3pqaizmki98rbqb7mqyf6mjgmpslas1wr94q5msyrpd"; - "i686-linux" = "08h5jxan6l9h4zfmvc5q2652dyplih2avayy8f9h8mppirpg68px"; + "x86_64-linux" = "12kklhy5i3sj7hhlg0r0vvnv8vkd34swdjlby4sd3lcf012amc6q"; + "i686-linux" = "13i8ykxyc7scyaynfzgp2jhl9qd47lpdq62sx657abziclbybkh6"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 5b8140bfa51c..f37f10d5209b 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; version = "4.2.2"; @@ -23,7 +23,7 @@ pythonPackages.buildPythonPackage rec { webtest bottle threadpool rocket-errbot requests2 jinja2 pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 daemonize pygments-markdown-lexer telegram irc slackclient - pyside sleekxmpp hypchat + pyside sleekxmpp hypchat pytest ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index e771db3795b5..f0b74370c3c7 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "2.0.0"; - + src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; @@ -15,8 +15,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted - ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3096d7dea2bf..8506b5f138b0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite + gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss pango systemd libXScrnSaver ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8d9cf434e5d2..2952b0a365ac 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk +{ stdenv, fetchurl, python, intltool, pkgconfig, libX11 , ldns, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null , enableE2E ? true , enableRST ? true -, enableSpelling ? true, gtkspell ? null +, enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false , extraPythonPackages ? pkgs: [] }: @@ -14,7 +14,7 @@ assert enableJingle -> farstream != null && gst_plugins_bad != null && libnice != null; assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; -assert enableSpelling -> gtkspell != null; +assert enableSpelling -> gtkspell2 != null; assert enableNotifications -> pythonPackages.notify != null; with stdenv.lib; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { src/features_window.py sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py '' + optionalString enableSpelling '' - sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ + sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \ src/gtkspell.py ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - pythonPackages.pygobject pythonPackages.pyGtkGlade + pythonPackages.pygobject2 pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 00650bb685de..3d70990f4620 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig -, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver +, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver , scrnsaverproto }: @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake zip unzip ]; buildInputs = - [ perl xulrunner libpulseaudio glib gtk pixman nspr + [ perl xulrunner libpulseaudio glib gtk2 pixman nspr nss libXScrnSaver scrnsaverproto - ] ++ [ perlPackages.SubName gtk glib ]; + ] ++ [ perlPackages.SubName gtk2 glib ]; postPatch = '' sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp 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 245894147dcf..4a53513061ae 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }: +{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [gtk glib pidgin]; + buildInputs = [gtk2 glib pidgin]; makeFlags = "PREFIX=$(out)"; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9123f6b39ed7..6ace09bb753c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farsight2 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn @@ -26,7 +26,7 @@ let unwrapped = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - gtkspell aspell + gtkspell2 aspell gstreamer gst_plugins_base gst_plugins_good startupnotification libxml2 nss nspr farsight2 libXScrnSaver ncurses python @@ -38,7 +38,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (libgcrypt != null) libgcrypt); propagatedBuildInputs = [ - pkgconfig gtk perl perlXMLParser gettext + pkgconfig gtk2 perl perlXMLParser gettext ]; patches = [./pidgin-makefile.patch ./add-search-path.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 3b7b96b778f0..8190be65e75b 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json deleted file mode 100644 index c4d600a2ab3e..000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/agl/go-gtk", - "fetch": { - "type": "git", - "url": "https://github.com/agl/go-gtk", - "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", - "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix new file mode 100644 index 000000000000..55850f0a89c2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/agl/go-gtk"; + fetch = { + type = "git"; + url = "https://github.com/agl/go-gtk"; + rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; + sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 78814fcb4b22..c035fc626651 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ - python twisted urwid beautifulsoup wxPython pygobject + python twisted urwid beautifulsoup wxPython pygobject2 wokkel dbus-python pyfeed wrapPython setuptools ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 64911271f5e5..8a7d2bbd126f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2 , libnotify, nspr, nss, systemd, xorg }: let @@ -16,10 +16,10 @@ let fontconfig freetype glib - gnome.GConf - gnome.gdk_pixbuf - gnome.gtk - gnome.pango + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango libnotify nspr nss diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index de8d0c19b4f8..980d21572cc0 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "xmpp-client-${version}"; - version = "20160110-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff"; + version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; goPackagePath = "github.com/agl/xmpp-client"; - src = fetchgit { + src = fetchFromGitHub { + owner = "agl"; + repo = "xmpp-client"; inherit rev; - url = "https://github.com/agl/xmpp-client"; - sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; + sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "An XMPP client with OTR support"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json deleted file mode 100644 index 7ac2b86cc21f..000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix new file mode 100644 index 000000000000..caa41024fc61 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index da47ec6580b8..bc1d03444904 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, lua, perl, python -, libtool, pciutils, dbus_glib, libcanberra, libproxy +{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python +, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool , desktop_file_utils, hicolor_icon_theme }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk lua perl python pciutils dbus_glib libcanberra libproxy + gtk2 lua perl python pciutils dbus_glib libcanberra_gtk2 libproxy libsexy libnotify openssl desktop_file_utils hicolor_icon_theme ]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index a467cead17c4..5fd453685365 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "0.8.19"; + version = "0.8.20"; name = "irssi-${version}"; src = fetchurl { urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; - sha256 = "0ny8dry1b8siyc5glaxcwzng0d2mxnwxk74v64f8xplqhrvlnkzy"; + sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 62a58c42cd43..346dba3acd5f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager +, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme +, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 , glib_networking, gsettings_desktop_schemas @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme + [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme libetpan perl pkgconfig python wrapGAppsHook glib_networking ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra + ++ optional enablePluginNotificationSounds libcanberra_gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0be5e0bd57eb..d5bda113ba8c 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, which, perl, autoreconfHook +{ stdenv, fetchurl, ncurses, which, perl , gdbm ? null , openssl ? null , cyrus_sasl ? null , gpgme ? null -, aclocal ? null , headerCache ? true , sslSupport ? true , saslSupport ? true , gpgmeSupport ? true , imapSupport ? true -, withSidebar ? false -, withTrash ? false +, withSidebar ? true }: assert headerCache -> gdbm != null; @@ -22,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65"; + sha256 = "0idkamdiwj9fgqaz1vzkfg78cnmkzp74skv0ibw2xjfq6ds9hghx"; }; buildInputs = @@ -34,8 +32,7 @@ stdenv.mkDerivation rec { ++ optional headerCache gdbm ++ optional sslSupport openssl ++ optional saslSupport cyrus_sasl - ++ optional gpgmeSupport gpgme - ++ optional withSidebar autoreconfHook; + ++ optional gpgmeSupport gpgme; configureFlags = [ (enableFeature headerCache "hcache") @@ -60,18 +57,6 @@ stdenv.mkDerivation rec { ] ++ optional sslSupport "--with-ssl" ++ optional saslSupport "--with-sasl"; - patches = - optional withTrash (fetchpatch { - name = "trash.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/trash.patch?h=mutt-sidebar"; - sha256 = "1hrib9jk28mqd02nzv0sx01jfdabzvnwcc5qjc3810zfglzc1nql"; - }) ++ - optional withSidebar (fetchpatch { - name = "sidebar.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sidebar.patch?h=mutt-sidebar"; - sha256 = "1l63wj7kw41jrh00mcxdw4p4vrbc9wld42s99liw8kz2aclymq5m"; - }); - meta = { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index be4ce9e41f26..c1c7947cd0a0 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160827"; + version = "20160910"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1gam2iyy75drlp9ap1hlfb38i0p6zwgw09m08m5x50dbp3lxf7xp"; + sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 65c1001ae781..b1cdd509f98e 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk2 , openssl ? null , gpgme ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk ] + [ pkgconfig gtk2 ] ++ optional sslSupport openssl ++ optional gpgSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f2b2f6dfa5ca..c1bcd9ac5413 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -15,7 +15,7 @@ , glibc , gst_plugins_base , gstreamer -, gtk +, gtk2 , kerberos , libX11 , libXScrnSaver @@ -26,7 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , mesa @@ -87,7 +87,7 @@ stdenv.mkDerivation { glibc gst_plugins_base gstreamer - gtk + gtk2 kerberos libX11 libXScrnSaver @@ -98,7 +98,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b03698f10fad..ded4e66e3669 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL +{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx - [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 9ca5ace2caf8..e8885edaa2aa 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,9 +1,9 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null +, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify }: -assert spellChecking -> gtkspell != null; +assert spellChecking -> gtkspell2 != null; let version = "0.139"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; }; - buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] - ++ stdenv.lib.optional spellChecking gtkspell; + buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] + ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 53b7b7748b24..b540ffd0967c 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl +{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl , libX11, boost, zlib, libnotify }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; }; - buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ]; + buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; installPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f3c94e8577f8..620b8601d7dc 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.5"; + version = "3.3.7"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1nh4lr4kbgh6rrsjax2a4lg82vn1ld0rnqjpp7sb6vpz8ikavk9q"; + sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 421fd9afb168..3a6a71843a2d 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk, gdk_pixbuf, pango, atk, cairo, openssl }: +libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { name = "transgui-5.0.1-svn-r${revision}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig unzip fpc lazarus stdenv.cc - libX11 glib gtk gdk_pixbuf pango atk cairo openssl + libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl ]; NIX_LDFLAGS = " diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 4f64e947f09e..f8ec7ec01d91 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -8,7 +8,7 @@ , tzdata , cacert , glib -, gtk +, gtk2 , atk , gdk_pixbuf , cairo @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { makeWrapper busybox file - gtk + gtk2 gdk_pixbuf ]; libPath = stdenv.lib.makeLibraryPath [ glib - gtk + gtk2 atk gdk_pixbuf cairo @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index cc6ec9bd2315..5483e9420761 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,20 +1,24 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor -, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll , libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true }: stdenv.mkDerivation rec { - name = "freerdp-1.2.0-beta1"; + name = "freerdp-2.0-dev"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "1.2.0-beta1+android7"; - sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; + rev = "1855e36179fb197e713d41c4ef93e19cf1f0be2f"; + sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q"; }; + prePatch = '' + substituteInPlace "libfreerdp/freerdp.pc.in" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + ''; + patches = [ ] ++ stdenv.lib.optional (pcsclite != null) (substituteAll { @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { }); buildInputs = [ - cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib + cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; @@ -38,7 +42,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON"; - meta = with stdenv.lib; { description = "A Remote Desktop Protocol Client"; longDescription = '' @@ -51,4 +54,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 05019f833538..503632c009b0 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: stdenv.mkDerivation rec { version = "0.67"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95ebc..9bc389961079 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk2, gettext, libxkbfile, libgnome_keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 + glib gtk2 gettext libxkbfile libgnome_keyring libX11 freerdp libssh libgcrypt gnutls ]; cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index f5104665562d..5bc5bafe7db8 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk, libpcap, libglade, libgnome, libgnomeui +{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui , gnomedocutils, scrollkeeper, libxslt }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; buildInputs = [ - pkgconfig libtool gtk libpcap libglade libgnome libgnomeui gnomedocutils + pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils scrollkeeper libxslt ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bbd08f005779..99df01afa6a4 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , zlib -, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null }: -assert withGtk -> !withQt && gtk != null; +assert withGtk -> !withQt && gtk2 != null; assert withQt -> !withGtk && qt4 != null; with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation { bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls geoip libnl c-ares python libcap glib zlib ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]); + ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index c1907c44e584..3190d999a912 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: +{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: let inherit (python3Packages) python dbus-python keyring; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; }; - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfsFuse encfs ]; + buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; installFlags = [ "DEST=$(out)" ]; diff --git a/pkgs/applications/networking/syncthing/inotify-deps.json b/pkgs/applications/networking/syncthing/inotify-deps.json deleted file mode 100644 index e0cc9680e228..000000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/cenkalti/backoff", - "fetch": { - "type": "git", - "url": "https://github.com/cenkalti/backoff", - "rev": "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6", - "sha256": "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh" - } - }, - { - "goPackagePath": "github.com/gobwas/glob", - "fetch": { - "type": "git", - "url": "https://github.com/gobwas/glob", - "rev": "ce6abff51712df5da11095fb41dd4b0353559797", - "sha256": "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m" - } - }, - { - "goPackagePath": "github.com/syncthing/syncthing", - "fetch": { - "type": "git", - "url": "https://github.com/syncthing/syncthing", - "rev": "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8", - "sha256": "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9" - } - }, - { - "goPackagePath": "github.com/zillode/notify", - "fetch": { - "type": "git", - "url": "https://github.com/zillode/notify", - "rev": "2da5cc9881e8f16bab76b63129c7781898f97d16", - "sha256": "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40" - } - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix new file mode 100644 index 000000000000..302e5ee10e15 --- /dev/null +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; + sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "ce6abff51712df5da11095fb41dd4b0353559797"; + sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + }; + } + { + goPackagePath = "github.com/syncthing/syncthing"; + fetch = { + type = "git"; + url = "https://github.com/syncthing/syncthing"; + rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; + sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + }; + } + { + goPackagePath = "github.com/zillode/notify"; + fetch = { + type = "git"; + url = "https://github.com/zillode/notify"; + rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; + sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index 4f001794e86d..ea8d73cb8639 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; }; - goDeps = ./inotify-deps.json; + goDeps = ./inotify-deps.nix; meta = { homepage = https://github.com/syncthing/syncthing-inotify; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 9f436d21bc3d..5735dd68bcd2 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; postPatch = '' # Mostly a cosmetic change diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json deleted file mode 100644 index b21f2ef6a168..000000000000 --- a/pkgs/applications/networking/syncthing012/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/bkaradzic/go-lz4", - "fetch": { - "type": "git", - "url": "https://github.com/bkaradzic/go-lz4", - "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", - "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" - } - }, - { - "goPackagePath": "github.com/calmh/luhn", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/luhn", - "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", - "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/vitrun/qart", - "fetch": { - "type": "git", - "url": "https://github.com/vitrun/qart", - "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", - "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" - } - }, - { - "goPackagePath": "github.com/calmh/du", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/du", - "rev": "3c0690cca16228b97741327b1b6781397afbdb24", - "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" - } - }, - { - "goPackagePath": "github.com/calmh/xdr", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/xdr", - "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", - "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" - } - }, - { - "goPackagePath": "github.com/juju/ratelimit", - "fetch": { - "type": "git", - "url": "https://github.com/juju/ratelimit", - "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", - "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" - } - }, - { - "goPackagePath": "github.com/thejerf/suture", - "fetch": { - "type": "git", - "url": "https://github.com/thejerf/suture", - "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", - "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy", - "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", - "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" - } - }, - { - "goPackagePath": "github.com/syndtr/goleveldb", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/goleveldb", - "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0", - "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb" - } - } -] diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix new file mode 100644 index 000000000000..44e18c2f606d --- /dev/null +++ b/pkgs/applications/networking/syncthing012/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/calmh/luhn"; + fetch = { + type = "git"; + url = "https://github.com/calmh/luhn"; + rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; + sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/vitrun/qart"; + fetch = { + type = "git"; + url = "https://github.com/vitrun/qart"; + rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; + sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; + }; + } + { + goPackagePath = "github.com/calmh/du"; + fetch = { + type = "git"; + url = "https://github.com/calmh/du"; + rev = "3c0690cca16228b97741327b1b6781397afbdb24"; + sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; + }; + } + { + goPackagePath = "github.com/calmh/xdr"; + fetch = { + type = "git"; + url = "https://github.com/calmh/xdr"; + rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; + sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; + sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; + }; + } + { + goPackagePath = "github.com/thejerf/suture"; + fetch = { + type = "git"; + url = "https://github.com/thejerf/suture"; + rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; + sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; + sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; + }; + } +] diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 4ec939a01290..059c68b77e65 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; - preInstall = '' + prePatch = '' sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h ''; diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 5c87218e306f..ef824f57a354 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile -, intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice +, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant bzip2 isocodes # glib, gtk... - glib gtk goffice webkit + glib gtk2 goffice webkit # gnome... dconf gconf libgnomecanvas gsettings_desktop_schemas # financial @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; # The following settings fix failures in the test suite. It's not required otherwise. - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ]; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 7ef77dc2562d..1eedf1f313b7 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml + pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 2516cfd45971..f375da175044 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { KDEDIRS = libalkimia; - patches = [ ./qgpgme.patch ]; + patches = [ + ./qgpgme.patch + ./seqaccessmgrtest.patch + ]; meta = { homepage = http://kmymoney2.sourceforge.net/; diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch new file mode 100644 index 000000000000..d01a433ba09a --- /dev/null +++ b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch @@ -0,0 +1,26 @@ +Fix tests for 32bit builds until we can bring these upstream +diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +index dcb4b4a..e803203 100644 +--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() + QCOMPARE(m->m_nextPayeeID, 0ul); + QCOMPARE(m->m_nextScheduleID, 0ul); + QCOMPARE(m->m_nextReportID, 0ul); +- QCOMPARE(m->m_institutionList.count(), 0ul); +- QCOMPARE(m->m_accountList.count(), 5ul); +- QCOMPARE(m->m_transactionList.count(), 0ul); +- QCOMPARE(m->m_transactionKeys.count(), 0ul); +- QCOMPARE(m->m_payeeList.count(), 0ul); +- QCOMPARE(m->m_tagList.count(), 0ul); +- QCOMPARE(m->m_scheduleList.count(), 0ul); ++ QCOMPARE(m->m_institutionList.count(), (size_t)0); ++ QCOMPARE(m->m_accountList.count(), (size_t)5); ++ QCOMPARE(m->m_transactionList.count(), (size_t)0); ++ QCOMPARE(m->m_transactionKeys.count(), (size_t)0); ++ QCOMPARE(m->m_payeeList.count(), (size_t)0); ++ QCOMPARE(m->m_tagList.count(), (size_t)0); ++ QCOMPARE(m->m_scheduleList.count(), (size_t)0); + + QCOMPARE(m->m_dirty, false); + QCOMPARE(m->m_creationDate, QDate::currentDate()); diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md new file mode 100644 index 000000000000..eb21fe2f441e --- /dev/null +++ b/pkgs/applications/office/libreoffice/README.md @@ -0,0 +1,10 @@ +LibreOffice +=========== + +To generate `libreoffice-srcs.nix`: + + nix-shell default-gen-shell.nix --run generate + +To generate `libreoffice-srcs-still.nix`: + + nix-shell still-gen-shell.nix --run generate diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/pkgs/applications/office/libreoffice/default-gen-shell.nix new file mode 100644 index 000000000000..366030971237 --- /dev/null +++ b/pkgs/applications/office/libreoffice/default-gen-shell.nix @@ -0,0 +1,29 @@ +{ pkgs ? (import <nixpkgs> {}) }: + +with pkgs; + +let + + primary-src = callPackage ./default-primary-src.nix {}; + +in + +stdenv.mkDerivation { + name = "generate-libreoffice-srcs-shell"; + + buildCommand = "exit 1"; + + downloadList = stdenv.mkDerivation { + name = "libreoffice-${primary-src.version}-download-list"; + inherit (primary-src) src version; + builder = ./download-list-builder.sh; + }; + + buildInputs = [ python3 ]; + + shellHook = '' + function generate { + python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix + } + ''; +} diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix new file mode 100644 index 000000000000..2af9e4337893 --- /dev/null +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -0,0 +1,17 @@ +{ fetchurl }: + +rec { + major = "5"; + minor = "2"; + patch = "1"; + tweak = "2"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1"; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index caf500d2b97c..c0e1e7b290d2 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -19,22 +19,14 @@ }: let + primary-src = import ./default-primary-src.nix { inherit fetchurl; }; +in + +with { inherit (primary-src) major minor subdir version; }; + +let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; - major = "5"; - minor = "2"; - patch = "0"; - tweak = "4"; - subdir = "${major}.${minor}.${patch}"; - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { - inherit name md5; - url = if brief then - "http://dev-www.libreoffice.org/src/${subDir}${name}" - else - "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; - }; fetchSrc = {name, sha256}: fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; @@ -42,32 +34,29 @@ let }; srcs = { - third_party = [ (fetchurl rec { + third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; - md5 = "185d60944ea767075d27247c3162b3bc"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; - }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); + }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0a3dnqm9k1skp7jvg354fdn84y0ylvnjzpd4v2r2mbz8vc4p3ld5"; + sha256 = "1ahdz1ynbab001441lqqlfphysr867rjcndq93z66mr5v3r1spvm"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1gyakwbbsd3aykf0gsanyg6p4g4qixj1rh6qxspln70afl3kxm90"; + sha256 = "0mln1mqy3c7k4c449w5knjnc4dv0ckl0i7q47p2pldxjjf5n2887"; }; }; in stdenv.mkDerivation rec { name = "libreoffice-${version}"; - src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1v3bbk2afq61gs3l4qvc1r6y0ylr21jzbm3wcnyq9c3bbyw43pj7"; - }; + inherit (primary-src) src; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. @@ -87,7 +76,7 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -242,7 +231,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh new file mode 100644 index 000000000000..c054e2c72cbe --- /dev/null +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -0,0 +1,3 @@ +source $stdenv/setup + +tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py new file mode 100755 index 000000000000..3d56c74e3ab8 --- /dev/null +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -0,0 +1,307 @@ +#!/usr/bin/env python3 + +""" +Converts the LibreOffice `download.lst` file into a Nix expression. + +Requires an environment variable named `downloadList` identifying the path +of the input file, and writes the result to stdout. + +todo - Ideally we would move as much as possible into derivation dependencies. +""" +import collections, itertools, json, re, subprocess, sys, os + +def main(): + + packages = list(get_packages()) + + for x in packages: + print(x, file=sys.stderr) + + print('[') + + for x in packages: + + md5 = x['md5'] + tarball = x['tarball'] + + url = construct_url(x) + print('url: {}'.format(url), file=sys.stderr) + + path = download(url, tarball, md5) + print('path: {}'.format(path), file=sys.stderr) + + sha256 = get_sha256(path) + print('sha256: {}'.format(sha256), file=sys.stderr) + + print(' {') + print(' name = "{}";'.format(tarball)) + print(' url = "{}";'.format(url)) + print(' sha256 = "{}";'.format(sha256)) + print(' md5 = "{}";'.format(md5)) + print(' md5name = "{}-{}";'.format(md5,tarball)) + print(' }') + + print(']') + + +def construct_url(x): + if x['brief']: + return 'http://dev-www.libreoffice.org/src/{}{}'.format( + x.get('subdir', ''), x['tarball']) + else: + return 'http://dev-www.libreoffice.org/src/{}{}-{}'.format( + x.get('subdir', ''), x['md5'], x['tarball']) + + +def download(url, name, md5): + cmd = ['nix-prefetch-url', url, md5, '--print-path', + '--type', 'md5', '--name', name] + proc = subprocess.run(cmd, stdout=subprocess.PIPE, check=True, + universal_newlines=True) + return proc.stdout.split('\n')[1].strip() + + +def get_sha256(path): + cmd = ['sha256sum', path] + proc = subprocess.run(cmd, stdout=subprocess.PIPE, check=True, + universal_newlines=True) + return proc.stdout.split(' ')[0].strip() + + +def get_packages(): + """ + All of the package data: What's parsed from download.lst, + plus our additions. + """ + return apply_additions(get_packages_from_download_list(), + get_additions()) + + +def get_additions(): + """ + A mapping from package name (the all-caps identifiers used in + `download.lst`) to a dict of additional attributes to set on the package. + """ + with open('./libreoffice-srcs-additions.json') as f: + return json.load(f) + + +def apply_additions(xs, additions): + for x in xs: + yield dict_merge([x, + additions.get(x['name'], {})]) + + +def get_packages_from_download_list(): + """ + The result of parsing `download.lst`: A list of dicts containing keys + 'name', 'tarball', 'md5', 'brief'. + """ + + def lines(): + for x in sub_symbols(parse_lines(get_lines())): + + interpretation = interpret(x) + + if interpretation == 'unrecognized': + print_skipped_line(x) + else: + yield dict_merge([x, + interpretation]) + + def cluster(xs): + """ + Groups lines according to their order within the file, to support + packages that are listed in `download.lst` more than once. + """ + keys = ['tarball', 'md5', 'brief'] + a = {k: [x for x in xs if k in x['attrs']] for k in keys} + return zip(*[a[k] for k in keys]) + + def packages(): + for (name, group) in groupby(lines(), lambda x: x['name']): + for xs in cluster(group): + yield {'name': name, + 'attrs': dict_merge(x['attrs'] for x in xs), + 'index': min(x['index'] for x in xs)} + + for x in sorted(packages(), key=lambda x: x['index']): + yield dict_merge([{'name': x['name']}, + x['attrs']]) + + +def dict_merge(xs): + """ + >>> dict_merge([{1: 2}, {3: 4}, {3: 5}]) + {1: 2, 3: 4} + """ + return dict(collections.ChainMap(*xs)) + + +def groupby(xs, f): + """ + >>> groupby([1, 2, 3, 4], lambda x: x % 2) + [(0, [2, 4]), (1, [1, 3])] + """ + for (k, iter) in itertools.groupby(sorted(xs, key=f), f): + group = list(iter) + yield (f(group[0]), group) + + +def get_lines(): + + download_list = os.getenv('downloadList') + + with open(download_list) as f: + return f.read().splitlines() + + +def print_skipped_line(x): + + print('Skipped line {}: {}'.format(x['index'], + x['original']), + file=sys.stderr) + + +def parse_lines(lines): + """ + Input: List of strings (the lines from `download.lst` + Output: Iterator of dicts with keys 'key', 'value', and 'index' + """ + for (index, line) in enumerate(lines): + + x = { 'index': index, 'original': line } + + result = parse_line(line) + + if result == 'nothing': + pass + elif result == 'unrecognized': + print_skipped_line(x) + else: + yield dict_merge([x, + result]) + + +def parse_line(line): + """ + Input: A string + Output: One of 1. A dict with keys 'key', 'value' + 2. 'nothing' (if the line contains no information) + 2. 'unrecognized' (if parsing failed) + """ + + if re.match('\s*(#.*)?$', line): + return 'nothing' + + match = re.match('\s*export\s+([^:\s]+)\s*:=\s*(.*)$', line) + + if match: + return { + 'key': match.group(1), + 'value': match.group(2).strip() + } + else: + return 'unrecognized' + + +def sub_symbols(xs): + """ + Do substitution of variables across all lines. + + >>> sub_symbols([{'key': 'a', 'value': 'x'}, + ... {'key': 'c': 'value': '$(a)yz'}]) + [{'key': 'a', 'value': 'x'}, {'key': 'c': 'value': 'xyz'}] + """ + + xs = list(xs) + + symbols = {x['key']: x for x in xs} + + def get_value(k): + x = symbols.get(k) + return x['value'] if x is not None else None + + for x in xs: + yield dict_merge([{'value': sub_str(x['value'], get_value)}, + x]) + + +def sub_str(string, func): + """ + Do substitution of variables in a single line. + + >>> sub_str("x = $(x)", lambda k: {'x': 'a'}[k]) + "x = a" + """ + + def func2(m): + x = m.group(1) + result = func(x) + return result if result is not None else x + + return re.sub(r'\$\(([^\$\(\)]+)\)', func2, string) + + +def interpret(x): + """ + Input: Dict with keys 'key' and 'value' + Output: One of 1. Dict with keys 'name' and 'attrs' + 2. 'unrecognized' (if interpretation failed) + """ + for f in [interpret_md5, interpret_tarball_with_md5, interpret_tarball]: + result = f(x) + if result is not None: + return result + + return 'unrecognized' + + +def interpret_md5(x): + """ + >>> interpret_md5("ODFGEN_MD5SUM", "32572ea48d9021bbd6fa317ddb697abc") + {'name': 'ODFGEN', 'attrs': {'md5': '32572ea48d9021bbd6fa317ddb697abc'}} + """ + + match = re.match('^(.*)_MD5SUM$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'md5': x['value']}} + + +def interpret_tarball(x): + """ + >>> interpret_tarball("FREEHAND_TARBALL", "libfreehand-0.1.1.tar.bz2") + {'name': 'FREEHAND', + 'attrs': {'tarball': 'libfreehand-0.1.1.tar.bz2', 'brief': True}} + """ + + match = re.match('^(.*)_TARBALL$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'tarball': x['value'], 'brief': True}} + + +def interpret_tarball_with_md5(x): + """ + >>> interpret_tarball_with_md5("CLUCENE_TARBALL",\ + "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz") + {'name': 'CLUCENE', + 'attrs': {'tarball': 'clucene-core-2.3.3.4.tar.gz', + 'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}} + """ + + match = {'key': re.match('^(.*)_TARBALL$', x['key']), + 'value': re.match('(?P<md5>[0-9a-fA-F]{32})-(?P<tarball>.+)$', + x['value'])} + + if match['key'] and match['value']: + return {'name': match['key'].group(1), + 'attrs': {'tarball': match['value'].group('tarball'), + 'md5': match['value'].group('md5'), + 'brief': False}} + + +main() diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh deleted file mode 100755 index 0c92a1c5553f..000000000000 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/run/current-system/sw/bin/bash - -# Ideally we would move as much as possible into derivation dependencies - -# Take the list of files from the main package, ooo.lst.in - -# This script wants an argument: download list file - -cat <<EOF -[ -EOF - -write_entry(){ - echo '{' - echo " name = \"${name}\";" - echo " md5 = \"${md5}\";" - echo " brief = ${brief};" - eval "echo -n \"\$additions_${name%%[-_.]*}\"" - eval "test -n \"\$additions_${name%%[-_.]*}\" && echo" - echo '}' -} - -cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" | -while read line; do - case "$line" in - EVAL\ *) - echo "${line#* }" >&2; - eval "${line#* }"; - ;; - \#*) - echo Skipping comment: "$line" >&2; - ;; - *_MD5SUM\ :=*) - read tbline; - line=${line##* }; - line=${line##*:=}; - if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then - verline=${tbline##* }; - read tbline; - tbline=${tbline##* }; - tbline=${tbline##*:=}; - md5=$line - name=$tbline; - name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}" - else - tbline=${tbline##* }; - tbline=${tbline##*:=}; - md5=$line - name=$tbline; - fi - brief=true; - write_entry; - ;; - *_TARBALL\ :=*) - line=${line##* }; - line=${line##*:=}; - line="${line#,}" - md5=${line:0:32}; - name=${line:33}; - name="${name%)}" - brief=false; - write_entry; - ;; - *) - echo Skipping: "$line" >&2; - ;; - esac -done - -echo ']' diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json new file mode 100644 index 000000000000..75d4cced92a6 --- /dev/null +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json @@ -0,0 +1,3 @@ +{ + "LIBGLTF": {"subdir": "libgltf/"} +} diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh deleted file mode 100644 index d505aa7a4cbb..000000000000 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh +++ /dev/null @@ -1 +0,0 @@ -EVAL additions_libgltf=' subDir = "libgltf/";' diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 0d626728c9a4..d2010d81a8a7 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -1,528 +1,737 @@ [ -{ - name = "libabw-0.1.1.tar.bz2"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - brief = true; -} -{ - name = "commons-logging-1.2-src.tar.gz"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - brief = true; -} -{ - name = "apr-1.4.8.tar.gz"; - md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; - brief = true; -} -{ - name = "apr-util-1.5.3.tar.gz"; - md5 = "71a11d037240b292f824ba1eb537b4e3"; - brief = true; -} -{ - name = "boost_1_59_0.tar.bz2"; - md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; - brief = true; -} -{ - name = "bsh-2.0b5-src.zip"; - md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; - brief = false; -} -{ - name = "bzip2-1.0.6.tar.gz"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - brief = false; -} -{ - name = "cairo-1.10.2.tar.gz"; - md5 = "f101a9e88b783337b20b2e26dfd26d5f"; - brief = false; -} -{ - name = "libcdr-0.1.2.tar.bz2"; - md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; - brief = true; -} -{ - name = "clucene-core-2.3.3.4.tar.gz"; - md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; - brief = false; -} -{ - name = "libcmis-0.5.0.tar.gz"; - md5 = "5821b806a98e6c38370970e682ce76e8"; - brief = false; -} -{ - name = "CoinMP-1.7.6.tgz"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - brief = true; -} -{ - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - brief = false; -} -{ - name = "cppunit-1.13.2.tar.gz"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - brief = true; -} -{ - name = "converttexttonumber-1-5-0.oxt"; - md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; - brief = false; -} -{ - name = "curl-7.43.0.tar.bz2"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - brief = true; -} -{ - name = "libe-book-0.1.2.tar.bz2"; - md5 = "6b48eda57914e6343efebc9381027b78"; - brief = true; -} -{ - name = "epm-3.7.tar.gz"; - md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; - brief = false; -} -{ - name = "libetonyek-0.1.6.tar.bz2"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - brief = true; -} -{ - name = "expat-2.1.1.tar.bz2"; - md5 = "7380a64a8e3a9d66a9887b01d0d7ea81"; - brief = true; -} -{ - name = "Firebird-2.5.4.26856-0.tar.bz2"; - md5 = "7a17ec9889424b98baa29e001a054434"; - brief = true; -} -{ - name = "fontconfig-2.8.0.tar.gz"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - brief = false; -} -{ - name = "crosextrafonts-20130214.tar.gz"; - md5 = "368f114c078f94214a308a74c7e991bc"; - brief = false; -} -{ - name = "crosextrafonts-carlito-20130920.tar.gz"; - md5 = "c74b7223abe75949b4af367942d96c7a"; - brief = false; -} -{ - name = "dejavu-fonts-ttf-2.35.zip"; - md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; - brief = false; -} -{ - name = "gentiumbasic-fonts-1.10.zip"; - md5 = "35efabc239af896dfb79be7ebdd6e6b9"; - brief = false; -} -{ - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - md5 = "134d8262145fc793c6af494dcace3e71"; - brief = false; -} -{ - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - brief = false; -} -{ - name = "LinLibertineG-20120116.zip"; - md5 = "e7a384790b13c29113e22e596ade9687"; - brief = false; -} -{ - name = "open-sans-font-ttf-1.10.tar.gz"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - brief = false; -} -{ - name = "pt-serif-font-1.0000W.tar.gz"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - brief = false; -} -{ - name = "source-code-font-1.009.tar.gz"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - brief = false; -} -{ - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - brief = false; -} -{ - name = "libfreehand-0.1.1.tar.bz2"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - brief = true; -} -{ - name = "freetype-2.4.8.tar.bz2"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - brief = false; -} -{ - name = "glew-1.12.0.zip"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - brief = false; -} -{ - name = "glm-0.9.4.6-libreoffice.zip"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - brief = false; -} -{ - name = "glyphy-0.2.0.tar.bz2"; - md5 = "5d303fb955beb9bf112267316ca9d021"; - brief = false; -} -{ - name = "graphite-minimal-1.3.6.tgz"; - md5 = "17df8301bcc459e83f8a8f3aca6183b2"; - brief = false; -} -{ - name = "harfbuzz-0.9.40.tar.bz2"; - md5 = "0e27e531f4c4acff601ebff0957755c2"; - brief = true; -} -{ - name = "hsqldb_1_8_0.zip"; - md5 = "17410483b5b5f267aa18b7e00b65e6e0"; - brief = false; -} -{ - name = "hunspell-1.3.3.tar.gz"; - md5 = "4967da60b23413604c9e563beacc63b4"; - brief = false; -} -{ - name = "hyphen-2.8.8.tar.gz"; - md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; - brief = false; -} -{ - name = "icu4c-56_1-src.tgz"; - md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; - brief = false; -} -{ - name = "flow-engine-0.9.4.zip"; - md5 = "ba2930200c9f019c2d93a8c88c651a0f"; - brief = false; -} -{ - name = "flute-1.1.6.zip"; - md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; - brief = false; -} -{ - name = "libbase-1.1.6.zip"; - md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; - brief = false; -} -{ - name = "libfonts-1.1.6.zip"; - md5 = "3bdf40c0d199af31923e900d082ca2dd"; - brief = false; -} -{ - name = "libformula-1.1.7.zip"; - md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; - brief = false; -} -{ - name = "liblayout-0.2.10.zip"; - md5 = "db60e4fde8dd6d6807523deb71ee34dc"; - brief = false; -} -{ - name = "libloader-1.1.6.zip"; - md5 = "97b2d4dba862397f446b217e2b623e71"; - brief = false; -} -{ - name = "librepository-1.1.6.zip"; - md5 = "8ce2fcd72becf06c41f7201d15373ed9"; - brief = false; -} -{ - name = "libserializer-1.1.6.zip"; - md5 = "f94d9870737518e3b597f9265f4e9803"; - brief = false; -} -{ - name = "libxml-1.1.7.zip"; - md5 = "ace6ab49184e329db254e454a010f56d"; - brief = false; -} -{ - name = "sacjava-1.3.zip"; - md5 = "39bb3fcea1514f1369fcfc87542390fd"; - brief = false; -} -{ - name = "jpegsrc.v9a.tar.gz"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - brief = true; -} -{ - name = "libjpeg-turbo-1.4.2.tar.gz"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - brief = true; -} -{ - name = "language-subtag-registry-2016-02-10.tar.bz2"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; - brief = true; -} -{ - name = "JLanguageTool-1.7.0.tar.bz2"; - md5 = "b63e6340a02ff1cacfeadb2c42286161"; - brief = false; -} -{ - name = "lcms2-2.6.tar.gz"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - brief = true; -} -{ - name = "libatomic_ops-7_2d.zip"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - brief = true; -} -{ - name = "libeot-0.01.tar.bz2"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - brief = true; -} -{ - name = "libexttextcat-3.4.4.tar.bz2"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - brief = false; -} -{ - name = "libgltf-0.0.2.tar.bz2"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - brief = true; - subDir = "libgltf/"; -} -{ - name = "liblangtag-0.5.8.tar.bz2"; - md5 = "aa899eff126216dafe721149fbdb511b"; - brief = false; -} -{ - name = "xmlsec1-1.2.14.tar.gz"; - md5 = "1f24ab1d39f4a51faf22244c94a6203f"; - brief = false; -} -{ - name = "libxml2-2.9.4.tar.gz"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - brief = false; -} -{ - name = "libxslt-1.1.28.tar.gz"; - md5 = "9667bf6f9310b957254fdcf6596600b7"; - brief = false; -} -{ - name = "lp_solve_5.5.tar.gz"; - md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; - brief = false; -} -{ - name = "mariadb_client-2.0.0-src.tar.gz"; - md5 = "a233181e03d3c307668b4c722d881661"; - brief = false; -} -{ - name = "mdds_0.12.1.tar.bz2"; - md5 = "ef2560ed5416652a7fe195305b14cebe"; - brief = true; -} -{ - name = "libmspub-0.1.2.tar.bz2"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - brief = true; -} -{ - name = "libmwaw-0.3.7.tar.bz2"; - md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; - brief = true; -} -{ - name = "mysql-connector-c++-1.1.4.tar.gz"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - brief = false; -} -{ - name = "mythes-1.2.4.tar.gz"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - brief = false; -} -{ - name = "neon-0.30.1.tar.gz"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - brief = false; -} -{ - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - brief = false; -} -{ - name = "libodfgen-0.1.6.tar.bz2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - brief = true; -} -{ - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - brief = true; -} -{ - name = "openldap-2.4.31.tgz"; - md5 = "804c6cb5698db30b75ad0ff1c25baefd"; - brief = false; -} -{ - name = "openssl-1.0.2h.tar.gz"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - brief = true; -} -{ - name = "liborcus-0.9.2.tar.gz"; - md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; - brief = true; -} -{ - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - brief = true; -} -{ - name = "libpagemaker-0.0.2.tar.bz2"; - md5 = "795cc7a59ace4db2b12586971d668671"; - brief = true; -} -{ - name = "pixman-0.24.4.tar.bz2"; - md5 = "c63f411b3ad147db2bcce1bf262a0e02"; - brief = false; -} -{ - name = "libpng-1.6.19.tar.gz"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - brief = true; -} -{ - name = "poppler-0.26.4.tar.gz"; - md5 = "35c0660065d023365e9854c13e289d12"; - brief = true; -} -{ - name = "postgresql-9.2.1.tar.bz2"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - brief = false; -} -{ - name = "Python-3.3.5.tgz"; - md5 = "803a75927f8f241ca78633890c798021"; - brief = true; -} -{ - name = "Python-3.5.0.tgz"; - md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; - brief = true; -} -{ - name = "raptor2-2.0.9.tar.gz"; - md5 = "4ceb9316488b0ea01acf011023cf7fff"; - brief = false; -} -{ - name = "rasqal-0.9.30.tar.gz"; - md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; - brief = false; -} -{ - name = "redland-1.0.16.tar.gz"; - md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; - brief = false; -} -{ - name = "librevenge-0.0.4.tar.bz2"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - brief = true; -} -{ - name = "rhino1_5R5.zip"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - brief = false; -} -{ - name = "serf-1.2.1.tar.bz2"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - brief = true; -} -{ - name = "swingExSrc.zip"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - brief = false; -} -{ - name = "ucpp-1.3.2.tar.gz"; - md5 = "0168229624cfac409e766913506961a8"; - brief = false; -} -{ - name = "vigra1.6.0.tar.gz"; - md5 = "d62650a6f908e85643e557a236ea989c"; - brief = false; -} -{ - name = "libvisio-0.1.5.tar.bz2"; - md5 = "cbee198a78b842b2087f32d33c522818"; - brief = true; -} -{ - name = "libwpd-0.10.1.tar.bz2"; - md5 = "79b56bcc349264d686a67994506ad199"; - brief = true; -} -{ - name = "libwpg-0.3.1.tar.bz2"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - brief = true; -} -{ - name = "libwps-0.4.2.tar.bz2"; - md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; - brief = true; -} -{ - name = "xsltml_2.1.2.zip"; - md5 = "a7983f859eafb2677d7ff386a023bc40"; - brief = false; -} -{ - name = "zlib-1.2.8.tar.gz"; - md5 = "44d667c142d7cda120332623eab69f40"; - brief = true; -} + { + name = "libabw-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; + sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + md5 = "7a3815b506d064313ba309617b6f5a0b"; + md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + } + { + name = "commons-logging-1.2-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; + md5 = "ce977548f1cbf46918e93cd38ac35163"; + md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + } + { + name = "apr-1.4.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"; + sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.tar.gz"; + } + { + name = "apr-util-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz"; + sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz"; + } + { + name = "boost_1_59_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_59_0.tar.bz2"; + sha256 = "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca"; + md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; + md5name = "6aa9a5c6a4ca1016edd0ed1178e3cb87-boost_1_59_0.tar.bz2"; + } + { + name = "bsh-2.0b5-src.zip"; + url = "http://dev-www.libreoffice.org/src/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; + sha256 = "90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513"; + md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; + md5name = "ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; + } + { + name = "bzip2-1.0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + } + { + name = "cairo-1.10.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; + md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + } + { + name = "libcdr-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2"; + sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; + md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2"; + } + { + name = "clucene-core-2.3.3.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + } + { + name = "libcmis-0.5.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; + sha256 = "a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6"; + md5 = "5821b806a98e6c38370970e682ce76e8"; + md5name = "5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; + } + { + name = "CoinMP-1.7.6.tgz"; + url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + } + { + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + } + { + name = "cppunit-1.13.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; + sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; + md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; + md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + } + { + name = "converttexttonumber-1-5-0.oxt"; + url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; + md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; + md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + } + { + name = "curl-7.43.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; + sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; + md5 = "11bddbb452a8b766b932f859aaeeed39"; + md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + } + { + name = "libe-book-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; + sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + md5 = "6b48eda57914e6343efebc9381027b78"; + md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + } + { + name = "epm-3.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + } + { + name = "libetonyek-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; + sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; + md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + } + { + name = "expat-2.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.1.1.tar.bz2"; + sha256 = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"; + md5 = "7380a64a8e3a9d66a9887b01d0d7ea81"; + md5name = "7380a64a8e3a9d66a9887b01d0d7ea81-expat-2.1.1.tar.bz2"; + } + { + name = "Firebird-2.5.4.26856-0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/Firebird-2.5.4.26856-0.tar.bz2"; + sha256 = "4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3"; + md5 = "7a17ec9889424b98baa29e001a054434"; + md5name = "7a17ec9889424b98baa29e001a054434-Firebird-2.5.4.26856-0.tar.bz2"; + } + { + name = "fontconfig-2.8.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; + md5 = "77e15a92006ddc2adbb06f840d591c0e"; + md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + } + { + name = "crosextrafonts-20130214.tar.gz"; + url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; + md5 = "368f114c078f94214a308a74c7e991bc"; + md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + } + { + name = "crosextrafonts-carlito-20130920.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + } + { + name = "dejavu-fonts-ttf-2.35.zip"; + url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; + md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + } + { + name = "gentiumbasic-fonts-1.10.zip"; + url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; + md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + } + { + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; + md5 = "134d8262145fc793c6af494dcace3e71"; + md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + } + { + name = "liberation-fonts-ttf-2.00.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; + md5 = "5c781723a0d9ed6188960defba8e91cf"; + md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + } + { + name = "LinLibertineG-20120116.zip"; + url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; + md5 = "e7a384790b13c29113e22e596ade9687"; + md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + } + { + name = "open-sans-font-ttf-1.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; + md5 = "7a15edea7d415ac5150ea403e27401fd"; + md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + } + { + name = "pt-serif-font-1.0000W.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; + md5 = "c3c1a8ba7452950636e871d25020ce0d"; + md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + } + { + name = "source-code-font-1.009.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; + md5 = "0279a21fab6f245e85a6f85fea54f511"; + md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + } + { + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + } + { + name = "libfreehand-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; + sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; + md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; + } + { + name = "freetype-2.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; + md5 = "dbf2caca1d3afd410a29217a9809d397"; + md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + } + { + name = "glew-1.12.0.zip"; + url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; + md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + } + { + name = "glm-0.9.4.6-libreoffice.zip"; + url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + } + { + name = "glyphy-0.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + } + { + name = "graphite-minimal-1.3.6.tgz"; + url = "http://dev-www.libreoffice.org/src/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; + sha256 = "db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8"; + md5 = "17df8301bcc459e83f8a8f3aca6183b2"; + md5name = "17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; + } + { + name = "harfbuzz-0.9.40.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-0.9.40.tar.bz2"; + sha256 = "1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f"; + md5 = "0e27e531f4c4acff601ebff0957755c2"; + md5name = "0e27e531f4c4acff601ebff0957755c2-harfbuzz-0.9.40.tar.bz2"; + } + { + name = "hsqldb_1_8_0.zip"; + url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + } + { + name = "hunspell-1.3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; + sha256 = "a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c"; + md5 = "4967da60b23413604c9e563beacc63b4"; + md5name = "4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; + } + { + name = "hyphen-2.8.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + } + { + name = "icu4c-56_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; + sha256 = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"; + md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; + md5name = "c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; + } + { + name = "flow-engine-0.9.4.zip"; + url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + } + { + name = "flute-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + } + { + name = "libbase-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + } + { + name = "libfonts-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + } + { + name = "libformula-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + } + { + name = "liblayout-0.2.10.zip"; + url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + } + { + name = "libloader-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + } + { + name = "librepository-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + } + { + name = "libserializer-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + } + { + name = "libxml-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; + md5 = "ace6ab49184e329db254e454a010f56d"; + md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + } + { + name = "sacjava-1.3.zip"; + url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + } + { + name = "jpegsrc.v9a.tar.gz"; + url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; + sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; + } + { + name = "libjpeg-turbo-1.4.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; + sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; + md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + } + { + name = "language-subtag-registry-2016-02-10.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-02-10.tar.bz2"; + sha256 = "1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353"; + md5 = "d1e7c55a0383f7d720d3ead0b6117284"; + md5name = "d1e7c55a0383f7d720d3ead0b6117284-language-subtag-registry-2016-02-10.tar.bz2"; + } + { + name = "JLanguageTool-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; + md5 = "b63e6340a02ff1cacfeadb2c42286161"; + md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + } + { + name = "lcms2-2.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; + sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + } + { + name = "libatomic_ops-7_2d.zip"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; + sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + } + { + name = "libeot-0.01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + } + { + name = "libexttextcat-3.4.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; + md5 = "10d61fbaa6a06348823651b1bd7940fe"; + md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + } + { + name = "libgltf-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; + sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + } + { + name = "liblangtag-0.5.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa"; + md5 = "aa899eff126216dafe721149fbdb511b"; + md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + } + { + name = "xmlsec1-1.2.14.tar.gz"; + url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + sha256 = "390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a"; + md5 = "1f24ab1d39f4a51faf22244c94a6203f"; + md5name = "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + } + { + name = "libxml2-2.9.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; + md5 = "ae249165c173b1ff386ee8ad676815f5"; + md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + } + { + name = "libxslt-1.1.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"; + sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"; + md5 = "9667bf6f9310b957254fdcf6596600b7"; + md5name = "9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"; + } + { + name = "lp_solve_5.5.tar.gz"; + url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + } + { + name = "mariadb_client-2.0.0-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; + md5 = "a233181e03d3c307668b4c722d881661"; + md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + } + { + name = "mdds_0.12.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2"; + sha256 = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d"; + md5 = "ef2560ed5416652a7fe195305b14cebe"; + md5name = "ef2560ed5416652a7fe195305b14cebe-mdds_0.12.1.tar.bz2"; + } + { + name = "libmspub-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; + sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; + md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + } + { + name = "libmwaw-0.3.7.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2"; + sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; + md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2"; + } + { + name = "mysql-connector-c++-1.1.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; + md5 = "7239a4430efd4d0189c4f24df67f08e5"; + md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + } + { + name = "mythes-1.2.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; + md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; + md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + } + { + name = "neon-0.30.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; + md5 = "231adebe5c2f78fded3e3df6e958878e"; + md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + } + { + name = "nss-3.22.2-with-nspr-4.12.tar.gz"; + url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; + md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; + md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + } + { + name = "libodfgen-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; + md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + } + { + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; + sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + } + { + name = "openldap-2.4.31.tgz"; + url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; + md5 = "804c6cb5698db30b75ad0ff1c25baefd"; + md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + } + { + name = "openssl-1.0.2h.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; + md5 = "9392e65072ce4b614c1392eefc1f23d0"; + md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + } + { + name = "liborcus-0.9.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.9.2.tar.gz"; + sha256 = "adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b"; + md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; + md5name = "e6efcbe50a5fd4d50d513c9a7a4139b0-liborcus-0.9.2.tar.gz"; + } + { + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + } + { + name = "libpagemaker-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2"; + sha256 = "43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f"; + md5 = "795cc7a59ace4db2b12586971d668671"; + md5name = "795cc7a59ace4db2b12586971d668671-libpagemaker-0.0.2.tar.bz2"; + } + { + name = "pixman-0.24.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc"; + md5 = "c63f411b3ad147db2bcce1bf262a0e02"; + md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + } + { + name = "libpng-1.6.19.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.19.tar.gz"; + sha256 = "9f977ac8e4e3d4d5b001b32243f111eeec21bb6b59e583f2fb41fd2e48840352"; + md5 = "3121bdc77c365a87e054b9f859f421fe"; + md5name = "3121bdc77c365a87e054b9f859f421fe-libpng-1.6.19.tar.gz"; + } + { + name = "poppler-0.26.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz"; + sha256 = "e05a4d8d8252a564ec7a96a99af772042b2d85275ffda8043f427dde31e97fe8"; + md5 = "35c0660065d023365e9854c13e289d12"; + md5name = "35c0660065d023365e9854c13e289d12-poppler-0.26.4.tar.gz"; + } + { + name = "postgresql-9.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; + md5 = "c0b4799ea9850eae3ead14f0a60e9418"; + md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + } + { + name = "Python-3.3.5.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; + sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; + md5 = "803a75927f8f241ca78633890c798021"; + md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; + } + { + name = "Python-3.5.0.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz"; + sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz"; + } + { + name = "raptor2-2.0.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef"; + md5 = "4ceb9316488b0ea01acf011023cf7fff"; + md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + } + { + name = "rasqal-0.9.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd"; + md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; + md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + } + { + name = "redland-1.0.16.tar.gz"; + url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd"; + md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; + md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + } + { + name = "librevenge-0.0.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; + md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + } + { + name = "rhino1_5R5.zip"; + url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + } + { + name = "serf-1.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + } + { + name = "swingExSrc.zip"; + url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + } + { + name = "ucpp-1.3.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; + md5 = "0168229624cfac409e766913506961a8"; + md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + } + { + name = "vigra1.6.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; + sha256 = "1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f"; + md5 = "d62650a6f908e85643e557a236ea989c"; + md5name = "d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; + } + { + name = "libvisio-0.1.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; + sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + md5 = "cbee198a78b842b2087f32d33c522818"; + md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + } + { + name = "libwpd-0.10.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; + sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + md5 = "79b56bcc349264d686a67994506ad199"; + md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + } + { + name = "libwpg-0.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; + sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; + md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + } + { + name = "libwps-0.4.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.2.tar.bz2"; + sha256 = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587"; + md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; + md5name = "8a6c55542ce80203dd6d3b1cba99d4e5-libwps-0.4.2.tar.bz2"; + } + { + name = "xsltml_2.1.2.zip"; + url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + } + { + name = "zlib-1.2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; + sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; + md5 = "44d667c142d7cda120332623eab69f40"; + md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 219b7e20632a..bf9150b98ec4 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,533 +1,744 @@ [ -{ - name = "libabw-0.1.1.tar.bz2"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - brief = true; -} -{ - name = "commons-logging-1.2-src.tar.gz"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - brief = true; -} -{ - name = "apr-1.4.8.tar.gz"; - md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; - brief = true; -} -{ - name = "apr-util-1.5.3.tar.gz"; - md5 = "71a11d037240b292f824ba1eb537b4e3"; - brief = true; -} -{ - name = "boost_1_60_0.tar.bz2"; - md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; - brief = true; -} -{ - name = "breakpad.zip"; - md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; - brief = true; -} -{ - name = "bsh-2.0b6-src.zip"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - brief = false; -} -{ - name = "bzip2-1.0.6.tar.gz"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - brief = false; -} -{ - name = "cairo-1.10.2.tar.gz"; - md5 = "f101a9e88b783337b20b2e26dfd26d5f"; - brief = false; -} -{ - name = "libcdr-0.1.2.tar.bz2"; - md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; - brief = true; -} -{ - name = "clucene-core-2.3.3.4.tar.gz"; - md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; - brief = false; -} -{ - name = "libcmis-0.5.1.tar.gz"; - md5 = "3270154f0f40d86fce849b161f914101"; - brief = true; -} -{ - name = "CoinMP-1.7.6.tgz"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - brief = true; -} -{ - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - brief = false; -} -{ - name = "cppunit-1.13.2.tar.gz"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - brief = true; -} -{ - name = "converttexttonumber-1-5-0.oxt"; - md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; - brief = false; -} -{ - name = "curl-7.43.0.tar.bz2"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - brief = true; -} -{ - name = "libe-book-0.1.2.tar.bz2"; - md5 = "6b48eda57914e6343efebc9381027b78"; - brief = true; -} -{ - name = "epm-3.7.tar.gz"; - md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; - brief = false; -} -{ - name = "libetonyek-0.1.6.tar.bz2"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - brief = true; -} -{ - name = "expat-2.2.0.tar.bz2"; - md5 = "2f47841c829facb346eb6e3fab5212e2"; - brief = true; -} -{ - name = "Firebird-2.5.5.26952-0.tar.bz2"; - md5 = "b0b5293991fcf07347b38431c80be1d4"; - brief = true; -} -{ - name = "fontconfig-2.8.0.tar.gz"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - brief = false; -} -{ - name = "crosextrafonts-20130214.tar.gz"; - md5 = "368f114c078f94214a308a74c7e991bc"; - brief = false; -} -{ - name = "crosextrafonts-carlito-20130920.tar.gz"; - md5 = "c74b7223abe75949b4af367942d96c7a"; - brief = false; -} -{ - name = "dejavu-fonts-ttf-2.35.zip"; - md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; - brief = false; -} -{ - name = "gentiumbasic-fonts-1.10.zip"; - md5 = "35efabc239af896dfb79be7ebdd6e6b9"; - brief = false; -} -{ - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - md5 = "134d8262145fc793c6af494dcace3e71"; - brief = false; -} -{ - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - brief = false; -} -{ - name = "LinLibertineG-20120116.zip"; - md5 = "e7a384790b13c29113e22e596ade9687"; - brief = false; -} -{ - name = "open-sans-font-ttf-1.10.tar.gz"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - brief = false; -} -{ - name = "pt-serif-font-1.0000W.tar.gz"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - brief = false; -} -{ - name = "source-code-font-1.009.tar.gz"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - brief = false; -} -{ - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - brief = false; -} -{ - name = "libfreehand-0.1.1.tar.bz2"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - brief = true; -} -{ - name = "freetype-2.4.8.tar.bz2"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - brief = false; -} -{ - name = "glew-1.12.0.zip"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - brief = false; -} -{ - name = "glm-0.9.4.6-libreoffice.zip"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - brief = false; -} -{ - name = "glyphy-0.2.0.tar.bz2"; - md5 = "5d303fb955beb9bf112267316ca9d021"; - brief = false; -} -{ - name = "graphite2-minimal-1.3.8.tgz"; - md5 = "4311dd9ace498b57c85f611e0670df64"; - brief = false; -} -{ - name = "harfbuzz-1.2.6.tar.bz2"; - md5 = "9f4b6831c86135faef011e991f59f77f"; - brief = true; -} -{ - name = "hsqldb_1_8_0.zip"; - md5 = "17410483b5b5f267aa18b7e00b65e6e0"; - brief = false; -} -{ - name = "hunspell-1.4.1.tar.gz"; - md5 = "33d370f7fe5a030985e445a5672b2067"; - brief = false; -} -{ - name = "hyphen-2.8.8.tar.gz"; - md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; - brief = false; -} -{ - name = "icu4c-57_1-src.tgz"; - md5 = "976734806026a4ef8bdd17937c8898b9"; - brief = false; -} -{ - name = "flow-engine-0.9.4.zip"; - md5 = "ba2930200c9f019c2d93a8c88c651a0f"; - brief = false; -} -{ - name = "flute-1.1.6.zip"; - md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; - brief = false; -} -{ - name = "libbase-1.1.6.zip"; - md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; - brief = false; -} -{ - name = "libfonts-1.1.6.zip"; - md5 = "3bdf40c0d199af31923e900d082ca2dd"; - brief = false; -} -{ - name = "libformula-1.1.7.zip"; - md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; - brief = false; -} -{ - name = "liblayout-0.2.10.zip"; - md5 = "db60e4fde8dd6d6807523deb71ee34dc"; - brief = false; -} -{ - name = "libloader-1.1.6.zip"; - md5 = "97b2d4dba862397f446b217e2b623e71"; - brief = false; -} -{ - name = "librepository-1.1.6.zip"; - md5 = "8ce2fcd72becf06c41f7201d15373ed9"; - brief = false; -} -{ - name = "libserializer-1.1.6.zip"; - md5 = "f94d9870737518e3b597f9265f4e9803"; - brief = false; -} -{ - name = "libxml-1.1.7.zip"; - md5 = "ace6ab49184e329db254e454a010f56d"; - brief = false; -} -{ - name = "sacjava-1.3.zip"; - md5 = "39bb3fcea1514f1369fcfc87542390fd"; - brief = false; -} -{ - name = "jpegsrc.v9a.tar.gz"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - brief = true; -} -{ - name = "libjpeg-turbo-1.4.2.tar.gz"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - brief = true; -} -{ - name = "language-subtag-registry-2016-02-10.tar.bz2"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; - brief = true; -} -{ - name = "JLanguageTool-1.7.0.tar.bz2"; - md5 = "b63e6340a02ff1cacfeadb2c42286161"; - brief = false; -} -{ - name = "lcms2-2.6.tar.gz"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - brief = true; -} -{ - name = "libatomic_ops-7_2d.zip"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - brief = true; -} -{ - name = "libeot-0.01.tar.bz2"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - brief = true; -} -{ - name = "libexttextcat-3.4.4.tar.bz2"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - brief = false; -} -{ - name = "libgltf-0.0.2.tar.bz2"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - brief = true; - subDir = "libgltf/"; -} -{ - name = "liblangtag-0.5.8.tar.bz2"; - md5 = "aa899eff126216dafe721149fbdb511b"; - brief = false; -} -{ - name = "xmlsec1-1.2.20.tar.gz"; - md5 = "ce12af00283eb90d9281956524250d6e"; - brief = false; -} -{ - name = "libxml2-2.9.4.tar.gz"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - brief = false; -} -{ - name = "libxslt-1.1.29.tar.gz"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - brief = false; -} -{ - name = "lp_solve_5.5.tar.gz"; - md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; - brief = false; -} -{ - name = "mariadb_client-2.0.0-src.tar.gz"; - md5 = "a233181e03d3c307668b4c722d881661"; - brief = false; -} -{ - name = "mdds-1.2.0.tar.bz2"; - md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; - brief = true; -} -{ - name = "mDNSResponder-576.30.4.tar.gz"; - md5 = "940057ac8b513b00e8e9ca12ef796762"; - brief = true; -} -{ - name = "libmspub-0.1.2.tar.bz2"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - brief = true; -} -{ - name = "libmwaw-0.3.7.tar.bz2"; - md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; - brief = true; -} -{ - name = "mysql-connector-c++-1.1.4.tar.gz"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - brief = false; -} -{ - name = "mythes-1.2.4.tar.gz"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - brief = false; -} -{ - name = "neon-0.30.1.tar.gz"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - brief = false; -} -{ - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - brief = false; -} -{ - name = "libodfgen-0.1.6.tar.bz2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - brief = true; -} -{ - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - brief = true; -} -{ - name = "openldap-2.4.31.tgz"; - md5 = "804c6cb5698db30b75ad0ff1c25baefd"; - brief = false; -} -{ - name = "openssl-1.0.2h.tar.gz"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - brief = true; -} -{ - name = "liborcus-0.11.2.tar.gz"; - md5 = "205badaee72adf99422add8c4c49d669"; - brief = true; -} -{ - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - brief = true; -} -{ - name = "libpagemaker-0.0.3.tar.bz2"; - md5 = "5c4985a68be0b79d3f809da5e12b143c"; - brief = true; -} -{ - name = "pixman-0.24.4.tar.bz2"; - md5 = "c63f411b3ad147db2bcce1bf262a0e02"; - brief = false; -} -{ - name = "libpng-1.6.19.tar.gz"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - brief = true; -} -{ - name = "poppler-0.26.4.tar.gz"; - md5 = "35c0660065d023365e9854c13e289d12"; - brief = true; -} -{ - name = "postgresql-9.2.1.tar.bz2"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - brief = false; -} -{ - name = "Python-3.3.5.tgz"; - md5 = "803a75927f8f241ca78633890c798021"; - brief = true; -} -{ - name = "Python-3.5.0.tgz"; - md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; - brief = true; -} -{ - name = "raptor2-2.0.9.tar.gz"; - md5 = "4ceb9316488b0ea01acf011023cf7fff"; - brief = false; -} -{ - name = "rasqal-0.9.30.tar.gz"; - md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; - brief = false; -} -{ - name = "redland-1.0.16.tar.gz"; - md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; - brief = false; -} -{ - name = "librevenge-0.0.4.tar.bz2"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - brief = true; -} -{ - name = "rhino1_5R5.zip"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - brief = false; -} -{ - name = "serf-1.2.1.tar.bz2"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - brief = true; -} -{ - name = "swingExSrc.zip"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - brief = false; -} -{ - name = "ucpp-1.3.2.tar.gz"; - md5 = "0168229624cfac409e766913506961a8"; - brief = false; -} -{ - name = "libvisio-0.1.5.tar.bz2"; - md5 = "cbee198a78b842b2087f32d33c522818"; - brief = true; -} -{ - name = "libwpd-0.10.1.tar.bz2"; - md5 = "79b56bcc349264d686a67994506ad199"; - brief = true; -} -{ - name = "libwpg-0.3.1.tar.bz2"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - brief = true; -} -{ - name = "libwps-0.4.3.tar.bz2"; - md5 = "027fb17fb9e43553aa6624dc18f830ac"; - brief = true; -} -{ - name = "xsltml_2.1.2.zip"; - md5 = "a7983f859eafb2677d7ff386a023bc40"; - brief = false; -} -{ - name = "zlib-1.2.8.tar.gz"; - md5 = "44d667c142d7cda120332623eab69f40"; - brief = true; -} + { + name = "libabw-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; + sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + md5 = "7a3815b506d064313ba309617b6f5a0b"; + md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + } + { + name = "commons-logging-1.2-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; + md5 = "ce977548f1cbf46918e93cd38ac35163"; + md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + } + { + name = "apr-1.4.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"; + sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.tar.gz"; + } + { + name = "apr-util-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz"; + sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz"; + } + { + name = "boost_1_60_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2"; + sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"; + md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; + md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2"; + } + { + name = "breakpad.zip"; + url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; + md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + } + { + name = "bsh-2.0b6-src.zip"; + url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; + md5 = "beeca87be45ec87d241ddd0e1bad80c1"; + md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + } + { + name = "bzip2-1.0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + } + { + name = "cairo-1.10.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; + md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + } + { + name = "libcdr-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2"; + sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; + md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2"; + } + { + name = "clucene-core-2.3.3.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + } + { + name = "libcmis-0.5.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; + sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; + md5 = "3270154f0f40d86fce849b161f914101"; + md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz"; + } + { + name = "CoinMP-1.7.6.tgz"; + url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + } + { + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + } + { + name = "cppunit-1.13.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; + sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; + md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; + md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + } + { + name = "converttexttonumber-1-5-0.oxt"; + url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; + md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; + md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + } + { + name = "curl-7.43.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; + sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; + md5 = "11bddbb452a8b766b932f859aaeeed39"; + md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + } + { + name = "libe-book-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; + sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + md5 = "6b48eda57914e6343efebc9381027b78"; + md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + } + { + name = "epm-3.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + } + { + name = "libetonyek-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; + sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; + md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + } + { + name = "expat-2.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2"; + sha256 = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"; + md5 = "2f47841c829facb346eb6e3fab5212e2"; + md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2"; + } + { + name = "Firebird-2.5.5.26952-0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2"; + sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1"; + md5 = "b0b5293991fcf07347b38431c80be1d4"; + md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2"; + } + { + name = "fontconfig-2.8.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; + md5 = "77e15a92006ddc2adbb06f840d591c0e"; + md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + } + { + name = "crosextrafonts-20130214.tar.gz"; + url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; + md5 = "368f114c078f94214a308a74c7e991bc"; + md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + } + { + name = "crosextrafonts-carlito-20130920.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + } + { + name = "dejavu-fonts-ttf-2.35.zip"; + url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; + md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + } + { + name = "gentiumbasic-fonts-1.10.zip"; + url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; + md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + } + { + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; + md5 = "134d8262145fc793c6af494dcace3e71"; + md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + } + { + name = "liberation-fonts-ttf-2.00.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; + md5 = "5c781723a0d9ed6188960defba8e91cf"; + md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + } + { + name = "LinLibertineG-20120116.zip"; + url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; + md5 = "e7a384790b13c29113e22e596ade9687"; + md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + } + { + name = "open-sans-font-ttf-1.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; + md5 = "7a15edea7d415ac5150ea403e27401fd"; + md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + } + { + name = "pt-serif-font-1.0000W.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; + md5 = "c3c1a8ba7452950636e871d25020ce0d"; + md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + } + { + name = "source-code-font-1.009.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; + md5 = "0279a21fab6f245e85a6f85fea54f511"; + md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + } + { + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + } + { + name = "libfreehand-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; + sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; + md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; + } + { + name = "freetype-2.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; + md5 = "dbf2caca1d3afd410a29217a9809d397"; + md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + } + { + name = "glew-1.12.0.zip"; + url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; + md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + } + { + name = "glm-0.9.4.6-libreoffice.zip"; + url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + } + { + name = "glyphy-0.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + } + { + name = "graphite2-minimal-1.3.8.tgz"; + url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; + sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b"; + md5 = "4311dd9ace498b57c85f611e0670df64"; + md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; + } + { + name = "harfbuzz-1.2.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2"; + sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1"; + md5 = "9f4b6831c86135faef011e991f59f77f"; + md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2"; + } + { + name = "hsqldb_1_8_0.zip"; + url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + } + { + name = "hunspell-1.4.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb"; + md5 = "33d370f7fe5a030985e445a5672b2067"; + md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + } + { + name = "hyphen-2.8.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + } + { + name = "icu4c-57_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"; + md5 = "976734806026a4ef8bdd17937c8898b9"; + md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + } + { + name = "flow-engine-0.9.4.zip"; + url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + } + { + name = "flute-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + } + { + name = "libbase-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + } + { + name = "libfonts-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + } + { + name = "libformula-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + } + { + name = "liblayout-0.2.10.zip"; + url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + } + { + name = "libloader-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + } + { + name = "librepository-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + } + { + name = "libserializer-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + } + { + name = "libxml-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; + md5 = "ace6ab49184e329db254e454a010f56d"; + md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + } + { + name = "sacjava-1.3.zip"; + url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + } + { + name = "jpegsrc.v9a.tar.gz"; + url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; + sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; + } + { + name = "libjpeg-turbo-1.4.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; + sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; + md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + } + { + name = "language-subtag-registry-2016-07-19.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2"; + sha256 = "e3dc30bdbfdad442c542dc0e165df9d8d2ba06a357cd55957155d8259d1661dc"; + md5 = "8a037dc60b16bf8c5fe871b33390a4a2"; + md5name = "8a037dc60b16bf8c5fe871b33390a4a2-language-subtag-registry-2016-07-19.tar.bz2"; + } + { + name = "JLanguageTool-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; + md5 = "b63e6340a02ff1cacfeadb2c42286161"; + md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + } + { + name = "lcms2-2.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; + sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + } + { + name = "libatomic_ops-7_2d.zip"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; + sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + } + { + name = "libeot-0.01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + } + { + name = "libexttextcat-3.4.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; + md5 = "10d61fbaa6a06348823651b1bd7940fe"; + md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + } + { + name = "libgltf-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; + sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + } + { + name = "liblangtag-0.5.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa"; + md5 = "aa899eff126216dafe721149fbdb511b"; + md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + } + { + name = "xmlsec1-1.2.20.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305"; + md5 = "ce12af00283eb90d9281956524250d6e"; + md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + } + { + name = "libxml2-2.9.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; + md5 = "ae249165c173b1ff386ee8ad676815f5"; + md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + } + { + name = "libxslt-1.1.29.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; + md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; + md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + } + { + name = "lp_solve_5.5.tar.gz"; + url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + } + { + name = "mariadb_client-2.0.0-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; + md5 = "a233181e03d3c307668b4c722d881661"; + md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + } + { + name = "mdds-1.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.2.0.tar.bz2"; + sha256 = "f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6"; + md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; + md5name = "9f3383fb7bae825eab69f3a6ec1d74b2-mdds-1.2.0.tar.bz2"; + } + { + name = "mDNSResponder-576.30.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; + sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; + md5 = "940057ac8b513b00e8e9ca12ef796762"; + md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz"; + } + { + name = "libmspub-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; + sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; + md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + } + { + name = "libmwaw-0.3.7.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2"; + sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; + md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2"; + } + { + name = "mysql-connector-c++-1.1.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; + md5 = "7239a4430efd4d0189c4f24df67f08e5"; + md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + } + { + name = "mythes-1.2.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; + md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; + md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + } + { + name = "neon-0.30.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; + md5 = "231adebe5c2f78fded3e3df6e958878e"; + md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + } + { + name = "nss-3.22.2-with-nspr-4.12.tar.gz"; + url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; + md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; + md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + } + { + name = "libodfgen-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; + md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + } + { + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; + sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + } + { + name = "openldap-2.4.31.tgz"; + url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; + md5 = "804c6cb5698db30b75ad0ff1c25baefd"; + md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + } + { + name = "openssl-1.0.2h.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; + md5 = "9392e65072ce4b614c1392eefc1f23d0"; + md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + } + { + name = "liborcus-0.11.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz"; + sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256"; + md5 = "205badaee72adf99422add8c4c49d669"; + md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz"; + } + { + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + } + { + name = "libpagemaker-0.0.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; + sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + md5 = "5c4985a68be0b79d3f809da5e12b143c"; + md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; + } + { + name = "pixman-0.24.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc"; + md5 = "c63f411b3ad147db2bcce1bf262a0e02"; + md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + } + { + name = "libpng-1.6.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; + sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; + md5 = "65213080dd30a9b16193d9b83adc1ee9"; + md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; + } + { + name = "poppler-0.46.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2"; + sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a"; + md5 = "38c758d84437378ec4f5aae9f875301d"; + md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2"; + } + { + name = "postgresql-9.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; + md5 = "c0b4799ea9850eae3ead14f0a60e9418"; + md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + } + { + name = "Python-3.3.5.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; + sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; + md5 = "803a75927f8f241ca78633890c798021"; + md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; + } + { + name = "Python-3.5.0.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz"; + sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz"; + } + { + name = "raptor2-2.0.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef"; + md5 = "4ceb9316488b0ea01acf011023cf7fff"; + md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + } + { + name = "rasqal-0.9.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd"; + md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; + md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + } + { + name = "redland-1.0.16.tar.gz"; + url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd"; + md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; + md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + } + { + name = "librevenge-0.0.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; + md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + } + { + name = "rhino1_5R5.zip"; + url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + } + { + name = "serf-1.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + } + { + name = "swingExSrc.zip"; + url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + } + { + name = "ucpp-1.3.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; + md5 = "0168229624cfac409e766913506961a8"; + md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + } + { + name = "libvisio-0.1.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; + sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + md5 = "cbee198a78b842b2087f32d33c522818"; + md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + } + { + name = "libwpd-0.10.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; + sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + md5 = "79b56bcc349264d686a67994506ad199"; + md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + } + { + name = "libwpg-0.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; + sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; + md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + } + { + name = "libwps-0.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2"; + sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c"; + md5 = "027fb17fb9e43553aa6624dc18f830ac"; + md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2"; + } + { + name = "xsltml_2.1.2.zip"; + url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + } + { + name = "zlib-1.2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; + sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; + md5 = "44d667c142d7cda120332623eab69f40"; + md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/pkgs/applications/office/libreoffice/still-gen-shell.nix new file mode 100644 index 000000000000..c5c17c2aaad0 --- /dev/null +++ b/pkgs/applications/office/libreoffice/still-gen-shell.nix @@ -0,0 +1,29 @@ +{ pkgs ? (import <nixpkgs> {}) }: + +with pkgs; + +let + + primary-src = callPackage ./still-primary-src.nix {}; + +in + +stdenv.mkDerivation { + name = "generate-libreoffice-srcs-shell"; + + buildCommand = "exit 1"; + + downloadList = stdenv.mkDerivation { + name = "libreoffice-${primary-src.version}-download-list"; + inherit (primary-src) src version; + builder = ./download-list-builder.sh; + }; + + buildInputs = [ python3 ]; + + shellHook = '' + function generate { + python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix + } + ''; +} diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix new file mode 100644 index 000000000000..33ba558ed298 --- /dev/null +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -0,0 +1,17 @@ +{ fetchurl }: + +rec { + major = "5"; + minor = "1"; + patch = "5"; + tweak = "2"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; + }; +} diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 681870ac4caa..2963eff83e7d 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -19,22 +19,14 @@ }: let + primary-src = import ./still-primary-src.nix { inherit fetchurl; }; +in + +with { inherit (primary-src) major minor subdir version; }; + +let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; - major = "5"; - minor = "1"; - patch = "5"; - tweak = "2"; - subdir = "${major}.${minor}.${patch}"; - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { - inherit name md5; - url = if brief then - "http://dev-www.libreoffice.org/src/${subDir}${name}" - else - "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; - }; fetchSrc = {name, sha256}: fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; @@ -42,11 +34,11 @@ let }; srcs = { - third_party = [ (fetchurl rec { + third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; - md5 = "185d60944ea767075d27247c3162b3bc"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; - }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs-still.nix)); + }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix)); translations = fetchSrc { name = "translations"; @@ -64,10 +56,7 @@ let in stdenv.mkDerivation rec { name = "libreoffice-${version}"; - src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; - }; + inherit (primary-src) src; # we only have this problem on i686 ATM patches = if stdenv.is64bit then null else [ @@ -97,7 +86,7 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -246,7 +235,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7ccf66c055ed..9409ab3e6698 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.16.2-stable"; + shortVersion = "1.16.3-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "08f61972d5a5e491fcd3d4cf5dfe59ad7e07b3883b7ad50d440868c3057af6fb" - else "9bd139b236143f78b23ff4271c01a20c059622abe9dd125e771e0b5db16b7b7b"; + then "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv" + else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz"; deps = [ gcc.cc diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 6da3bf6df83f..3209ae0a9c9b 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libxml2, gettext, libical, libnotify -, libarchive, gtkspell, webkitgtk2, libgringotts }: +{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify +, libarchive, gtkspell2, webkitgtk2, libgringotts }: stdenv.mkDerivation rec { name = "osmo-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05"; }; - buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive - gtkspell webkitgtk2 libgringotts ]; + buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive + gtkspell2 webkitgtk2 libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 9222ed5757ce..e7fd94500290 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , pkgconfig , intltool -, gnome +, gnome2 , libxslt , python }: @@ -20,15 +20,17 @@ in stdenv.mkDerivation { sha256 = "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k"; }; - buildInputs = [ + buildInputs = with gnome2; [ pkgconfig intltool - gnome.GConf - gnome.gtk - gnome.libgnomecanvas - gnome.libgnomeui - gnome.libglade - gnome.scrollkeeper + + GConf + gtk + libgnomecanvas + libgnomeui + libglade + scrollkeeper + libxslt python ]; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 9283ee1274c0..bd7d537a2c6e 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { /* program */ gpl3Plus /* data */ cc-by-sa-30 ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9014e3884688..6f2cb29e4364 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }: +{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject2, python }: # # TODO: Declare configuration options for the following optional dependencies: @@ -17,7 +17,7 @@ buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ]; + propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 25934c71e8eb..b8406c3255cc 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk, perl }: +{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { name = "geda-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk flex gawk perl ]; + buildInputs = [ pkgconfig guile gtk2 flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 92d0ceba1cfe..7cdcbb7fd197 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk, autoreconfHook }: +{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation rec { name = "gerbv-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk autoreconfHook ]; + buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 32d39d8a609d..657d20553b7f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: +{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { name = "gtkwave-3.3.70"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; + buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 257d6993ff59..1f5109434000 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; - buildInputs = [ pkgconfig gtk bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index df7d053d93bd..f26b13c5e32c 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig}: +{stdenv, fetchurl, gtk2, pkgconfig}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - buildInputs = [ gtk pkgconfig ]; + buildInputs = [ gtk2 pkgconfig ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 patches = [ ./gtkdepre.diff ]; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 3e5408ac7f5d..8db1beedebbb 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libglade, gtk, guile, libxml2, perl +{ stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; - buildInputs = [libglade gtk guile libxml2 + buildInputs = [libglade gtk2 guile libxml2 perl intltool libtool pkgconfig]; prebuild = '' diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 1f36858ae320..92b5b49cec7c 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -1,46 +1,29 @@ { stdenv, fetchurl, which }: -let - s = # Generated upstream information - rec { - baseName="eprover"; - version="1.9"; - name="${baseName}-${version}"; - hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; - url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz"; - sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; - }; -in -stdenv.mkDerivation { - inherit (s) name; +stdenv.mkDerivation rec { + name = "eprover-${version}"; + version = "1.9.1"; src = fetchurl { - name = "E-${s.version}.tar.gz"; - inherit (s) url sha256; + url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; + sha256 = "1vi977mdfqnj04m590aw4896nqzlc4c5rqadjzk86z1zvj7mqnqw"; }; buildInputs = [ which ]; preConfigure = '' - sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' \ - -e 's/^CC *= gcc$//' \ - -i Makefile.vars + sed -e 's/ *CC *= gcc$//' -i Makefile.vars ''; + configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; - buildPhase = "make install"; - - installPhase = '' - mkdir -p $out/bin - make install - echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp - chmod a+x $out/bin/eproof-tptp + postInstall = '' + sed -e s,EXECPATH=.\*,EXECPATH=$out/bin, -i $out/bin/eproof{,_ram} ''; - meta = { - inherit (s) version; + meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; homepage = http://www.eprover.org/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin gebner ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream deleted file mode 100644 index f871d4985bbd..000000000000 --- a/pkgs/applications/science/logic/eprover/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://wwwlehre.dhbw-stuttgart.de/~sschulz/E/Download.html -version_link '[.]tgz$' -version '.*[/]V_([0-9.]+)[/].*' '\1' diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index d7c593b736e4..ada586fc4e6d 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype +{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64"; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index b9db4174c094..19f769e4365c 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, groff, utillinux }: +{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }: with stdenv.lib; let @@ -7,7 +7,6 @@ let BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ TERMCONTROL=-DUSE_TERMIOS \ - NROFF=groff ''; in stdenv.mkDerivation rec { @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg"; }; - buildInputs = [ makeWrapper readline ncurses groff utillinux ]; + buildInputs = [ makeWrapper readline ncurses utillinux ]; configurePhase = '' sed -i 's/all: check_include/all:/' Makefile diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 53b289983a4a..072d772775cd 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecm.gforge.inria.fr/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 6ced805b3115..e74e17fa44f5 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk, gsl +{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk2, gsl , pkgconfig, gtksourceview, pango, gettext, libglade }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig + buildInputs = [ libxml2 readline zlib perl cairo gtk2 gsl pkgconfig gtksourceview pango gettext libglade ]; doCheck = false; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 8482bd6fe94b..4e30814ff7df 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -3,7 +3,7 @@ , Xaw3d, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false -, gtk, withGtk ? false # working ? +, gtk2, withGtk ? false # working ? #, withF2c ? false , ocaml, withOCaml ? false #, withJava ? false @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { name = "scilab-${version}"; src = fetchurl { url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz"; - # md5 coming from http://www.scilab.org/download/index_download.php - md5 = "17a7a6aa52918f33d96777a0dc423658"; + sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; buildInputs = [gfortran ncurses] - ++ lib.optionals withGtk [gtk] + ++ lib.optionals withGtk [gtk2] ++ lib.optionals withOCaml [ocaml] ++ lib.optional withX xlibsWrapper ; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d45f4a2b2102..53ea9ce72125 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, -sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { version = "7.4.42"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 + freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index fd39f61c8633..8d673a15fa8e 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: let @@ -17,8 +17,8 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu - git gtk makeWrapper]; + doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu + git gtk2 makeWrapper]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 10c777d8601c..808af776e28b 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python -, libX11, libXpm, libXft, libXext, zlib, lzma, gsl }: +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python +, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -10,13 +10,17 @@ stdenv.mkDerivation rec { sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; }; - buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ]; + buildInputs = [ cmake pcre pkgconfig python zlib lzma gsl ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ] + ; patches = [ (fetchpatch { url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) + ./sw_vers.patch ]; preConfigure = '' @@ -27,14 +31,43 @@ stdenv.mkDerivation rec { "-Drpath=ON" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dalien=OFF" + "-Dbonjour=OFF" + "-Dcastor=OFF" + "-Dchirp=OFF" + "-Ddavix=OFF" + "-Ddcache=OFF" + "-Dfftw3=OFF" + "-Dfitsio=OFF" + "-Dfortran=OFF" + "-Dgfal=OFF" + "-Dgviz=OFF" + "-Dhdfs=OFF" + "-Dkrb5=OFF" + "-Dldap=OFF" + "-Dmonalisa=OFF" + "-Dmysql=OFF" + "-Dodbc=OFF" + "-Dopengl=OFF" + "-Doracle=OFF" + "-Dpgsql=OFF" + "-Dpythia6=OFF" + "-Dpythia8=OFF" + "-Drfio=OFF" + "-Dsqlite=OFF" + "-Dssl=OFF" + "-Dxml=OFF" + "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; enableParallelBuilding = true; + setupHook = ./setup-hook.sh; + meta = { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh new file mode 100644 index 000000000000..197dc78c3c2c --- /dev/null +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -0,0 +1,9 @@ +thisroot () { + # Workaround thisroot.sh dependency on man + if [ -z "${MANPATH}" ]; then + MANPATH=: + fi + source @out@/bin/thisroot.sh +} + +envHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch new file mode 100644 index 000000000000..3de2b839bf4b --- /dev/null +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -0,0 +1,90 @@ +diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh +--- a/build/unix/compiledata.sh ++++ b/build/unix/compiledata.sh +@@ -49,7 +49,7 @@ fi + + if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ + [ "$ARCH" = "macosxicc" ]; then +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + SOEXT="so" + if [ $macosx_minor -ge 5 ]; then + if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then +diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake +--- a/cmake/modules/SetUpMacOS.cmake ++++ b/cmake/modules/SetUpMacOS.cmake +@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6) + #--------------------------------------------------------------------------------------------------------- + + if (CMAKE_SYSTEM_NAME MATCHES Darwin) +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 1-2 +- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 2 +- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) + set(libcxx ON CACHE BOOL "Build using libc++" FORCE) +- endif() + +- if(${MACOSX_MINOR} GREATER 4) + #TODO: check haveconfig and rpath -> set rpath true + #TODO: check Thread, define link command + #TODO: more stuff check configure script +- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT) +- if(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 64bit system") + set(ROOT_ARCHITECTURE macosx64) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64") +@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") + SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64") +- else(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 32bit system") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") +- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32") +- endif(${SYSCTL_OUTPUT} MATCHES 64) +- endif() +- +- if(MACOSX_VERSION VERSION_GREATER 10.6) +- set(MACOSX_SSL_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.7) +- set(MACOSX_ODBC_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.8) +- set(MACOSX_GLU_DEPRECATED ON) +- set(MACOSX_KRB5_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.9) +- set(MACOSX_LDAP_DEPRECATED ON) +- endif() + + if (CMAKE_COMPILER_IS_GNUCXX) + message(STATUS "Found GNU compiler collection") +@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + endif() + + #---Set Linker flags---------------------------------------------------------------------- +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib") + + + else (CMAKE_SYSTEM_NAME MATCHES Darwin) +diff --git a/config/root-config.in b/config/root-config.in +--- a/config/root-config.in ++++ b/config/root-config.in +@@ -304,7 +304,7 @@ macosxicc) + ;; + macosx64) + # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + # cannot find the one linked to libGraf if relocated after built + if [ $macosx_minor -le 4 ]; then + rootlibs="$rootlibs -lfreetype" diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index da6e0cb2805d..9b8035fcefe7 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 -, cmake, makeWrapper, libjpeg }: +, cmake, makeWrapper, libjpeg, python }: -let version = "4.1.0"; in +let version = "4.9.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig"; + sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; }; - buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; + buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4ede1b352ea6..9f1d8e9d7171 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json deleted file mode 100644 index 914655e2813a..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/pquerna/ffjson", - "fetch": { - "type": "git", - "url": "https://github.com/pquerna/ffjson", - "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", - "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" - } - }, - { - "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", - "fetch": { - "type": "git", - "url": "https://gopkg.in/kothar/go-backblaze.v0", - "rev": "373819725fc560fa962c6cd883b533d2ebec4844", - "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" - } - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix new file mode 100644 index 000000000000..479b3e7d6372 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/pquerna/ffjson"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/ffjson"; + rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; + sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/kothar/go-backblaze.v0"; + rev = "373819725fc560fa962c6cd883b533d2ebec4844"; + sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index ff21271956b3..98999e93db72 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "2.2.5"; + version = "2.2.8"; src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "13pab3r2ngac2kljy9jb4lz3g3d6smkwydlx23ydjvyjbg2zb75r"; + sha256 = "1fv4jb9vsbkscnb79gss2mwnd1yf9jhgzw1mhimhx25xizbx1fck"; }; @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/zsh/site-functions" cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" -# Broken: https://github.com/github/hub/issues/592 -# mkdir -p "$out/etc/bash_completion.d" -# cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" + mkdir -p "$out/etc/bash_completion.d" + cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" # Should we also install provided git-hooks? # ? diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index a3301d8acffc..d4c67776b529 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { name = "kdesvn-1.6.0"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2"; + sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05"; }; prePatch = '' diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 66dd63956d64..4f1f28a7aac7 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -31,7 +31,7 @@ buildRustPackage rec { homepage = https://pijul.org/; description = "Fast DVCS based on a categorical theory of patches"; license = licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb maintainers = with maintainers; [ puffnfresh ]; }; } diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 212151b6c4a9..019296550819 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 51d70156e9ce..485e8cc6c21e 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, makeWrapper , jre -, gtk, glib +, gtk2, glib , libXtst , git, mercurial, subversion , which @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which ]; runtime_lib_paths = lib.makeLibraryPath [ - gtk glib + gtk2 glib libXtst ]; in '' diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index e3c288534035..6eb9e94e9695 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394 +{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 0200b0c70f4e..cf17b66ef480 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl +, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext pangox_compat + dbus curl pkgconfig glib gtk2 gtkglext pangox_compat xulrunner makeWrapper ] diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 7c1d13fd79d9..1096a64887b0 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: +{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: stdenv.mkDerivation rec { name = "gnome-mplayer-1.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf]; + buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; meta = { homepage = http://kdekorte.googlepages.com/gnomemplayer; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 9113ff75bfd8..8653305f908a 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra }: +, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 12fc7151cd0d..a579b21a1de7 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }: +{ stdenv, fetchurl, buildPythonApplication, gnome2, librsvg, pygtk, pythonPackages }: buildPythonApplication rec { name = "key-mon-${version}"; @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = - [ gnome.python_rsvg librsvg pygtk pythonPackages.xlib ]; + [ gnome2.python_rsvg librsvg pygtk pythonPackages.xlib ]; doCheck = false; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index ea5158270876..3d2bf1f1a4f5 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -50,7 +50,7 @@ #AMR-WB float support no #AMR-WB IF2 support no -{ stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv +{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; - buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv + buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages configureFlags = "--enable-local-ffmpeg=no"; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 2a45c1a9eb2f..9e08f2fffb16 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -69,13 +69,13 @@ in buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; - buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [ + buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup taglib gsettings_desktop_schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ - pygobject pygtk pycurl sqlite3 mutagen pycairo dbus-python + pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index a0605bb7128b..2c5d3d365c12 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz -, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }: +, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }: stdenv.mkDerivation rec { name = "mkcast-2015-03-13"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p"; }; - buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ]; + buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c98d84dab438..22072ca742c1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.4.0"; + version = "9.4.2"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0bmr0cnxp56flak6fjcn0ld5238h3ngrvy09yqp4790g8xwif35v"; + sha256 = "1dyhlpik8d9z78dg47cha313r0dm9fcjg6hzkmzd2ng9yrq5pmdy"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a317e1d4fe52..43b6f4f36cf2 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null -, cddaSupport ? true, cdparanoia ? null -, dvdnavSupport ? true, libdvdnav ? null +, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null , bluraySupport ? true, libbluray ? null , amrSupport ? false, amrnb ? null, amrwb ? null , cacaSupport ? true, libcaca ? null @@ -24,6 +24,7 @@ , libpngSupport ? true, libpng ? null , libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false +, darwin ? null }: assert fontconfigSupport -> (fontconfig != null); @@ -102,6 +103,13 @@ stdenv.mkDerivation rec { sed -i /^_install_strip/d configure ''; + patches = [ + (fetchpatch { + url = "https://github.com/pigoz/mplayer-svn/commit/6c6a7c2afe11c15716cdf4371fb4bf211644b7e1.patch"; + sha256 = "0abg5122kisgcc8ay3barlibrgn259igsfq3ak6na9g8j5cgviw9"; + }) + ]; + buildInputs = with stdenv.lib; [ pkgconfig freetype ] ++ optional aalibSupport aalib @@ -127,6 +135,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b + ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) ; nativeBuildInputs = [ yasm ]; @@ -162,8 +171,8 @@ stdenv.mkDerivation rec { --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc - --enable-vidix - --enable-fbdev + ${optionalString stdenv.isLinux "--enable-vidix"} + ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ac4718d9eb2b..88b2f9d09459 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, rubberband +, lua, lua5_sockets, libuchardet, libiconv ? null, darwin , x11Support ? true, mesa ? null, @@ -13,18 +13,19 @@ wayland ? null, libxkbcommon ? null +, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? !stdenv.isDarwin, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? true, libdvdread ? null -, dvdnavSupport ? true, libdvdnav ? null +, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null +, dvdnavSupport ? dvdreadSupport, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null @@ -39,11 +40,12 @@ with stdenv.lib; -let +let available = x: x != null; in assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; assert waylandSupport -> all available [wayland libxkbcommon]; +assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; assert sdl2Support -> available SDL2; @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet rubberband + lua lua5_sockets libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora @@ -118,6 +120,10 @@ in stdenv.mkDerivation rec { ++ optional bluraySupport libbluray ++ optional jackaudioSupport libjack2 ++ optional pulseSupport libpulseaudio + ++ optional stdenv.isDarwin libiconv + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa CoreAudio ]) + ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex @@ -158,7 +164,7 @@ in stdenv.mkDerivation rec { homepage = http://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu ]; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; longDescription = '' mpv is a free and open-source general-purpose video player, diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix new file mode 100644 index 000000000000..cca1ed34f6dc --- /dev/null +++ b/pkgs/applications/video/streamlink/default.nix @@ -0,0 +1,30 @@ +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: + +pythonPackages.buildPythonApplication rec { + version = "1.14.0-rc1"; + name = "streamlink-${version}"; + + src = fetchFromGitHub { + owner = "streamlink"; + repo = "streamlink"; + rev = "ffc099b16b9a9d2c0c44081d687c50ee2e935f29"; + sha256 = "0ix2k2yd2jzcazkjjb0iczr4bv7pgx873k7bhxgb9zwplklxpw1k"; + }; + + propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; + + meta = with stdenv.lib; { + homepage = https://github.com/streamlink/streamlink; + description = "CLI for extracting streams from various websites to video player of your choosing"; + longDescription = '' + Streamlink is a CLI utility that pipes flash videos from online + streaming services to a variety of video players such as VLC, or + alternatively, a browser. + + Streamlink is a fork of the livestreamer project. + ''; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 527d31004b01..c8414bbb83a0 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk +{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk scrollkeeper + perl perlXMLParser pkgconfig gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 8c420b11f55c..dfd926855790 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, config , pkgconfig, libtool -, gtk, mesa, readline, libX11, libXpm +, gtk2, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null @@ -12,7 +12,7 @@ assert sdlSupport -> (SDL2 != null); assert termSupport -> (ncurses != null); -assert wxSupport -> (gtk != null && wxGTK != null); +assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { busMouse = config.bochs.busMouse or false; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional busMouse "--enable-busmouse" ; - NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/"; + NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix new file mode 100644 index 000000000000..6de68ee32f3a --- /dev/null +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub +, go, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "containerd-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = "v${version}"; + sha256 = "0hlvbd5n4v337ywkc8mnbhp9m8lg8612krv45262n87c2ijyx09s"; + }; + + buildInputs = [ go ]; + + preBuild = '' + ln -s $(pwd) vendor/src/github.com/docker/containerd + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://containerd.tools/; + description = "A daemon to control runC"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d69de9c15ba..801b93a02de1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, go, sqlite, iproute, bridge-utils, devicemapper -, btrfs-progs, iptables, e2fsprogs, xz, utillinux -, systemd, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man +, go, containerd, runc +, sqlite, iproute, bridge-utils, devicemapper, systemd +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, procps }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.10.3"; + version = "1.12.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0bmrafi0p3fm681y165ps97jki0a8ihl9f0bmpvi22nmc1v0sv6l"; + sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd"; }; buildInputs = [ - makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs - iptables e2fsprogs systemd pkgconfig stdenv.glibc stdenv.glibc.static + makeWrapper pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd ]; dontStrip = true; - DOCKER_BUILDTAGS = [ "journald" ] + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; @@ -39,15 +41,27 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="20f81dde" + export DOCKER_GITCOMMIT="23cf638" ./hack/make.sh dynbinary ''; + outputs = ["out" "man"]; + + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; + installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit + install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker + install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}" + --prefix PATH : "$out/libexec/docker:$extraPath" + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" + + # docker uses containerd now + ln -s ${containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service @@ -56,9 +70,31 @@ stdenv.mkDerivation rec { install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done + done + ''; + + preFixup = '' + # remove references to go compiler, gcc and glibc + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out -type f 2>/dev/null) ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 618eb7666923..a4e0779d3f91 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -15,6 +15,9 @@ pythonPackages.buildPythonApplication rec { # otherwise migrate.cfg is not installed patchPhase = '' echo "graft nova" >> MANIFEST.in + + # remove transient error test, see http://hydra.nixos.org/build/40203534 + rm nova/tests/unit/compute/test_{shelve,compute_utils}.py ''; # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix new file mode 100644 index 000000000000..d66865573648 --- /dev/null +++ b/pkgs/applications/virtualization/runc/default.nix @@ -0,0 +1,62 @@ +{ stdenv, lib, fetchFromGitHub, go-md2man +, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "runc-${version}"; + version = "2016-06-15"; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "runc"; + rev = "cc29e3dded8e27ba8f65738f40d251c885030a28"; + sha256 = "18fwb3kq10zhhx184yn3j396gpbppy3y4ypb8m2b2pdms39s6pyx"; + }; + + outputs = [ "out" "man" ]; + + hardeningDisable = ["fortify"]; + + buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + + makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; + + preBuild = '' + patchShebangs . + substituteInPlace libcontainer/apparmor/apparmor.go \ + --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser + ''; + + installPhase = '' + install -Dm755 runc $out/bin/runc + + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done + done + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://runc.io/; + description = "A CLI tool for spawning and running containers according to the OCI specification"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8bcf122132e3..ef834897022d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, libXrandr +, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 +, libXrandr, libXinerama , which, alsaLib, curl, libvpx, gawk, nettools, dbus -, xorriso, makeself, perl, pkgconfig, nukeReferences +, xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false +, patchelfUnstable # needed until 0.10 is released }: with stdenv.lib; @@ -16,37 +17,12 @@ with stdenv.lib; let buildType = "release"; - # When changing this, update ./guest-additions and the extpack - # revision/hash as well. See - # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS - # for hashes. - version = "5.0.26"; - - forEachModule = action: '' - for mod in \ - out/linux.*/${buildType}/bin/src/vboxdrv \ - out/linux.*/${buildType}/bin/src/vboxpci \ - out/linux.*/${buildType}/bin/src/vboxnetadp \ - out/linux.*/${buildType}/bin/src/vboxnetflt - do - if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] - then - cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" - fi - INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ - "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} - done - ''; + inherit (importJSON ./upstream-info.json) version extpackRev extpack main; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "108824"; extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; - # IMPORTANT: Hash must be base16 encoded because it's used as an input to - # VBoxExtPackHelperApp! - sha256 = "2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; + sha256 = extpack; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) available at: @@ -61,35 +37,36 @@ let }; in stdenv.mkDerivation { - name = "virtualbox-${version}-${kernel.version}"; + name = "virtualbox-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e"; + sha256 = main; }; + outputs = [ "out" "modsrc" ]; + buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu nukeReferences ] + pkgconfig which libXmu libpng patchelfUnstable ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libpng ] - ++ optionals (!headless) [ qt4 SDL ]; + ++ optionals (headless) [ libXrandr ] + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; prePatch = '' set -x - MODULES_BUILD_DIR=`echo ${kernel.dev}/lib/modules/*/build` - sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ - -e 's@MKISOFS --version@MKISOFS -version@' \ + sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ - -i configure + ${optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ + ''} -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 - find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g @@ -103,11 +80,12 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch; + patches = optional enableHardening ./hardened.patch + ++ [ ./libressl.patch ./qtx11extras.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ - src/apps/adpctl/VBoxNetAdpCtl.cpp + src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -131,11 +109,15 @@ in stdenv.mkDerivation { ${optionalString javaBindings '' VBOX_JAVA_HOME := ${jdk} ''} + ${optionalString (!headless) '' + PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include + TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease + ''} LOCAL_CONFIG ./configure \ ${optionalString headless "--build-headless"} \ - ${optionalString (!headless) "--with-qt4-dir=${qt4}"} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ @@ -153,7 +135,6 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" - ${forEachModule "modules"} ''; installPhase = '' @@ -165,9 +146,6 @@ in stdenv.mkDerivation { find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + - # Install kernel modules - ${forEachModule "modules_install"} - # Create wrapper script mkdir -p $out/bin for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do @@ -199,15 +177,11 @@ in stdenv.mkDerivation { done ''} - # Get rid of a reference to linux.dev. - nuke-refs $out/lib/modules/*/misc/*.ko + cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; passthru = { inherit version; /* for guest additions */ }; - # Workaround for https://github.com/NixOS/patchelf/issues/93 (can be removed once this issue is addressed) - dontPatchELF = true; - meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 56e025197925..30b4f782e167 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59"; + sha256 = (lib.importJSON ../upstream-info.json).guest; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -139,5 +139,6 @@ stdenv.mkDerivation { license = "GPL"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; + broken = kernel.features.grsecurity or false; }; } diff --git a/pkgs/applications/virtualization/virtualbox/libressl.patch b/pkgs/applications/virtualization/virtualbox/libressl.patch new file mode 100644 index 000000000000..db9b7e7a59d9 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/libressl.patch @@ -0,0 +1,47 @@ +diff --git a/src/VBox/Runtime/common/crypto/digest-builtin.cpp b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +index 66b4304..1aaceff 100644 +--- a/src/VBox/Runtime/common/crypto/digest-builtin.cpp ++++ b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigestOps[] = + * OpenSSL EVP. + */ + +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */ + static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void) + { +@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + if (fReInit) + { + pEvpType = EVP_MD_CTX_md(pThis); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState) + { + EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState; +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigestOpenSslDesc = + NULL, + RTDIGESTTYPE_UNKNOWN, + EVP_MAX_MD_SIZE, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + 0, + # else + sizeof(EVP_MD_CTX), + # endif + 0, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + rtCrDigestOsslEvp_New, + rtCrDigestOsslEvp_Free, + # else diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch new file mode 100644 index 000000000000..f5decc211c75 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch @@ -0,0 +1,31 @@ +diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk +index 71b96a3..73391f0 100644 +--- a/kBuild/units/qt5.kmk ++++ b/kBuild/units/qt5.kmk +@@ -994,9 +994,10 @@ else + $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) + endif + else +- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) ++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \ ++ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL)) + endif +- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) ++ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) + endif + $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) + +diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk +index 38db6b0..7dd446b 100644 +--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk ++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk +@@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui + ifdef VBOX_WITH_QTGUI_V5 + # Qt5 requires additional modules: + VirtualBox_QT_MODULES += Widgets PrintSupport +- VirtualBox_QT_MODULES.linux += X11Extras +- VirtualBox_QT_MODULES.solaris += X11Extras +- VirtualBox_QT_MODULES.freebsd += X11Extras + VirtualBox_QT_MODULES.darwin += MacExtras + VirtualBox_QT_MODULES.win += WinExtras + endif # VBOX_WITH_QTGUI_V5 diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py new file mode 100755 index 000000000000..ff1b2e2fffb7 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +import os +import re +import json +import urllib.request + +from distutils.version import LooseVersion + +UPSTREAM_INFO_FILE = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + "upstream-info.json" +) + + +def fetch_latest_version(): + url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" + return urllib.request.urlopen(url).read().strip().decode() + + +def load_upstream_info(): + try: + with open(UPSTREAM_INFO_FILE, 'r') as fp: + return json.load(fp) + except FileNotFoundError: + return {'version': "0"} + + +def save_upstream_info(contents): + remark = "Generated using update.py from the same directory." + contents['__NOTE'] = remark + data = json.dumps(contents, indent=2, sort_keys=True) + with open(UPSTREAM_INFO_FILE, 'w') as fp: + fp.write(data + "\n") + + +def fetch_file_table(version): + url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" + url = url.format(version) + result = {} + for line in urllib.request.urlopen(url): + sha, name = line.rstrip().split() + result[name.lstrip(b'*').decode()] = sha.decode() + return result + + +def update_to_version(version): + extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' + version_re = version.replace('.', '\\.') + attribute_map = { + 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', + 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', + 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', + 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', + } + table = fetch_file_table(version) + new_attrs = {'version': version} + for attr, searchexpr in attribute_map.items(): + result = [re.search(searchexpr, key) for key in table.keys()] + filtered = filter(lambda m: m is not None, result) + found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] + for m in filtered if m is not None] + + if len(found) == 0: + msg = "No package found for attribute {}".format(attr) + raise AssertionError(msg) + elif len(found) != 1: + msg = "More than one package found for attribute {}: ".format(attr) + msg += ', '.join(found) + raise AssertionError(msg) + else: + new_attrs[attr] = found[0] + return new_attrs + + +info = load_upstream_info() +latest = fetch_latest_version() +if LooseVersion(info['version']) < LooseVersion(latest): + print("Updating to version {}...".format(latest), end="", flush=True) + new_attrs = update_to_version(latest) + save_upstream_info(new_attrs) + print(" done.") +else: + print("Version {} is already the latest one.".format(info['version'])) diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json new file mode 100644 index 000000000000..3a386004a3fd --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -0,0 +1,8 @@ +{ + "__NOTE": "Generated using update.py from the same directory.", + "extpack": "607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de", + "extpackRev": "110634", + "guest": "cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed", + "main": "2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911", + "version": "5.1.6" +} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 46b8c8affc70..b641a571b249 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, libXrender, renderproto, gtk, libwnck, pango, cairo +, libXrender, renderproto, gtk2, libwnck, pango, cairo , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool @@ -24,7 +24,7 @@ let sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; }; buildInputs = [cmake pkgconfig - libXrender renderproto gtk libwnck pango cairo + libXrender renderproto gtk2 libwnck pango cairo GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification metacity libpthreadstubs libxcb intltool diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 7e23dd605036..b521240b48f5 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libX11, libXmu, libXpm, gtk, libpng, libjpeg, libtiff, librsvg +, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk libpng libjpeg libtiff librsvg ]; + [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index b7f1d9adad12..296de4e1e253 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }: stdenv.mkDerivation rec { name = "trayer-1.1.6"; - buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; + buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index a5e7acaf159f..0e1b147f6e18 100644 --- a/pkgs/build-support/docker/pull.nix +++ b/pkgs/build-support/docker/pull.nix @@ -26,17 +26,11 @@ let layer = stdenv.mkDerivation { outputHash = sha256; outputHashMode = "recursive"; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" ]; - + # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix index ac7a442de315..4d759e6f7f18 100644 --- a/pkgs/build-support/fetchadc/default.nix +++ b/pkgs/build-support/fetchadc/default.nix @@ -1,15 +1,5 @@ { stdenv, curl, adc_user, adc_pass }: -let - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; -in - { # Path to fetch. path diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index 223d2098c770..3e0d5d566ad7 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -17,12 +17,6 @@ stdenv.mkDerivation { eggName = name; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7f98c97fc55b..105b3d56bf42 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -56,13 +56,9 @@ stdenv.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "GIT_PROXY_COMMAND" "SOCKS_SERVER" - ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; preferLocalBuild = true; } diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 214e9b1387b6..79f610166a79 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation { builder = ./builder.sh; buildInputs = [mercurial]; - impureEnvVars = [ - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; # Nix <= 0.7 compatibility. id = md5; diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index daead9ad6d2d..1dc14e8cab13 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -19,12 +19,7 @@ stdenv.mkDerivation { dbs = defaultDBMirrors ++ dbs; inherit branch cacheDB name selector; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + } diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 90dc13439a0f..85ec52c4bde0 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -33,13 +33,6 @@ stdenv.mkDerivation { inherit url rev sshSupport openssh ignoreExternals; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; - + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; } diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index c007281e87b0..722fd2566ef3 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -16,5 +16,4 @@ import <nix/fetchurl.nix> { let m = builtins.match "mirror://([a-z]+)/(.*)" url; in if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); - } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index a7c76737e1ad..00f485ce6975 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -20,13 +20,7 @@ let # "gnu", etc.). sites = builtins.attrNames mirrors; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 1b4983e32597..0c9625e51405 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 07ea6f6e76b6..245d0bebb45d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1886,22 +1886,22 @@ rec { }; debian8i386 = { - name = "debian-8.5-jessie-i386"; - fullName = "Debian 8.5 Jessie (i386)"; + name = "debian-8.6-jessie-i386"; + fullName = "Debian 8.6 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "f87a1ee673b335c28cb6ac87be61d6ef20f32dd847835c2bb7d400a00a464c7f"; + sha256 = "b915c936233609af3ecf9272cd53fbdb2144d463e8472a30507aa112ef5e6a6b"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.5-jessie-amd64"; - fullName = "Debian 8.5 Jessie (amd64)"; + name = "debian-8.6-jessie-amd64"; + fullName = "Debian 8.6 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "df6aea15d5547ae8dc6d7ceadc8bf6499bc5a3907d13231f811bf3c1c22474ef"; + sha256 = "8b80b6608a8fc72509b949efe1730077f0e8383b29c6aed5f86d9f9b51a631d8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix new file mode 100644 index 000000000000..8e432db84183 --- /dev/null +++ b/pkgs/data/fonts/cabin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cabin-1.005"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A humanist sans with 4 weights and true italics"; + longDescription = '' + The Cabin font family is a humanist sans with 4 weights and true italics, + inspired by Edward Johnston’s and Eric Gill’s typefaces, with a touch of + modernism. Cabin incorporates modern proportions, optical adjustments, and + some elements of the geometric sans. It remains true to its roots, but has + its own personality. + + The weight distribution is almost monotone, although top and bottom curves + are slightly thin. Counters of the b, g, p and q are rounded and optically + adjusted. The curved stem endings have a 10 degree angle. E and F have + shorter center arms. M is splashed. + ''; + homepage = http://www.impallari.com/cabin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix new file mode 100644 index 000000000000..28b9ee2f1e71 --- /dev/null +++ b/pkgs/data/fonts/dosis/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "dosis-1.007"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A very simple, rounded, sans serif family"; + longDescription = '' + Dosis is a very simple, rounded, sans serif family. + + The lighter weights are minimalist. The bolder weights have more + personality. The medium weight is nice and balanced. The overall result is + a family that's clean and modern, and can express a wide range of + voices & feelings. + + It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, + Semibold, Bold & ExtraBold + ''; + homepage = http://www.impallari.com/dosis; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix new file mode 100644 index 000000000000..e0f79b2722ce --- /dev/null +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "encode-sans-1.002"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Encode-Sans"; + rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; + sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A versatile sans serif font family"; + longDescription = '' + The Encode Sans family is a versatile workhorse. Featuring a huge range of + weights and widths, it's ready for all kind of typographic challenges. It + also includes Tabular and Old Style figures, as well as full set of Small + Caps and other Open Type features. + + Designed by Pablo Impallari and Andres Torresi. + ''; + homepage = http://www.impallari.com/projects/overview/encode; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 86dd001374fa..4fae5378463f 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "1.201"; + version = "1.203"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "11hwpdqj41wvzc8l8zgfb132cxn8kxpxbgiqc2kinc25x2l1ikji"; + sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1"; }; sourceRoot = "otf"; diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix new file mode 100644 index 000000000000..8d1111090aab --- /dev/null +++ b/pkgs/data/fonts/lato/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "lato-2.0"; + + src = fetchurl { + url = http://www.latofonts.com/download/Lato2OFL.zip; + sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"; + }; + + sourceRoot = "Lato2OFL"; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/lato + cp *.ttf $out/share/fonts/lato + ''; + + meta = with stdenv.lib; { + homepage = http://www.latofonts.com/; + + description = '' + Sans-serif typeface family designed in Summer 2010 by Åukasz Dziedzic + ''; + + longDescription = '' + Lato is a sans-serif typeface family designed in the Summer 2010 by + Warsaw-based designer Åukasz Dziedzic ("Lato" means "Summer" in Polish). + In December 2010 the Lato family was published under the open-source Open + Font License by his foundry tyPoland, with support from Google. + + In 2013-2014, the family was greatly extended to cover 3000+ glyphs per + style. The Lato 2.010 family now supports 100+ Latin-based languages, 50+ + Cyrillic-based languages as well as Greek and IPA phonetics. In the + process, the metrics and kerning of the family have been revised and four + additional weights were created. + ''; + + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix new file mode 100644 index 000000000000..64779b5d388f --- /dev/null +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-baskerville-1.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A webfont family optimized for body text"; + longDescription = '' + Libre Baskerville is a webfont family optimized for body text. It's Based + on 1941 ATF Baskerville Specimens but it has a taller x-height, wider + counters and less contrast that allow it to work on small sizes in any + screen. + ''; + homepage = http://www.impallari.com/projects/overview/libre-baskerville; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix new file mode 100644 index 000000000000..691d5556e8f2 --- /dev/null +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-bodoni-2.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Bodoni fonts adapted for today's web requirements"; + longDescription = '' + The Libre Bodoni fonts are based on the 19th century Morris Fuller + Benton's ATF design, but specifically adapted for today's web + requirements. + + They are a perfect choice for everything related to elegance, style, + luxury and fashion. + + Libre Bodoni currently features four styles: Regular, Italic, Bold and + Bold Italic. + ''; + homepage = https://github.com/impallari/Libre-Bodoni; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix new file mode 100644 index 000000000000..5037cb81f393 --- /dev/null +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-caslon-${version}"; + version = "1.002"; + + srcs = [ + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Text"; + rev = "c31e21f7e8cf91f18d90f778ce20e66c68219c74"; + name = "libre-caslon-text-${version}-src"; + sha256 = "0zczv9qm8cgc7w1p64mnf0p0fi7xv89zhf1zzf1qcna15kbgc705"; + }) + + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Display"; + rev = "3491f6a9cfde2bc15e736463b0bc7d93054d5da1"; + name = "libre-caslon-display-${version}-src"; + sha256 = "12jrny3y8w8z61lyw470drnhliji5b24lgxap4w3brp6z3xjph95"; + }) + ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; + homepage = http://www.impallari.com/librecaslon; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix new file mode 100644 index 000000000000..473102d77efd --- /dev/null +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-franklin-1.014"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; + homepage = https://github.com/impallari/Libre-Franklin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3757b10754b2..3db05bd4d518 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -5,7 +5,7 @@ , libxml2 , pciutils , pkgconfig -, gtk +, gtk2 }: let version = "20061014"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { libxml2 pciutils pkgconfig - gtk + gtk2 ]; meta = with stdenv.lib; { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 0df76cd28761..e9ff03f78435 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; - md5 = "e50f7d38caf4285965c7a247e026fa7c"; + sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 478dd68e8bbb..19ad49aa9280 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -5,7 +5,7 @@ import ./generic.nix { name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; - md5 = "ab200202b9e136a144db1e0864c45074"; + sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; meta = { branch = "4.3"; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index b8b3d82ccb60..d3aadbcd5a1e 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806"; + sha256 = "08njx6wd505as1vn0yp4mnmf6mb2v28jsipxxx4zhf78v18d2sqc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index b019951db5ff..94ce68f9cb20 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygobject pygtk dbus-python; + inherit (pythonPackages) python pygobject2 pygtk dbus-python; in stdenv.mkDerivation rec { version = "2.28"; name = "gnome-python-${version}.1"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ ''; - buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; + buildInputs = [ python pkgconfig pygobject2 pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; doCheck = false; diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix index 1e2faf3af84f..e06ffca8b90d 100644 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python, gtk }: +{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, pygtk, python, gtk }: stdenv.mkDerivation rec { ver_maj = "2.32"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "python waf install"; - buildInputs = [ gtk gnome.gnome_python librsvg pkgconfig pygtk python ]; + buildInputs = [ gtk gnome2.gnome_python librsvg pkgconfig pygtk python ]; meta = with stdenv.lib; { homepage = "http://www.pygtk.org"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 11f874a0e894..ff4abf26ac83 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -2,7 +2,8 @@ , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: +, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 +, libSM }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -14,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; + libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + libSM + ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index ccabff27549f..7678cb3a4b42 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower }: +, intltool, libglade, startup_notification, GConf, upower, libSM }: stdenv.mkDerivation { name = "gnome-session-2.32.1"; @@ -11,7 +11,10 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower + GConf upower libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; + + # gconf-sanity-check-2 not found + meta.broken = true; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 93dfa544ea91..37f995396861 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +, libSM }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - libpulseaudio + libpulseaudio libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b848296d5f0f..d1f748c993d8 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }: +, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: -assert withGtk -> (gtk != null); +assert withGtk -> (gtk2 != null); stdenv.mkDerivation { name = "gconf-2.32.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit - ++ stdenv.lib.optional withGtk gtk; + ++ stdenv.lib.optional withGtk gtk2; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index e7f3f5659025..6be2a440879f 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; }; + hardeningDisable = [ "format" ]; + buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index e77e9e19970c..78fc82ebaed0 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas + [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix index d0d7bceef61f..cf781d24b6f0 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg + libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server libical libtool nss gtk gstreamer makeWrapper gdm diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix index 5f255743313e..95785d9ed4d2 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: let majVer = "1.0"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; }; - buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; + buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix index a128990b4029..8b992d30e809 100644 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra + gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 gnome3.geocode_glib libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix index 194b4aca4383..884b328dbe71 100644 --- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ ./x86.patch ]; - propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject ]; + propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index a1a7390274e7..817c0d9b1d64 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra; + inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix index a2c644caf3cb..71bb11d48534 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime +, libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite + vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix index ff176754e389..1c7f712b12c5 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, glib, gobjectIntrospection, telepathy_glib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra vala_0_32 gst_all_1.gstreamer + makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index bbb540ec10fc..4bb961b8d2e7 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -1,11 +1,11 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake-2_8, automoc4, perl, pkgconfig +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig , release, branch, ignoreList, extraSubpkgs }: let inherit (stdenv.lib) filter fold; inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; - cmake = cmake-2_8; + cmake = cmake_2_8; in rec { manifest = import (./. + "/${release}.nix"); diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 3166b94adaa7..980cc9ac25c8 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -57,6 +57,7 @@ let libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + marble = callPackage ./marble.nix {}; okular = callPackage ./okular.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index b3c71c44fcf8..c23d8a4d7572 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/applications/16.08.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/desktops/kde-5/applications/marble.nix new file mode 100644 index 000000000000..8d6ee5a0f7c5 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/marble.nix @@ -0,0 +1,24 @@ +{ kdeApp, lib, kdeWrapper +, ecm, qtscript, qtsvg, qtquickcontrols +, gpsd +}: + +let + unwrapped = + kdeApp { + name = "marble"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + qtscript qtsvg qtquickcontrols + gpsd + ]; + + enableParallelBuilding = true; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/marble-qt" ]; + paths = [ unwrapped ]; +} diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index 4da2717031ff..e3ecd24b6dbf 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -1,2069 +1,2069 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { akonadi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-16.08.0.tar.xz"; - sha256 = "0xml678j47f9xd2dvyvw2v93yklwkvxamrp2v3739iqp03qfc210"; - name = "akonadi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-16.08.1.tar.xz"; + sha256 = "1km4qis98z19b5vy0g8r52mnd4i301ycf9l96a4vw4q56wmss2f1"; + name = "akonadi-16.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-calendar-16.08.0.tar.xz"; - sha256 = "0g61sbj1ifkw349xmwch6hkazs1n6m92jhc1gm8az4zfnipms8yw"; - name = "akonadi-calendar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-calendar-16.08.1.tar.xz"; + sha256 = "12bz190cww8r34j0543wavf4d9ydkwszxh1ayxkg6hlf67yv2jpf"; + name = "akonadi-calendar-16.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-contacts-16.08.0.tar.xz"; - sha256 = "1c50nnfk8r351a1pc0hyl03gbmnzqvicj6533gbl60104zg0cl49"; - name = "akonadi-contacts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-contacts-16.08.1.tar.xz"; + sha256 = "09dx4vi1329fgr2gya833p3zwasz4y8vh4fwlis3669zns6nvn6w"; + name = "akonadi-contacts-16.08.1.tar.xz"; }; }; akonadi-mime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-mime-16.08.0.tar.xz"; - sha256 = "0b541y6ir78f5acdlzzr0bv9q8gd1p4rklrm0pcddvs1d28s5ng2"; - name = "akonadi-mime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-mime-16.08.1.tar.xz"; + sha256 = "16hyz28gjp1b0w6l33cgdrli4b777yanryfr8nn1mp4y8p2375fp"; + name = "akonadi-mime-16.08.1.tar.xz"; }; }; akonadi-notes = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-notes-16.08.0.tar.xz"; - sha256 = "0xwrj9y071g1svmwj1nrfff3vr371va7rm8mmx5hw6ringakgxn6"; - name = "akonadi-notes-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-notes-16.08.1.tar.xz"; + sha256 = "1m95zckfr9wlcjsf3h6v2fg7rbivd28gjj2yddrrv7wx57xmky4j"; + name = "akonadi-notes-16.08.1.tar.xz"; }; }; akonadi-search = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-search-16.08.0.tar.xz"; - sha256 = "12lpgm5111dd2ny6fdhcxish397x54mcnma504f3ibk7f3brwnmf"; - name = "akonadi-search-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-search-16.08.1.tar.xz"; + sha256 = "1qdqzb9achabb3vs7dm3pi3pk3l8rmk6ymmzlxr79l98cfmw39bk"; + name = "akonadi-search-16.08.1.tar.xz"; }; }; analitza = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/analitza-16.08.0.tar.xz"; - sha256 = "1j8axc4618jb45vxp0ii51sr2wh6vmr1f8ycn3xqnd9ln936qqyz"; - name = "analitza-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/analitza-16.08.1.tar.xz"; + sha256 = "1l08g9gzi6aabzh62cg2k4731nbw8hnfb7qy1mjb4yn2gap0c4cd"; + name = "analitza-16.08.1.tar.xz"; }; }; ark = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ark-16.08.0.tar.xz"; - sha256 = "1a8aklvpk5s319665s1c0mnbzknbyhbq2lm79hflal3r28g3acvj"; - name = "ark-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ark-16.08.1.tar.xz"; + sha256 = "1g9qvxw26hqngvbp4i82lmhpbr4nxidv7pj0sg1ji48jzycjbd3q"; + name = "ark-16.08.1.tar.xz"; }; }; artikulate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/artikulate-16.08.0.tar.xz"; - sha256 = "1j57y5zwp6zpd2hzh01a13m49rbgkzkf3ncfx122d7vih9f8kzvd"; - name = "artikulate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/artikulate-16.08.1.tar.xz"; + sha256 = "1rbs6yf3pmhp9xj3lpr0h14pb4mylffhav2nb8sb42hw7c3pjycb"; + name = "artikulate-16.08.1.tar.xz"; }; }; audiocd-kio = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/audiocd-kio-16.08.0.tar.xz"; - sha256 = "0ndb7b67yssmsxlnphpkyk4yx9n3xx2w20q4fz55r6zrp7yphm1a"; - name = "audiocd-kio-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/audiocd-kio-16.08.1.tar.xz"; + sha256 = "15x9nv014sdvc80vqldsgxrgickrrda6hrm26jcvp483qzvpjp82"; + name = "audiocd-kio-16.08.1.tar.xz"; }; }; baloo-widgets = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/baloo-widgets-16.08.0.tar.xz"; - sha256 = "0daf0wkz14p82fl7731r1dhcy2w1zqlia722jskzmn4g86c9lf7d"; - name = "baloo-widgets-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/baloo-widgets-16.08.1.tar.xz"; + sha256 = "0lb42ci06xka82147awcwdhw35d1spvhdkfiq3qpbbyq8ajqxq18"; + name = "baloo-widgets-16.08.1.tar.xz"; }; }; blinken = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/blinken-16.08.0.tar.xz"; - sha256 = "16x0l7fajrdgqm6pwhkn1za8bwliw556z6fc4bxm2jgcmdih7znq"; - name = "blinken-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/blinken-16.08.1.tar.xz"; + sha256 = "0xk39mcyad8s8haj2rmg2m7x46qzayl8zivc8v8h28vn80lvhk4v"; + name = "blinken-16.08.1.tar.xz"; }; }; bomber = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/bomber-16.08.0.tar.xz"; - sha256 = "05j7xrcxs0lvniprd9818ck0jrjn6j8hjf773riqzsqr463v183h"; - name = "bomber-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/bomber-16.08.1.tar.xz"; + sha256 = "0rsgwr8vlnfli8zb77l9vdqn60k7kpdxpsaq16nhxxwl2n3780gn"; + name = "bomber-16.08.1.tar.xz"; }; }; bovo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/bovo-16.08.0.tar.xz"; - sha256 = "184h61fbkrasp9hik21pa45fxhgvvqmsf424n46i93m48fa7vwzl"; - name = "bovo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/bovo-16.08.1.tar.xz"; + sha256 = "1vc4dv5gh2vif98fz4rcdb8zv20sashq4xbgfvk0xq3ls9j3qdyi"; + name = "bovo-16.08.1.tar.xz"; }; }; calendarsupport = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/calendarsupport-16.08.0.tar.xz"; - sha256 = "04sbgp75vdg69jdjp9wgkcblzcwa7v5hwsdyb2ahz9ga27qsxgan"; - name = "calendarsupport-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/calendarsupport-16.08.1.tar.xz"; + sha256 = "08xvnmlpkwrsdz5fawcddcd5s7dn3zczfk5shk9a00734nc4akkb"; + name = "calendarsupport-16.08.1.tar.xz"; }; }; cantor = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/cantor-16.08.0.tar.xz"; - sha256 = "0j798qxa8j8f6fjkvpag48gcqjrifgxhcm8raccx3bqlxz7145gh"; - name = "cantor-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/cantor-16.08.1.tar.xz"; + sha256 = "1cawdhpmyfb5qgbxil38szghi8q7hslpljzgsn7ma3gy6sqv3k9s"; + name = "cantor-16.08.1.tar.xz"; }; }; cervisia = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/cervisia-16.08.0.tar.xz"; - sha256 = "0azjsigiz26y9fn1i8gaqdzw2bhvdn9v63ii51iazggjb49sk17v"; - name = "cervisia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/cervisia-16.08.1.tar.xz"; + sha256 = "0apb29k4r2wsf6hn3rl2h1yvmy8npi4dmvjhr02j3gqfxic68vf1"; + name = "cervisia-16.08.1.tar.xz"; }; }; dolphin = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dolphin-16.08.0.tar.xz"; - sha256 = "0xqyb1qdxg19sp7xwkys9x92cx5wnbjz3sdmr2yc4j56fjqhih3j"; - name = "dolphin-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dolphin-16.08.1.tar.xz"; + sha256 = "022mnq1x9la8yxim3svf3vj2x43gdp5qd6fwr50lvxw4i4gc8giy"; + name = "dolphin-16.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dolphin-plugins-16.08.0.tar.xz"; - sha256 = "12pxw5vzznzkd9mr6dshh18mlgk0pmmkqic1mn1i53w0sj9r1zl2"; - name = "dolphin-plugins-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dolphin-plugins-16.08.1.tar.xz"; + sha256 = "1vi0pwvz76w13gglpbn1dwxbzr5hmwjhdpi64nmbqjgi71i9x2sa"; + name = "dolphin-plugins-16.08.1.tar.xz"; }; }; dragon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dragon-16.08.0.tar.xz"; - sha256 = "0vjhrdyshd7rd4i7yn6v1ldi0fsyabwph1pjjdylq1cz4clc7mzi"; - name = "dragon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dragon-16.08.1.tar.xz"; + sha256 = "1441jgg8bwvqghz31xnkwwlsayw134q0jiffgh1nis4rxm2rln8h"; + name = "dragon-16.08.1.tar.xz"; }; }; eventviews = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/eventviews-16.08.0.tar.xz"; - sha256 = "1gms9q04icycjcazqkhg0i6mlf01rg45pp3zyndw6l7y3v9gcnq2"; - name = "eventviews-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/eventviews-16.08.1.tar.xz"; + sha256 = "0hp282if9fzw1xv4zdwrvar7wkchi9psl373r1594a7rjz9iby5j"; + name = "eventviews-16.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ffmpegthumbs-16.08.0.tar.xz"; - sha256 = "0nymi6g51xal5cllnp6rqxr7gcanp07njvpc7w02i2daan6cf5li"; - name = "ffmpegthumbs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ffmpegthumbs-16.08.1.tar.xz"; + sha256 = "08gna4lcz6ipjkm2vx862n1w61cxzkskaapsd22zxfmgfhmqyp73"; + name = "ffmpegthumbs-16.08.1.tar.xz"; }; }; filelight = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/filelight-16.08.0.tar.xz"; - sha256 = "1dynl9b4vp8qas23ysbbjmrf71k36z5cwnb2av3k0b53vf8h694p"; - name = "filelight-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/filelight-16.08.1.tar.xz"; + sha256 = "0l059q0vh4yp2y5m0alvcz74g4amiks6yfhh45bd38vkvfay8073"; + name = "filelight-16.08.1.tar.xz"; }; }; gpgmepp = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/gpgmepp-16.08.0.tar.xz"; - sha256 = "0ydwl5qkvxnmzr3f375giykbhj8mm6kv1hywb6kyzafxcwn9ryqf"; - name = "gpgmepp-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/gpgmepp-16.08.1.tar.xz"; + sha256 = "1fqxjfn3mqkar8akpfh0i2lr30bvf99fm2ldsx34x7fq3kh29ys5"; + name = "gpgmepp-16.08.1.tar.xz"; }; }; granatier = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/granatier-16.08.0.tar.xz"; - sha256 = "16j2xap43jpj6v6bclf99805rgpfzxcxnb715malcx69krqacfy2"; - name = "granatier-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/granatier-16.08.1.tar.xz"; + sha256 = "1k270rqcyf37gl1r4086q4r49ssvawy56d32y1n02ph289m3dgl6"; + name = "granatier-16.08.1.tar.xz"; }; }; grantleetheme = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/grantleetheme-16.08.0.tar.xz"; - sha256 = "152b8brnd4q7zmxg4a3xizm56cqxy67aa7gc0znjcg8ga11szrpx"; - name = "grantleetheme-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/grantleetheme-16.08.1.tar.xz"; + sha256 = "10xajrlmkjpz6xl3jg47mdvpf478vvxx3rcwcvd2zxaza9yyakms"; + name = "grantleetheme-16.08.1.tar.xz"; }; }; gwenview = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/gwenview-16.08.0.tar.xz"; - sha256 = "0in10ssq543snsdm4dks2z4hspqiwr0hygc2y8mpcg9kvq11j1w1"; - name = "gwenview-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/gwenview-16.08.1.tar.xz"; + sha256 = "1i55zd0pbgg2xinqzhxpsqx0vqp3dwn4z7bbf85m5cldbi070yv8"; + name = "gwenview-16.08.1.tar.xz"; }; }; incidenceeditor = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/incidenceeditor-16.08.0.tar.xz"; - sha256 = "102chdy0siwnpv9rbxfy7aj1rz4gbwqq6sws7i92paj1k57ln361"; - name = "incidenceeditor-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/incidenceeditor-16.08.1.tar.xz"; + sha256 = "0wl89kwbnqrafflrdphczrn3l5gjgl5fqxvz4z995ri9m98kvgin"; + name = "incidenceeditor-16.08.1.tar.xz"; }; }; jovie = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/jovie-16.08.0.tar.xz"; - sha256 = "0npcs6pq3w6r6wlg4j6dkl4zk9adm8fi84sh8vw89p9iksa2bgjm"; - name = "jovie-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/jovie-16.08.1.tar.xz"; + sha256 = "0nkrcvdsjcpba2awgvk0nv8ni3b5596p2jygxa906w50sjkcf5bk"; + name = "jovie-16.08.1.tar.xz"; }; }; juk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/juk-16.08.0.tar.xz"; - sha256 = "051zsjlq4bfiynkwb6gfx221j0fyvbd01dgx4adjgi15arw0l4kh"; - name = "juk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/juk-16.08.1.tar.xz"; + sha256 = "1kj5iw3hfgqwz08imcfjicgm5m4v7m1fny6da8jidvwzyn46nll4"; + name = "juk-16.08.1.tar.xz"; }; }; kaccessible = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccessible-16.08.0.tar.xz"; - sha256 = "1z9i0ylkph3ws5w8qh0h70ykhyjigmjlmmlrnjvxq36mszi2ph5v"; - name = "kaccessible-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccessible-16.08.1.tar.xz"; + sha256 = "086spk1aignmb2bry6hbw11nssm99dk38mnk4s89f444ydczs3fs"; + name = "kaccessible-16.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccounts-integration-16.08.0.tar.xz"; - sha256 = "0fs5y06j0psg0y97z54yv6mv1w88zm1dbvrmzwdckap9iyhgdk5w"; - name = "kaccounts-integration-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccounts-integration-16.08.1.tar.xz"; + sha256 = "0pjj0d8pnnz5zjmkjzb0x157msv0r0hk4h5vdji1jr0bwwhmwaw9"; + name = "kaccounts-integration-16.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccounts-providers-16.08.0.tar.xz"; - sha256 = "1sphbdfiqyjcyxvdpbrsfx8jci2k8w1vh56v6hpnv7dn042dmmim"; - name = "kaccounts-providers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccounts-providers-16.08.1.tar.xz"; + sha256 = "1ji88wgvymdh63ykmv12n5gnr0zwmsch56n7wpwn5wvxs34wimqx"; + name = "kaccounts-providers-16.08.1.tar.xz"; }; }; kajongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kajongg-16.08.0.tar.xz"; - sha256 = "0ydl7pdlp9nrfpxnkznaj6mwdq8w660flf5y3bgvv8jdxnaz7cyn"; - name = "kajongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kajongg-16.08.1.tar.xz"; + sha256 = "0z8kin497631fa7wls6bi42q32ijqgy674cigcmz9jfgn2hwkbc0"; + name = "kajongg-16.08.1.tar.xz"; }; }; kalarmcal = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalarmcal-16.08.0.tar.xz"; - sha256 = "0ai9h67w6dwsnw18hkxxwmpar4nf3k0zpv6fd1f1y9mvk2xdr6vw"; - name = "kalarmcal-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalarmcal-16.08.1.tar.xz"; + sha256 = "10r31l6ak6dbksfj5444ndv06qx0jl4si634hv3i77q20jys1j26"; + name = "kalarmcal-16.08.1.tar.xz"; }; }; kalgebra = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalgebra-16.08.0.tar.xz"; - sha256 = "0ypwsp8pd72v4h99wcjpjkara3dbzidbjf8xksk7zskyp5c5rqxn"; - name = "kalgebra-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalgebra-16.08.1.tar.xz"; + sha256 = "1wfiqlhhm36p137wcgpbvnhr6idqwkdann99pb1y463jblrdibv6"; + name = "kalgebra-16.08.1.tar.xz"; }; }; kalzium = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalzium-16.08.0.tar.xz"; - sha256 = "0vfylw7nw0f4dfi62ala5v1gkg4zf2g36pdl57afbbq1pc8v1qpf"; - name = "kalzium-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalzium-16.08.1.tar.xz"; + sha256 = "09rz69cqqmicmwm9dj9yzq4l3j4w74ih8wcw0xyky948p3x6dh2r"; + name = "kalzium-16.08.1.tar.xz"; }; }; kamera = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kamera-16.08.0.tar.xz"; - sha256 = "0l0nk3q8m6lww7r8gqdkkhl4s7mv7saxjxs7jkypll1q0686pmk7"; - name = "kamera-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kamera-16.08.1.tar.xz"; + sha256 = "01fvdbwi10pnhwg9q7w5lyr027mpy67mzdwpcwv4h1js6dsi68nz"; + name = "kamera-16.08.1.tar.xz"; }; }; kanagram = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kanagram-16.08.0.tar.xz"; - sha256 = "180hpi4zhmhbmkn9166zpxk9pp3w08pryj33pkq6qcsbsflmnmic"; - name = "kanagram-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kanagram-16.08.1.tar.xz"; + sha256 = "0a2rk092sgp1ysaw7h47y6lmw9z269j7llnw5vzq3mblc2ay2sda"; + name = "kanagram-16.08.1.tar.xz"; }; }; kapman = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kapman-16.08.0.tar.xz"; - sha256 = "1jhiwvi9hx46h1gwf1qmpi6cvyncybhfjsf0m51329cgx2hdfzl5"; - name = "kapman-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kapman-16.08.1.tar.xz"; + sha256 = "0x7b1d6hhl0nwyz8qzcz9nnjv8477ghifzgiyw3g1bx8044wqlsk"; + name = "kapman-16.08.1.tar.xz"; }; }; kapptemplate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kapptemplate-16.08.0.tar.xz"; - sha256 = "1zdaafrynh083vqr2b587c862qz0220hinmf9dc345gfss244zzf"; - name = "kapptemplate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kapptemplate-16.08.1.tar.xz"; + sha256 = "1zkq5hpi8y4bny0q8p0aa3s4jpd5bxw18m5jxadjm4gfznnw8afv"; + name = "kapptemplate-16.08.1.tar.xz"; }; }; kate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kate-16.08.0.tar.xz"; - sha256 = "0z1fqd73il15y0hpjshhmd0cv6l2s3pm90m9l5k0ggg8vy0l1pqv"; - name = "kate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kate-16.08.1.tar.xz"; + sha256 = "0z1q5lnkqnx40zbxj3bnwg9wrx7xk7xzfwc8i02zzvx50n7qn57n"; + name = "kate-16.08.1.tar.xz"; }; }; katomic = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/katomic-16.08.0.tar.xz"; - sha256 = "14g0fiyxmlpwnfw25z3yxdzhixcahxss7rm4k06km37nzxmcca8l"; - name = "katomic-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/katomic-16.08.1.tar.xz"; + sha256 = "1ilaz15qg1fasd0yv03vcspxx54cbw2m99wl39zzrh7jc3df0ad8"; + name = "katomic-16.08.1.tar.xz"; }; }; kblackbox = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblackbox-16.08.0.tar.xz"; - sha256 = "0pq9rw1inxm5vjv4bcwklgh90wrz3sirf80v75dy2myiriv02y08"; - name = "kblackbox-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblackbox-16.08.1.tar.xz"; + sha256 = "1w7rh9m6qwdid2li7xhmsfs0v7q95gyl24529xm17y79k1qxcbm7"; + name = "kblackbox-16.08.1.tar.xz"; }; }; kblocks = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblocks-16.08.0.tar.xz"; - sha256 = "04si5m0rbshm8h09ln6xqhfnsakrqqm3gi1gyk1agcpa5wr1hfyf"; - name = "kblocks-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblocks-16.08.1.tar.xz"; + sha256 = "086b8k8zhs9v0rp06z9wx8gaaphc2178px5501rqx6062azxflil"; + name = "kblocks-16.08.1.tar.xz"; }; }; kblog = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblog-16.08.0.tar.xz"; - sha256 = "1qrdxad83dzjc5lpvj7dcghzkryp0anrp97sk7dlkmf1j7mj5w7n"; - name = "kblog-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblog-16.08.1.tar.xz"; + sha256 = "1vc2a3c4iz2jm2137zw3i69n6qam2rlhvjr8ybv84xv9s7b3pz25"; + name = "kblog-16.08.1.tar.xz"; }; }; kbounce = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbounce-16.08.0.tar.xz"; - sha256 = "13a2xzkym62rxvk3haxjca1n8vx13r093r5dzsn9fb0gwc47p60x"; - name = "kbounce-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbounce-16.08.1.tar.xz"; + sha256 = "0a4khwdrhzg33i4bbz1kb7w2jyzahnj1agcdybpzbqjnczgv4rnn"; + name = "kbounce-16.08.1.tar.xz"; }; }; kbreakout = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbreakout-16.08.0.tar.xz"; - sha256 = "1b1z702ify3av1275160sz740z1yyfv4x5jxrdzwf554sy8nqigg"; - name = "kbreakout-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbreakout-16.08.1.tar.xz"; + sha256 = "14i4yyxxd9w72sgdfwp47y8drbdl7lsb8fxgdswg91dpcnm1jmgi"; + name = "kbreakout-16.08.1.tar.xz"; }; }; kbruch = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbruch-16.08.0.tar.xz"; - sha256 = "15v86pdgpdrkaxa75pj39w7c2x89b1gx3inxvpx51rfcjxdiqsz4"; - name = "kbruch-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbruch-16.08.1.tar.xz"; + sha256 = "02dyc90ir79swf8vjd53flxqp2imaaa9c5dikflbxiahj4k6rpa4"; + name = "kbruch-16.08.1.tar.xz"; }; }; kcachegrind = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcachegrind-16.08.0.tar.xz"; - sha256 = "0bx0viz57d4qabsw0yl3max042wqzcnqkkvyd7yq1mdkjvywl522"; - name = "kcachegrind-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcachegrind-16.08.1.tar.xz"; + sha256 = "1d7i162a6v7xhykzpszmia7cizrsgh040wk0ql7ijgb838iawflg"; + name = "kcachegrind-16.08.1.tar.xz"; }; }; kcalc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalc-16.08.0.tar.xz"; - sha256 = "1pk52k6cid8gppy5m9psfhq20jdcd1z9930yyj2sp9d5ynbk0hxb"; - name = "kcalc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalc-16.08.1.tar.xz"; + sha256 = "18nhvmgd0d2m0ji23536fhqykf4xdnnky5x0hy6vkja0dw91aggg"; + name = "kcalc-16.08.1.tar.xz"; }; }; kcalcore = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalcore-16.08.0.tar.xz"; - sha256 = "124hybji5j7838gxy69w4cafgrkh8wjh40v0iwqkiaq3nwjv3q0n"; - name = "kcalcore-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalcore-16.08.1.tar.xz"; + sha256 = "12q30gsaw2fr7wx6jpswa7aby8d58wldxagbcdkwcifv78d7bgk7"; + name = "kcalcore-16.08.1.tar.xz"; }; }; kcalutils = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalutils-16.08.0.tar.xz"; - sha256 = "02dvdxnxl51qml8wmpvay7apq7zww7nf7nqwmli10m79ppdw1jmw"; - name = "kcalutils-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalutils-16.08.1.tar.xz"; + sha256 = "0fvhy2r5mw871ld18rab4nx9cv52fg7vwkxj31gbvx6rbzbmzsrs"; + name = "kcalutils-16.08.1.tar.xz"; }; }; kcharselect = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcharselect-16.08.0.tar.xz"; - sha256 = "11vyhlx33jjlwp1vri4l1vpzcgi07f86cqcfd84hnyr48v9dnya1"; - name = "kcharselect-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcharselect-16.08.1.tar.xz"; + sha256 = "1mx2biawax867rfq42w0mi4b7v10j17anfq64gx5q6vi79k6jqaj"; + name = "kcharselect-16.08.1.tar.xz"; }; }; kcolorchooser = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcolorchooser-16.08.0.tar.xz"; - sha256 = "0j9s2f2x0vzkl24ajhm8ff1mx6r05j07sjx8v507pbfmxj2h64iz"; - name = "kcolorchooser-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcolorchooser-16.08.1.tar.xz"; + sha256 = "1s490hkjbinhlc3pf2waks9ka8dvkpq3l5vblmd11h1yckbpcdqi"; + name = "kcolorchooser-16.08.1.tar.xz"; }; }; kcontacts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcontacts-16.08.0.tar.xz"; - sha256 = "063qip4jrcv8qzz1gvq49wjzjsrp8ladaspagqd4jbq65qvnpz96"; - name = "kcontacts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcontacts-16.08.1.tar.xz"; + sha256 = "198qqs7001m2ywmryx9489jpay1g7i9g04bl9y25jr2a3lf4id87"; + name = "kcontacts-16.08.1.tar.xz"; }; }; kcron = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcron-16.08.0.tar.xz"; - sha256 = "17bhhvni66wx4ihqzqcn9mglidw7r1lak08jgdbnadxj1nalph8l"; - name = "kcron-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcron-16.08.1.tar.xz"; + sha256 = "062ndya5r67imkx0fw2whgppfm9j3jwxscfz8vd64g3532kai9n5"; + name = "kcron-16.08.1.tar.xz"; }; }; kde-baseapps = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-baseapps-16.08.0.tar.xz"; - sha256 = "0sajfiwij3znmgmayj1d1q4xmzr0j0a4nb6181j3a360vg5zd42f"; - name = "kde-baseapps-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-baseapps-16.08.1.tar.xz"; + sha256 = "0s9391mx2wh1yvi5ykp5nj3zfr5qvkqpwljjgvhfr2i1a4h24551"; + name = "kde-baseapps-16.08.1.tar.xz"; }; }; kdebugsettings = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdebugsettings-16.08.0.tar.xz"; - sha256 = "08w6b514vrg7100d10m6iwqpgh6ap06dh1b79xax0rqlpcpl40yn"; - name = "kdebugsettings-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdebugsettings-16.08.1.tar.xz"; + sha256 = "0b3940wzm3bl0w0wdjk62ikf6cxlzipckwzq7skpnp115j90pnyp"; + name = "kdebugsettings-16.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-dev-scripts-16.08.0.tar.xz"; - sha256 = "197w58zhbm6cs54wa4rxf5hmw9gjyvwpabdlfvn1dzr53fx0wlh1"; - name = "kde-dev-scripts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-dev-scripts-16.08.1.tar.xz"; + sha256 = "1biw748yyiy2xwb4jyx1g4h6v9m0q3qwxh6kc4l7fb9qsjam0222"; + name = "kde-dev-scripts-16.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-dev-utils-16.08.0.tar.xz"; - sha256 = "1a1cxr95sgfpzjcdq0b0jny8lwx734xn3nm9axakq614mq1mqhcw"; - name = "kde-dev-utils-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-dev-utils-16.08.1.tar.xz"; + sha256 = "00dgfclyl95nv5s77w56h472hb02v91fhdx0qkk0vikj2n1z7l9n"; + name = "kde-dev-utils-16.08.1.tar.xz"; }; }; kdeedu-data = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdeedu-data-16.08.0.tar.xz"; - sha256 = "09c9v0h5bys1nx6ll18s91lwghhri1aqnhs86igp81a5k3rgvjf3"; - name = "kdeedu-data-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdeedu-data-16.08.1.tar.xz"; + sha256 = "0qh6ain1qi7l5455j3ir6fq7rs735j2q2czxl2ys8qji5j1yidwa"; + name = "kdeedu-data-16.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-mobipocket-16.08.0.tar.xz"; - sha256 = "183dxwfx4d17wzy81jjjh2v1lhi7hi7glwgd5dh208v30h36h1fv"; - name = "kdegraphics-mobipocket-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-mobipocket-16.08.1.tar.xz"; + sha256 = "1lzwlvcf6wp1g2n46811cq2m3h212w161z6kasdg7wf7rcghbmvd"; + name = "kdegraphics-mobipocket-16.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-thumbnailers-16.08.0.tar.xz"; - sha256 = "1i0cfnsh74bic5z4hvrakss55ci3xlfslcmwklp20804ngfkq6h8"; - name = "kdegraphics-thumbnailers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-thumbnailers-16.08.1.tar.xz"; + sha256 = "068cvcnaf8kyls49143w8lwg24hk58byiv23qh2xxv180ps12hkm"; + name = "kdegraphics-thumbnailers-16.08.1.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ar-16.08.0.tar.xz"; - sha256 = "0dkxjb7af1xb3q1c2d4hpl8vn9391fbacfbnahxyil3zqxp0z5i7"; - name = "kde-l10n-ar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ar-16.08.1.tar.xz"; + sha256 = "0v1h0qciqr4kanb0mb6hjma35spjhp51vx0r7kb3girmv4ik2mii"; + name = "kde-l10n-ar-16.08.1.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ast-16.08.0.tar.xz"; - sha256 = "0x7pjg1x5yw76145biwfyrw8b0nx06xbzc57rqvy8k773qr5zilj"; - name = "kde-l10n-ast-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ast-16.08.1.tar.xz"; + sha256 = "1srk025iqvrwjcks9hcjlzxqmlmfmzn3xlgi1c60nncb046q7xa6"; + name = "kde-l10n-ast-16.08.1.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bg-16.08.0.tar.xz"; - sha256 = "1617b7a1rr43jhj8jdqyircm72jvqcrqqkzl3s8hwi6daprpqik9"; - name = "kde-l10n-bg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bg-16.08.1.tar.xz"; + sha256 = "014s77imwl3awy3fd4yzdv0k61j1h0rlvnlfk7mzkyyjgxhh9wqg"; + name = "kde-l10n-bg-16.08.1.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bs-16.08.0.tar.xz"; - sha256 = "1vmk5mmrs0d1123cx5y003lkim1kxc9d8x3flsxkpyb1c155nvpw"; - name = "kde-l10n-bs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bs-16.08.1.tar.xz"; + sha256 = "0ijsbkllls8966hrh19p2062fmnjan0hibl6650ihgypsci15y57"; + name = "kde-l10n-bs-16.08.1.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca-16.08.0.tar.xz"; - sha256 = "18m2g0iagiaqfbg1lr1i3z9nm4qva0ipl1rh22p2slqivqcrvg51"; - name = "kde-l10n-ca-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca-16.08.1.tar.xz"; + sha256 = "12kn3skciqmsqwqdpx7n4286cz1w7rdgx4mggvk05db0bhrybjzg"; + name = "kde-l10n-ca-16.08.1.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.0"; + version = "ca_valencia-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca@valencia-16.08.0.tar.xz"; - sha256 = "1h68h6dzkkhpl5rsdw6ykg9prs9l1xbwwm7mqxxljxsd8bmpdv4g"; - name = "kde-l10n-ca_valencia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca@valencia-16.08.1.tar.xz"; + sha256 = "0dfjx9pfzwilz746lrdgpx51cig8wr9igbm7pdidpaz5wryqfsif"; + name = "kde-l10n-ca_valencia-16.08.1.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-cs-16.08.0.tar.xz"; - sha256 = "0wg84mxj4sbwi3ck4vdva0fbs7gsyr2xjzk6bd49a70ls9icp39x"; - name = "kde-l10n-cs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-cs-16.08.1.tar.xz"; + sha256 = "1b14wgczd6qfkgy1rfj2dmw0l0vc3jkf1yf0ih5y0s3zqx081k34"; + name = "kde-l10n-cs-16.08.1.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-da-16.08.0.tar.xz"; - sha256 = "0jkkqw69bv3r6avcywsxbqy99lbcyfbn3r9ipqcmka3hpss8cf18"; - name = "kde-l10n-da-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-da-16.08.1.tar.xz"; + sha256 = "1hdppgawypnya6sk60bz62cc7dnhh5m1dcq68hx67a9wrf6hw21i"; + name = "kde-l10n-da-16.08.1.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-de-16.08.0.tar.xz"; - sha256 = "0g6cglysjzzbc67wv29zqikvgzmq928a3arwd50hjvg85dh50w4f"; - name = "kde-l10n-de-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-de-16.08.1.tar.xz"; + sha256 = "0r0kkrmk4gzn9nhly9c908ajciy9k9rxy8wrqampj4gynxsrc07w"; + name = "kde-l10n-de-16.08.1.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-el-16.08.0.tar.xz"; - sha256 = "037wiqbw172rkqlq5709arwkdi8qmhrrqc00rhy612x7m075n2ln"; - name = "kde-l10n-el-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-el-16.08.1.tar.xz"; + sha256 = "1d6ipj1hyjzwlcparbi533iqgvbx9lhdmqnzdhjxnim1hia25wan"; + name = "kde-l10n-el-16.08.1.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.0"; + version = "en_GB-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-en_GB-16.08.0.tar.xz"; - sha256 = "0nbkijpaxsi365c6q44wq0wbv0bqgpyhrb1d2a3v7lhcb9jv6ci9"; - name = "kde-l10n-en_GB-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-en_GB-16.08.1.tar.xz"; + sha256 = "102qlxmcynqf30x25ygmh7x6x0d12fbr4dri1nj8rkd8bmi214di"; + name = "kde-l10n-en_GB-16.08.1.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eo-16.08.0.tar.xz"; - sha256 = "1qsl7r9da29hxqs7y0i17zyzvpfxi9h2srdq345ppyxdk3avbvp7"; - name = "kde-l10n-eo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eo-16.08.1.tar.xz"; + sha256 = "131y6259yi3kwzn17a11nx5xmxc1llg105g2x0sfayc7k4i5y24z"; + name = "kde-l10n-eo-16.08.1.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-es-16.08.0.tar.xz"; - sha256 = "1hm2rvsbrxmci1939iicms5qb1fbm0f1b27zlhgzmf6j3pmg25b3"; - name = "kde-l10n-es-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-es-16.08.1.tar.xz"; + sha256 = "1qzwfi21cfs5j88hxmkbbrp8isrxv6b6c3ld2s41lj6a67sdw21k"; + name = "kde-l10n-es-16.08.1.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-et-16.08.0.tar.xz"; - sha256 = "0ng6qg7sw3dypn7yg7m8803cpqm39x0b9jn2q0f3jmx46ys9kyyi"; - name = "kde-l10n-et-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-et-16.08.1.tar.xz"; + sha256 = "1dci7x9w8dzmzwj5f6c4i9x6v5g68ll9dwfvwf060vy2pnnnlw7g"; + name = "kde-l10n-et-16.08.1.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eu-16.08.0.tar.xz"; - sha256 = "0dmiipd0l1dza14fyd17g7qwih4n1fzg2fjkx9vhwdzl5anxmb13"; - name = "kde-l10n-eu-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eu-16.08.1.tar.xz"; + sha256 = "1n21mhqlr3wj6gd9kbfvfck5f1ql1ywanbp084afxqcbx82pb7j3"; + name = "kde-l10n-eu-16.08.1.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fa-16.08.0.tar.xz"; - sha256 = "129i0fhdxab5k8vjiml0ylyja5hz6dmr3x8qarf0mfspwhi7pkna"; - name = "kde-l10n-fa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fa-16.08.1.tar.xz"; + sha256 = "15ay6hqgpdv80fa3gjksfmjiczr4zwpwh4mj1zdrdm241kdhp1jp"; + name = "kde-l10n-fa-16.08.1.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fi-16.08.0.tar.xz"; - sha256 = "1rjzsagskszi14lv1ak6ailfxxiqqq2ry26dz53agq8qd4md19y3"; - name = "kde-l10n-fi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fi-16.08.1.tar.xz"; + sha256 = "130hpabvd2rjd0x11k9yxjl94aslaz90bhf3mfm5bnjjlm8iqwz5"; + name = "kde-l10n-fi-16.08.1.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fr-16.08.0.tar.xz"; - sha256 = "09brqj4xx8apsldxjpx797ggmwv3flm7cbxh39kc3q8c7dpzr4a5"; - name = "kde-l10n-fr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fr-16.08.1.tar.xz"; + sha256 = "0mkbbba9jldks003cmcdbfiqw7g6nr4majz8skb7srq8ma7sf9x4"; + name = "kde-l10n-fr-16.08.1.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ga-16.08.0.tar.xz"; - sha256 = "1ig3hvy58p7d3j4h6r1nz8yj65mfpamxajmrg3aid56i8rc81ibk"; - name = "kde-l10n-ga-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ga-16.08.1.tar.xz"; + sha256 = "0hmj03ajgijjg3lmrsypff2nxzf61vmvf0qwrxiy3q40vvgj5mbr"; + name = "kde-l10n-ga-16.08.1.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-gl-16.08.0.tar.xz"; - sha256 = "09hrpgxcp2s20d1ia6plkglkhhj8mzfh8d01y0jfc8b1h5br282w"; - name = "kde-l10n-gl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-gl-16.08.1.tar.xz"; + sha256 = "0n0nim3pkhql2lx9kqplcs6v225c2cirhazsb6ldblkhxbk0hgfb"; + name = "kde-l10n-gl-16.08.1.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-he-16.08.0.tar.xz"; - sha256 = "09zf3a0gbs5h5r3mrpc9gkd4l2j9nw1k7vdwahxjpsdhvs1bwx3h"; - name = "kde-l10n-he-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-he-16.08.1.tar.xz"; + sha256 = "0x4rn81ijx2b0z4s2b67d69gnnx0ldl43c311jf0dn9cyadjws07"; + name = "kde-l10n-he-16.08.1.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hi-16.08.0.tar.xz"; - sha256 = "1xvvkl5pr3w0s1pizarg0mmkvckxss944a188avqfsqrav642458"; - name = "kde-l10n-hi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hi-16.08.1.tar.xz"; + sha256 = "1if5h20ywpkh85fx95i0mrv993gfj1rm3yp9jzz8x250b6ggbfd5"; + name = "kde-l10n-hi-16.08.1.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hr-16.08.0.tar.xz"; - sha256 = "0cyz0ysz9xr93dlq2n758nw2kyi2f8b7h3gr4im7syj05nk0fhb6"; - name = "kde-l10n-hr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hr-16.08.1.tar.xz"; + sha256 = "0fg27qkj23b49hvbksqsiv3jj571b4i9msk82ygzvxl2ay5him52"; + name = "kde-l10n-hr-16.08.1.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hu-16.08.0.tar.xz"; - sha256 = "0imcb7zd7rzf2nc8darlj4i843gha3ihbi0lvh6pnnmcxvc2dzdh"; - name = "kde-l10n-hu-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hu-16.08.1.tar.xz"; + sha256 = "1nw0922gk4f89r06fkgqvs092dbi4kjbfxvj86gq98v1ms0pns69"; + name = "kde-l10n-hu-16.08.1.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ia-16.08.0.tar.xz"; - sha256 = "1x14165y0qvpjn3mkg03l4p0mij9a6haxkrbkkqvv1waapifyxsl"; - name = "kde-l10n-ia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ia-16.08.1.tar.xz"; + sha256 = "0plsffy1khy9cacqhabr1j2g0xi3v21qgydj6phb6d5j82p1c79i"; + name = "kde-l10n-ia-16.08.1.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-id-16.08.0.tar.xz"; - sha256 = "1mf3viq3yligqg8vqca31ybs9s59nxmylvwqmg8ndy9ni4mni2wx"; - name = "kde-l10n-id-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-id-16.08.1.tar.xz"; + sha256 = "0ihir3axvkczkik2nnfh4mmqkx2gpmvzri48i34p5dz21n8ca4ha"; + name = "kde-l10n-id-16.08.1.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-is-16.08.0.tar.xz"; - sha256 = "07xdlvk3nqc9wsrnd1a0hm6igwc0hnryffs99jvd0dlbq0hzakl3"; - name = "kde-l10n-is-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-is-16.08.1.tar.xz"; + sha256 = "0qrayzxpx1phk2m6kcq5b6i05swds1fis4651r5xk69dc2zqlbjn"; + name = "kde-l10n-is-16.08.1.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-it-16.08.0.tar.xz"; - sha256 = "05xir0spl5fbyynwjkf13zzqgwl1mzi97bfjfi1x8jhiq0jqhafn"; - name = "kde-l10n-it-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-it-16.08.1.tar.xz"; + sha256 = "1qhv4rywr9qlszlx8a7crqshr5zmxxgscq8s1c735jcm57bk8wzl"; + name = "kde-l10n-it-16.08.1.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ja-16.08.0.tar.xz"; - sha256 = "1gdngf075021750rxfbrcbbh8wb1nknzclgghsj8j94qb96ij87m"; - name = "kde-l10n-ja-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ja-16.08.1.tar.xz"; + sha256 = "1zwb8r1vanrl4q0mhqgd4qj8smyygqgka4b4zjqr6h2klklwsxsg"; + name = "kde-l10n-ja-16.08.1.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-kk-16.08.0.tar.xz"; - sha256 = "0y5qdnkdhc7lnd3casxil757mmklsysm8kvs9i09j4b5ldmkin0r"; - name = "kde-l10n-kk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-kk-16.08.1.tar.xz"; + sha256 = "1zdhfhjxpr73f34nh24y6ddgp3zkqim4dy8mblk84w8wsg80i6gj"; + name = "kde-l10n-kk-16.08.1.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-km-16.08.0.tar.xz"; - sha256 = "0a27rhjf40q5003jy3aancaf9qnygmfqk4g7jic1x1d64n3khz9c"; - name = "kde-l10n-km-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-km-16.08.1.tar.xz"; + sha256 = "1qx2cm9cv7b33pkzpfgcqppr6q4qqzf9v152wjfdk096jq6yfijv"; + name = "kde-l10n-km-16.08.1.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ko-16.08.0.tar.xz"; - sha256 = "0g8plf0z329xyiwi4aia96i3psypqsx9wfhnb26kwwgl6vjd4nin"; - name = "kde-l10n-ko-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ko-16.08.1.tar.xz"; + sha256 = "18za5mpnx8xfkpmpjp2i04kl6a2chjgz8g7vhymi01m1dhf7ql5f"; + name = "kde-l10n-ko-16.08.1.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lt-16.08.0.tar.xz"; - sha256 = "0c5akrzfmjkrf4z8p5yfy9f3q8p6bf3l97aajcj2jzqxmxqrkgxz"; - name = "kde-l10n-lt-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lt-16.08.1.tar.xz"; + sha256 = "147z5af6qn7c6qrxxzmcc9qkagc4y6nffqal3fsrs84pjrsav72j"; + name = "kde-l10n-lt-16.08.1.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lv-16.08.0.tar.xz"; - sha256 = "1l0yfc4999sjl01m07rmzw2h9cd0pw2d9j4wa7fjs2pf89z5z2y6"; - name = "kde-l10n-lv-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lv-16.08.1.tar.xz"; + sha256 = "19pf8khdszfnlfybrsdwm0gbnphr43109b81fa6bsxcc57knagwg"; + name = "kde-l10n-lv-16.08.1.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-mr-16.08.0.tar.xz"; - sha256 = "0jnrycqxszxq7mw7kwyhprb7pmrqz5v9kkhqf2bm4k9mf5553a0w"; - name = "kde-l10n-mr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-mr-16.08.1.tar.xz"; + sha256 = "0vwa1mz9igx592bq89fnq7350ln4g5cvdmm1hnay94c5qxc12s0z"; + name = "kde-l10n-mr-16.08.1.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nb-16.08.0.tar.xz"; - sha256 = "1ga30ki4yaa4ajbrjp0fz75r67cvrc801skx31x6d1cw6xjyi72l"; - name = "kde-l10n-nb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nb-16.08.1.tar.xz"; + sha256 = "1dz3a5bwsmbckdmh2v2crnal7183sqav6y5z01xdq0wyjjy8kizc"; + name = "kde-l10n-nb-16.08.1.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nds-16.08.0.tar.xz"; - sha256 = "1ibv7rq1ap5zmal4bf8a8z285mf6g55bcmli67gvhwfvy13vkg9s"; - name = "kde-l10n-nds-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nds-16.08.1.tar.xz"; + sha256 = "1gjvwg6gmxbvk7q26f7i50ivfmh4s2djl7m9dsaj6rk53cknhd8s"; + name = "kde-l10n-nds-16.08.1.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nl-16.08.0.tar.xz"; - sha256 = "0pysm6sjdls14d8cqmywnljwk2k94q9z7rdm7m3p75p4q778drda"; - name = "kde-l10n-nl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nl-16.08.1.tar.xz"; + sha256 = "1r3mwnkkr8k3zb87j6lr4lrgq02rccqpp5m273z1c5n0kqcbp50h"; + name = "kde-l10n-nl-16.08.1.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nn-16.08.0.tar.xz"; - sha256 = "1v3q9jr6ginh24ph99qyb57phm86zwph3xv6zbymg61vghv398q2"; - name = "kde-l10n-nn-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nn-16.08.1.tar.xz"; + sha256 = "0r38zvmh05mcfh7grayb771mrdl2637xnx75nx7lnvkvmlf6dngh"; + name = "kde-l10n-nn-16.08.1.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pa-16.08.0.tar.xz"; - sha256 = "10c1c6hql80x714msa45cpbgl4nagaf9mydfb160lsvaa1whzzbd"; - name = "kde-l10n-pa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pa-16.08.1.tar.xz"; + sha256 = "04828d9wsd51g3a45nzddxhxdwwk447qlkswxjzayiy7w6pjspch"; + name = "kde-l10n-pa-16.08.1.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pl-16.08.0.tar.xz"; - sha256 = "1xz33a9af2ccl249ymaqawz1ymrxa5zwhg2gayxk5jmv2fsvhikp"; - name = "kde-l10n-pl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pl-16.08.1.tar.xz"; + sha256 = "068ab65ivm4qw3hmhv97v8ck2qg7z8aglfwq0lqrlb5famg158di"; + name = "kde-l10n-pl-16.08.1.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt-16.08.0.tar.xz"; - sha256 = "1wp0i6mlk4nhd7v502kc4gh7zymgiakqlx3jjpjaqsv31igya406"; - name = "kde-l10n-pt-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt-16.08.1.tar.xz"; + sha256 = "1ix32ry9zzgdwmpqfvzsfdz357l56nwqd42rnszgjzs4sdikl3y8"; + name = "kde-l10n-pt-16.08.1.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.0"; + version = "pt_BR-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt_BR-16.08.0.tar.xz"; - sha256 = "0nv8k2fn8jdv80vcwiri5w937qcp2gj8bjmi3hcc9qirdqh8wjap"; - name = "kde-l10n-pt_BR-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt_BR-16.08.1.tar.xz"; + sha256 = "0id10qm9gzg2c9as2np8a0sfnx9acsnf06igvwxnyazar8k831hs"; + name = "kde-l10n-pt_BR-16.08.1.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ro-16.08.0.tar.xz"; - sha256 = "0bqw4zb5hz1wccgicyfd8d8zzhq69jf16f3qr6c6ry345hkx1ywm"; - name = "kde-l10n-ro-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ro-16.08.1.tar.xz"; + sha256 = "1j6vdc62xw4pbn0lz0zmwylc43m9kxn78zx0qn5gc51i2n3sb8bm"; + name = "kde-l10n-ro-16.08.1.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ru-16.08.0.tar.xz"; - sha256 = "1pi549z9wzjsaixn246wq9bqkgy2azhwccwhyy5d0d442d23xwqv"; - name = "kde-l10n-ru-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ru-16.08.1.tar.xz"; + sha256 = "1bqrjgh89yskqx5hpd08z949nplp7f53is1vm9slrvn94hcslc46"; + name = "kde-l10n-ru-16.08.1.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sk-16.08.0.tar.xz"; - sha256 = "09lyhmiishxiihnpv9lli329zl4v05q3578ib5nrzrkrlky512m9"; - name = "kde-l10n-sk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sk-16.08.1.tar.xz"; + sha256 = "18w6zbix3iwrgyswlr8390yb3q4fli1krana7pimfhll29wg9s2v"; + name = "kde-l10n-sk-16.08.1.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sl-16.08.0.tar.xz"; - sha256 = "1maz22c0mp8bgj1rcg0ms2cncx0gg82diwpb930shjmivr8zhmrd"; - name = "kde-l10n-sl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sl-16.08.1.tar.xz"; + sha256 = "1q9gjl8cz02nwy90w31apr8rv5bhp8xanmc6ckijfl7xz5a5r7ig"; + name = "kde-l10n-sl-16.08.1.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sr-16.08.0.tar.xz"; - sha256 = "190ww2065537lny8jnm81lqcxpfllhf45snj93zl41pcva4zw4jg"; - name = "kde-l10n-sr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sr-16.08.1.tar.xz"; + sha256 = "019m72c4l486rwq6cm309jsaasz96grv2bb8wrgxy2r69y2qnzqj"; + name = "kde-l10n-sr-16.08.1.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sv-16.08.0.tar.xz"; - sha256 = "0bl1qz3zqrq8vjbnacvdym9yzycpjhgy62r2577h2ybds31fj81n"; - name = "kde-l10n-sv-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sv-16.08.1.tar.xz"; + sha256 = "0ml489l1jv07x1d157gacsgnyx95j4fapd0r6q4d2r5mdm77w36b"; + name = "kde-l10n-sv-16.08.1.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-tr-16.08.0.tar.xz"; - sha256 = "1gbm055f4cbcl1h9k2r6fnjnnjj5wss8zyyc16id57ydzvnkdbi1"; - name = "kde-l10n-tr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-tr-16.08.1.tar.xz"; + sha256 = "008fjcf7p2pk1g4mzsc98vqlaaagf1bkmha323rgqrz07jzjax63"; + name = "kde-l10n-tr-16.08.1.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ug-16.08.0.tar.xz"; - sha256 = "1hqdh0v83yvn4hnl51hsabkcbn5rhw0xcwn4nzqm6q2ib68rzhal"; - name = "kde-l10n-ug-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ug-16.08.1.tar.xz"; + sha256 = "1d38j4cyzzxv35i39rmhrlyc097n56gghvwcl16nj55qbm41nb22"; + name = "kde-l10n-ug-16.08.1.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-uk-16.08.0.tar.xz"; - sha256 = "00ijcfs6688d822iwg85msk8hxl7qhq5lx3bkw1xwdnmqf0nlxqj"; - name = "kde-l10n-uk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-uk-16.08.1.tar.xz"; + sha256 = "1684139ic7vsr68jfk91kmlvw5bjxm2p2p2zkim0md8gmjw279bd"; + name = "kde-l10n-uk-16.08.1.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-wa-16.08.0.tar.xz"; - sha256 = "0g9jjpn6fzkdvy16mw1yhahrv5y2ybjwi091c01sh9c9rwfj5qpg"; - name = "kde-l10n-wa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-wa-16.08.1.tar.xz"; + sha256 = "07nalfxn0gw8ygi5cjq5xzyszk4pa4bb2lyll5nfh0h971kiwrk0"; + name = "kde-l10n-wa-16.08.1.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.0"; + version = "zh_CN-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_CN-16.08.0.tar.xz"; - sha256 = "0997azdrq2i4rfijchr3jz9b6why4hm79cddn1c7wdk3943xz094"; - name = "kde-l10n-zh_CN-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_CN-16.08.1.tar.xz"; + sha256 = "120f7a4qwxjh0l6n0pcckwi0y5lzy99l7p40i032yd4awjm0jdx6"; + name = "kde-l10n-zh_CN-16.08.1.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.0"; + version = "zh_TW-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_TW-16.08.0.tar.xz"; - sha256 = "04d1awymijlkp2q15vjzs7j6aznpsb4kivc6jx24ly7cp3vn66zm"; - name = "kde-l10n-zh_TW-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_TW-16.08.1.tar.xz"; + sha256 = "00z9rld3a76lw3gb621zqclfkdww46fvd86sdws3r6d71zv659h0"; + name = "kde-l10n-zh_TW-16.08.1.tar.xz"; }; }; kdelibs = { - version = "4.14.23"; + version = "4.14.24"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdelibs-4.14.23.tar.xz"; - sha256 = "1k8zn5fmdjrb1v45czz80bvnyp1cbajgsbp2qb988m3k5p7nxzis"; - name = "kdelibs-4.14.23.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz"; + sha256 = "1vs60cwwva59fifhg392c60wwp49bvwmm7m6xlai24wzfgl67rj5"; + name = "kdelibs-4.14.24.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdenetwork-filesharing-16.08.0.tar.xz"; - sha256 = "075vimzf0arlkcsnvaq75zipz4w02nx9gcy6vcbwb914ljf05cc1"; - name = "kdenetwork-filesharing-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdenetwork-filesharing-16.08.1.tar.xz"; + sha256 = "0gkyi2s4hiq3i17cizh0c6dzvc7b19d8bcan22jxb6jx6drm8yq3"; + name = "kdenetwork-filesharing-16.08.1.tar.xz"; }; }; kdenlive = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdenlive-16.08.0.tar.xz"; - sha256 = "1qmhqbawxzl3plh6aa9kqcviwm6c4sqa9qi4npn64mjvwap1b9qd"; - name = "kdenlive-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdenlive-16.08.1.tar.xz"; + sha256 = "0aza2y5xybgj8qnfsc4vbpvmvdvscdmv1bqc67nks72z7c48cpfl"; + name = "kdenlive-16.08.1.tar.xz"; }; }; kdepim = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-16.08.0.tar.xz"; - sha256 = "0jcndq5j0j5vyp9k25gbnd18yyfigg0vdrqrsl2m6ybsgwyf3l02"; - name = "kdepim-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-16.08.1.tar.xz"; + sha256 = "0ibbc9whg6wy0ipfza5jjwf5y6lz5cbd30nxj93p3adfd4bl55by"; + name = "kdepim-16.08.1.tar.xz"; }; }; kdepim-addons = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-addons-16.08.0.tar.xz"; - sha256 = "0r5v8q6pila5diqgfny3ky8c94p8rrf1qg5zwa433xpdmz8ip2jg"; - name = "kdepim-addons-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-addons-16.08.1.tar.xz"; + sha256 = "0mbr9m9h79wvklzh6lh5mmq47b69xi2dy589hham3xy69s067g0n"; + name = "kdepim-addons-16.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-apps-libs-16.08.0.tar.xz"; - sha256 = "1l8y0a52snxzbp245w9m55b3qx9v7wcdh2b046hx0isw8i65jial"; - name = "kdepim-apps-libs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-apps-libs-16.08.1.tar.xz"; + sha256 = "0nwsdham4gf97d0d1wn1v440grbny8rj0gj29z10ia2v3zkx6cgd"; + name = "kdepim-apps-libs-16.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-runtime-16.08.0.tar.xz"; - sha256 = "19hc43xiw1g268nkrbg370qmnnmmmnxzgscx88fxb2pnlvqkz0fb"; - name = "kdepim-runtime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-runtime-16.08.1.tar.xz"; + sha256 = "097jxiwv9vg3scc95j563v3y28iv4a6rkq0w2w1d5f499d6bc7wf"; + name = "kdepim-runtime-16.08.1.tar.xz"; }; }; kde-runtime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-runtime-16.08.0.tar.xz"; - sha256 = "0k8snjk12abp9bpyc3q6rs46s972czb7jdsphjld8k448hz102kk"; - name = "kde-runtime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-runtime-16.08.1.tar.xz"; + sha256 = "0szmm32m3gifdpvib4ik5cwcm0ixz5npfzs0gkasq6k9mnf68z65"; + name = "kde-runtime-16.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdesdk-kioslaves-16.08.0.tar.xz"; - sha256 = "04ci03wyhh7wxvjl0a4rdav2rc1xgz16ylcbswr0aphbacprqckj"; - name = "kdesdk-kioslaves-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdesdk-kioslaves-16.08.1.tar.xz"; + sha256 = "09g4ax7ah52ihdmp9xrymarq945kymkh65qqqd1rgf0zjaj2af7p"; + name = "kdesdk-kioslaves-16.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdesdk-thumbnailers-16.08.0.tar.xz"; - sha256 = "1a6iiwamzycc25nn8phip17yajyzpn57smsg9rghl8wq057mcllg"; - name = "kdesdk-thumbnailers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdesdk-thumbnailers-16.08.1.tar.xz"; + sha256 = "0ygkndgfihb8jissn5jq35vd2j73z5i2rdj2jbgik7hrm2rzjzfs"; + name = "kdesdk-thumbnailers-16.08.1.tar.xz"; }; }; kdewebdev = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdewebdev-16.08.0.tar.xz"; - sha256 = "0x7fp4d2s1zi3kawzjzqlhla0bv0ai66k5bldpg58bpbs56h9f1n"; - name = "kdewebdev-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdewebdev-16.08.1.tar.xz"; + sha256 = "1xi72wfj57z06s2d7ijjc2vpi14nqdavcp2gmczp08lf4n7lkfjr"; + name = "kdewebdev-16.08.1.tar.xz"; }; }; kdf = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdf-16.08.0.tar.xz"; - sha256 = "1cj4wkndbl0ywfy6sj6bsar0v5bc0cxh9d8qd7x0m15qnsx43j44"; - name = "kdf-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdf-16.08.1.tar.xz"; + sha256 = "02azfa3j9m95m6ch1h4b5r2cwbyq987rxzyxsldsbna3x80kqpsv"; + name = "kdf-16.08.1.tar.xz"; }; }; kdgantt2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdgantt2-16.08.0.tar.xz"; - sha256 = "1kbzx5gxyph5cr1m6g6kw3f988p3aq121k6a3hb2ddjgg8yqaxmi"; - name = "kdgantt2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdgantt2-16.08.1.tar.xz"; + sha256 = "1qz44461wk2h2bi5xpyrh5s201azqigph3vclp92phy55s12q83s"; + name = "kdgantt2-16.08.1.tar.xz"; }; }; kdiamond = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdiamond-16.08.0.tar.xz"; - sha256 = "0fpjgkfdzw8kgag3b9rrxyahl6kcmfvlrzw2jci8sz40vd69qw53"; - name = "kdiamond-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdiamond-16.08.1.tar.xz"; + sha256 = "0w2kxndpjq2s35qz05vsbr1qnd30lnxhmkyxmy5r7qcqkfdjfwbb"; + name = "kdiamond-16.08.1.tar.xz"; }; }; kfloppy = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kfloppy-16.08.0.tar.xz"; - sha256 = "06nmaimw6lch5cdkmvb4x7dpb3d7zcsr7wzvhhh9bbygc3rmhi17"; - name = "kfloppy-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kfloppy-16.08.1.tar.xz"; + sha256 = "133ib3kicmaxryc4623fmayk12gp4nnymi3g3d97kyk0nmrx1vg7"; + name = "kfloppy-16.08.1.tar.xz"; }; }; kfourinline = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kfourinline-16.08.0.tar.xz"; - sha256 = "0zjq3x6ghfa5ckjba4bfwiacwy3yvby3a951bfw5rh813mgn7zsj"; - name = "kfourinline-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kfourinline-16.08.1.tar.xz"; + sha256 = "0114ldvw1826v75az3wdppd4qdnhswiixm03801rsp680fg9fm9s"; + name = "kfourinline-16.08.1.tar.xz"; }; }; kgeography = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgeography-16.08.0.tar.xz"; - sha256 = "1cgghdxgqxxjhfmsqwnyrw7lzzshnbmi9frnc9gk4hc3w767nyqs"; - name = "kgeography-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgeography-16.08.1.tar.xz"; + sha256 = "0psxpq1ap8cm3adf5j6hr0z858wx41aag95n8mx7vgyfjgaj81s4"; + name = "kgeography-16.08.1.tar.xz"; }; }; kget = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kget-16.08.0.tar.xz"; - sha256 = "1ygm6l8xxdyi7dzii4hfp0mpwjhyizmrzmhkcmv708z7api19ms8"; - name = "kget-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kget-16.08.1.tar.xz"; + sha256 = "0brihzmn7fz43mi1mf8flkbbk80pv2sg3ny1il4cdkk6nwryk3dn"; + name = "kget-16.08.1.tar.xz"; }; }; kgoldrunner = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgoldrunner-16.08.0.tar.xz"; - sha256 = "1xmm2wq8f3pc67ip4hz9x3qqpav1rxm2nqdcbn2z7bivcdmv99jr"; - name = "kgoldrunner-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgoldrunner-16.08.1.tar.xz"; + sha256 = "10bllkkiisb4ci97wzfln5b8bxs5l72k29mbd4qqxhq69r8xqi5c"; + name = "kgoldrunner-16.08.1.tar.xz"; }; }; kgpg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgpg-16.08.0.tar.xz"; - sha256 = "1d0zfhq5ks5an9716n0b9a8xbwsnm8p7vl701gn8jpzb4w9cvrns"; - name = "kgpg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgpg-16.08.1.tar.xz"; + sha256 = "0zpq8smwh648jsxkf82pc2xvz980f07ilp2rzd8yr3w2n18gz120"; + name = "kgpg-16.08.1.tar.xz"; }; }; khangman = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/khangman-16.08.0.tar.xz"; - sha256 = "070556i32fcrbirgwpf04ijqwv8izxmhrbf0rwwldrn3lky2mpfa"; - name = "khangman-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/khangman-16.08.1.tar.xz"; + sha256 = "1jz8wardcsip8c3r7s7lz1zn5gifb9jdksi0hdzn1kv1ha70dfyr"; + name = "khangman-16.08.1.tar.xz"; }; }; khelpcenter = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/khelpcenter-16.08.0.tar.xz"; - sha256 = "1js8jxain4w1iz3xs9098js17rf1mnhcfl46qqsc5ks2909450h1"; - name = "khelpcenter-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/khelpcenter-16.08.1.tar.xz"; + sha256 = "0nv7i3dm6d7wr9y34l009fybdlmp4j5891wl9wwzp6ccnw2qls4g"; + name = "khelpcenter-16.08.1.tar.xz"; }; }; kholidays = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kholidays-16.08.0.tar.xz"; - sha256 = "0q87d55wf1qpqn0mjymhx316rqdcwg4w7hn8l0c221g9zyzd53qk"; - name = "kholidays-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kholidays-16.08.1.tar.xz"; + sha256 = "0dcnlbkmpzj58l9qvggsxk54cf1gspax388dniz5ihs07mkksg24"; + name = "kholidays-16.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kidentitymanagement-16.08.0.tar.xz"; - sha256 = "05k7m4vg5s5ks4wsk4xx5ncnbl4gy0w59xdhwyy01vg8hawnldlj"; - name = "kidentitymanagement-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kidentitymanagement-16.08.1.tar.xz"; + sha256 = "1cdm4p62idsmzb3q6ywlqll7ivkrbbraia6bdc3ad9p2m6mjkwkk"; + name = "kidentitymanagement-16.08.1.tar.xz"; }; }; kig = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kig-16.08.0.tar.xz"; - sha256 = "0nm3d1wxhfkxhbab5y3h8scriyy9l35r34rd77pmk00khsl0d965"; - name = "kig-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kig-16.08.1.tar.xz"; + sha256 = "0slpafdkhyfpixm6iypd62y85j85f62fi2yd3hrmq8859qsp7n74"; + name = "kig-16.08.1.tar.xz"; }; }; kigo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kigo-16.08.0.tar.xz"; - sha256 = "0k9hjbaysiqjn9bgj7pvix0ag1ksyqdcwfdz5rxvvv6l6j3c96hs"; - name = "kigo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kigo-16.08.1.tar.xz"; + sha256 = "10mrb94vlhg598r4bpydxj2llzh9239c0ziz3yllnw2jh7xw94rs"; + name = "kigo-16.08.1.tar.xz"; }; }; killbots = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/killbots-16.08.0.tar.xz"; - sha256 = "05irljnrkmw2mp7v4hmindhnw7ww26abnibb8fqmj72ryck39asg"; - name = "killbots-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/killbots-16.08.1.tar.xz"; + sha256 = "1fr7vj9y5bh9dcznvslzsp3f20qrmqfaq8jl4rbas08882lx7am4"; + name = "killbots-16.08.1.tar.xz"; }; }; kimap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kimap-16.08.0.tar.xz"; - sha256 = "1k08m16kpf94w827n4j69sr2v7a855ap8ghg56vhfn24kbxrw9m8"; - name = "kimap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kimap-16.08.1.tar.xz"; + sha256 = "01nlqmprbzirw0kwqw1m1klwq401nz3sfc51gi1r01ghhskwfjj0"; + name = "kimap-16.08.1.tar.xz"; }; }; kio-extras = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kio-extras-16.08.0.tar.xz"; - sha256 = "03axqhn9f7bdjzflmncxxbvbn0lwyia65qshis4ysqkd0sh0rinn"; - name = "kio-extras-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kio-extras-16.08.1.tar.xz"; + sha256 = "08cis03pzl7ncmpxc6wss7zm4jwgyxqw873ab70mvibcax9wfky0"; + name = "kio-extras-16.08.1.tar.xz"; }; }; kiriki = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kiriki-16.08.0.tar.xz"; - sha256 = "0jz6nm6371z60yrszs0c61sq2b5ny304v5j5bvcd0nx4prdri302"; - name = "kiriki-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kiriki-16.08.1.tar.xz"; + sha256 = "15p205hcvvf9w1bwcciwaq8igf6nspzjili48x13pzcmmgjf46m8"; + name = "kiriki-16.08.1.tar.xz"; }; }; kiten = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kiten-16.08.0.tar.xz"; - sha256 = "1jxxm14ghmmcy6vyzl1r4vz0a63nvykcaqh2pydab0a3b8l2s93b"; - name = "kiten-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kiten-16.08.1.tar.xz"; + sha256 = "1n94jzy50imvhgan3d5av9iifd0g2bn65gi5bxf9yzq48a6npnkv"; + name = "kiten-16.08.1.tar.xz"; }; }; kjumpingcube = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kjumpingcube-16.08.0.tar.xz"; - sha256 = "1kwgqzlwnb8699pdja4w3d7iv25a7ma121p36pvmh457s8zlgwhl"; - name = "kjumpingcube-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kjumpingcube-16.08.1.tar.xz"; + sha256 = "1i8agl9l996yf1x88s1xg2a3gahjjy2swscw5lb35li565rm7vyr"; + name = "kjumpingcube-16.08.1.tar.xz"; }; }; kldap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kldap-16.08.0.tar.xz"; - sha256 = "03wsvgw5rv4l01iprz2pp0sqvmkyqgk6pgbqk5dfiy8zxiij3j95"; - name = "kldap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kldap-16.08.1.tar.xz"; + sha256 = "0m28i0rprj36b3ds51ljmhlpkld4ghl0259z9cc5fh4k7pnfi6jr"; + name = "kldap-16.08.1.tar.xz"; }; }; kleopatra = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kleopatra-16.08.0.tar.xz"; - sha256 = "143w1jclw4r7790mygc6a6rrh0x6r98ai699mn351ai9r9z4cfx5"; - name = "kleopatra-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kleopatra-16.08.1.tar.xz"; + sha256 = "0f7ydyfp9iyg3jzrn02x8bm1x41yysixzwlcpl8l3qimibs65840"; + name = "kleopatra-16.08.1.tar.xz"; }; }; klettres = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klettres-16.08.0.tar.xz"; - sha256 = "1wfnlci02w5llrckbjfjbi6xk2h43bq98m4zgpib5nk8ib4jaffn"; - name = "klettres-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klettres-16.08.1.tar.xz"; + sha256 = "11xhprq24hq3f7vvifp1ilmcihadxwyk0jmpb643w898kh6qv9hd"; + name = "klettres-16.08.1.tar.xz"; }; }; klickety = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klickety-16.08.0.tar.xz"; - sha256 = "1jz02spcr46id1qbxmc9wwgws48p3cbqdy032a563c8hacqgac32"; - name = "klickety-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klickety-16.08.1.tar.xz"; + sha256 = "1hrplywk2b5qkw9ijpkyxgln2zwqj1ja2prp3acqs1683rsdndam"; + name = "klickety-16.08.1.tar.xz"; }; }; klines = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klines-16.08.0.tar.xz"; - sha256 = "1xwg8pa4k3a68s0bsxbphpm40kkzgchkxw4ha6xpmhva94nx82d1"; - name = "klines-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klines-16.08.1.tar.xz"; + sha256 = "07754lvllpjb016da1r7y4n72mp07h8bn16mq38qsxa1d0rdjjd6"; + name = "klines-16.08.1.tar.xz"; }; }; kmag = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmag-16.08.0.tar.xz"; - sha256 = "076lni6qv3b5chj0sgcxvj5an4jvhchagk930kihbpfiqg769c61"; - name = "kmag-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmag-16.08.1.tar.xz"; + sha256 = "0d75z94p28zwh7pz7ss75fscwfcphvnxdd4bj0yr1hz4rzk5bmd2"; + name = "kmag-16.08.1.tar.xz"; }; }; kmahjongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmahjongg-16.08.0.tar.xz"; - sha256 = "0j8c5iz11z5n08fywspvkcizw053kb2s1pxvgp5fr9h93mxn6cmk"; - name = "kmahjongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmahjongg-16.08.1.tar.xz"; + sha256 = "0xap6jw1gx86k8yhs7mmyp69jg4401551kmrhwbfz8cdpbzdrgz3"; + name = "kmahjongg-16.08.1.tar.xz"; }; }; kmailtransport = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmailtransport-16.08.0.tar.xz"; - sha256 = "1nm5kwr7mq813invmaq72j69lcxyg2i5bmf7d5j4flvxhl3psaz1"; - name = "kmailtransport-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmailtransport-16.08.1.tar.xz"; + sha256 = "052pnk3pqv9g58l5zlpz1mj17x72zrzjds77gd9vavmgmngzz2nd"; + name = "kmailtransport-16.08.1.tar.xz"; }; }; kmbox = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmbox-16.08.0.tar.xz"; - sha256 = "0mwi1sxdxkzfmjvf8rjxnhgs07g6p528km5cfqcsxvz3fcwqmwpd"; - name = "kmbox-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmbox-16.08.1.tar.xz"; + sha256 = "10v9x4i1waqrdq28lk4fvxg8bjpldjajdfsv2qv1wyl28kkr8xkb"; + name = "kmbox-16.08.1.tar.xz"; }; }; kmime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmime-16.08.0.tar.xz"; - sha256 = "1bd063fzzixcgcg17hpq6jxd2hp4y97gfhih2vc63bwf4vfs6vhj"; - name = "kmime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmime-16.08.1.tar.xz"; + sha256 = "188lwyp345vigjgqbljlvw84jsjisfs6drvknx4qvk74a6idj078"; + name = "kmime-16.08.1.tar.xz"; }; }; kmines = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmines-16.08.0.tar.xz"; - sha256 = "0pnqqmb18xzfcknidjrydc714ni4w04xwhshmwlx7i0wpakwkkcw"; - name = "kmines-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmines-16.08.1.tar.xz"; + sha256 = "1m7p0bwpq4ry1dw78nic73jcyf78zyrxc4cw9phdavrwvfvajzng"; + name = "kmines-16.08.1.tar.xz"; }; }; kmix = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmix-16.08.0.tar.xz"; - sha256 = "0sk18bykx1hb3sl476vdbrhnhs1n3ygp79kgil2wx2g6m20q5d3c"; - name = "kmix-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmix-16.08.1.tar.xz"; + sha256 = "0ikiillqsi1s2rl65j8f9883xg5y78a53nfha7wrzav5insyvrd0"; + name = "kmix-16.08.1.tar.xz"; }; }; kmousetool = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmousetool-16.08.0.tar.xz"; - sha256 = "1y9lfri6iw7wkaxrixm613h4wdpszaiggvbailljyl8vx82r4q5z"; - name = "kmousetool-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmousetool-16.08.1.tar.xz"; + sha256 = "0dfmjs9d1pr4sxa5v6fk2bbx4anawm0841spg8vijxikwi67vayk"; + name = "kmousetool-16.08.1.tar.xz"; }; }; kmouth = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmouth-16.08.0.tar.xz"; - sha256 = "1rx46fxfzj32a27yb597xsh1jjxn5h7kb39ywk8f2kkqvcn1dgyl"; - name = "kmouth-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmouth-16.08.1.tar.xz"; + sha256 = "01hin9yzv8zvj1pihr409clci905i3fhrwqz9izk1nhq3djxg7ld"; + name = "kmouth-16.08.1.tar.xz"; }; }; kmplot = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmplot-16.08.0.tar.xz"; - sha256 = "1syz6dk5ha2znwg5kj34hg2hrbl83wxzxiqznlwpmh2qr4kssrml"; - name = "kmplot-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmplot-16.08.1.tar.xz"; + sha256 = "069qsi1bk385sil9m75y0zs7nzv8qscrfpdm8iip53fwf10bx5qa"; + name = "kmplot-16.08.1.tar.xz"; }; }; knavalbattle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/knavalbattle-16.08.0.tar.xz"; - sha256 = "030j6mq6lx3bi96g3nkj5mif996r6dg3df2331c0r0s42icw1mv1"; - name = "knavalbattle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/knavalbattle-16.08.1.tar.xz"; + sha256 = "0xxx053p42j8r6zlz6vv6avx6iqqm5aq6q3ggjib70w4ixl1wqmp"; + name = "knavalbattle-16.08.1.tar.xz"; }; }; knetwalk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/knetwalk-16.08.0.tar.xz"; - sha256 = "0lnsvpijx5ln5mscg2s46j0xzivhni6wj47yr7lvpkjrgy715c7d"; - name = "knetwalk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/knetwalk-16.08.1.tar.xz"; + sha256 = "15nrfcd6l08lkshh6gyqfawr2b9izsirwdg9mqnnymdji8lg91nl"; + name = "knetwalk-16.08.1.tar.xz"; }; }; kolf = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kolf-16.08.0.tar.xz"; - sha256 = "06v1hyvj7dym9sn8gd7698f1806pr3h6nplxj5p4mm1ckhn6h59z"; - name = "kolf-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kolf-16.08.1.tar.xz"; + sha256 = "040fsd1kdww4yv258w1na3b5x3sxb14dj035rmw1y48lw883g439"; + name = "kolf-16.08.1.tar.xz"; }; }; kollision = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kollision-16.08.0.tar.xz"; - sha256 = "0v3lixqy932v8dnzw892jafsjzxzldmzrcmaah0qnxq9qf9q3x1x"; - name = "kollision-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kollision-16.08.1.tar.xz"; + sha256 = "0w9wsgdqcpgklv31iqhbd79n6qiqk49jkhrc2c6zhmxqp588wy14"; + name = "kollision-16.08.1.tar.xz"; }; }; kolourpaint = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kolourpaint-16.08.0.tar.xz"; - sha256 = "1bfshyfgcgvpjyxzx7yb7ws0kfyb6765nsd7pad2jc7cs5x8x5m7"; - name = "kolourpaint-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kolourpaint-16.08.1.tar.xz"; + sha256 = "1siari77ivnrbllncviy504sz8q1f1mhdpjp45z69hsjn6bw8rcz"; + name = "kolourpaint-16.08.1.tar.xz"; }; }; kompare = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kompare-16.08.0.tar.xz"; - sha256 = "0xx5l2gi031p7z488d5dn805k3likhp444520b2453vlfasmwh9z"; - name = "kompare-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kompare-16.08.1.tar.xz"; + sha256 = "0xmr3g2azrzhrjz1n9sp8wif7rxh574a1mg3prhl636pqcijq1bw"; + name = "kompare-16.08.1.tar.xz"; }; }; konquest = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/konquest-16.08.0.tar.xz"; - sha256 = "18pp4h67wkzimayq3xpz3cqw06dky7k4vhfh4l2lbgm9nvlg3bwl"; - name = "konquest-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/konquest-16.08.1.tar.xz"; + sha256 = "1hsh9n17gqwnash5f8z8zpnwxl0n09zn9hv1qn39zad23vg6fjjd"; + name = "konquest-16.08.1.tar.xz"; }; }; konsole = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/konsole-16.08.0.tar.xz"; - sha256 = "1kn80clbzq5sc6fby1gapw28lpxkbvjbk6c04avbfkg1d25n5mfg"; - name = "konsole-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/konsole-16.08.1.tar.xz"; + sha256 = "0dgphhg2icqagaw16i8z3x3mw8rmmpl3wmafbaca1gn9xw67md1g"; + name = "konsole-16.08.1.tar.xz"; }; }; kontactinterface = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kontactinterface-16.08.0.tar.xz"; - sha256 = "1snafjnmpz6xpldgksxi92dkx0kq1w2xcbkv4a8jqm7mllrxvjvy"; - name = "kontactinterface-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kontactinterface-16.08.1.tar.xz"; + sha256 = "0a8swis8i3dbv9nbbw8ksbghj5pvfsba6kkh2l4lgmkbdi0m9a3s"; + name = "kontactinterface-16.08.1.tar.xz"; }; }; kopete = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kopete-16.08.0.tar.xz"; - sha256 = "1yd69aspsnmrg2f1l33clhpj8l5qqyns1djn63j9v76r4lxkrbnp"; - name = "kopete-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kopete-16.08.1.tar.xz"; + sha256 = "0l2wkf8b2jp6gnr2930xxxz9jqmh6mlms5h8934k89z9x00ha1p5"; + name = "kopete-16.08.1.tar.xz"; }; }; kpat = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kpat-16.08.0.tar.xz"; - sha256 = "038fzs09bijmryka925hx7j4ln7z3f0qdzv7wwm9mkkp5wi4fpi6"; - name = "kpat-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kpat-16.08.1.tar.xz"; + sha256 = "1gpvha8636lwlb1qcdkirs5whil2fh6fp5xd3yh31dppxwryadaf"; + name = "kpat-16.08.1.tar.xz"; }; }; kpimtextedit = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kpimtextedit-16.08.0.tar.xz"; - sha256 = "0bz729yr01p9sjf6bh76pfn3miisas3smxwzy31hh18r9n4f7xsa"; - name = "kpimtextedit-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kpimtextedit-16.08.1.tar.xz"; + sha256 = "1a73s0w49jrblxmzfsp25pknvpggx1p765w2hflij4yr0cb0ganz"; + name = "kpimtextedit-16.08.1.tar.xz"; }; }; kppp = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kppp-16.08.0.tar.xz"; - sha256 = "1gx9ldjfasxfjr8i9pxlbwjdcypg2ffjiwddbp5pw1x6sfmyci7i"; - name = "kppp-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kppp-16.08.1.tar.xz"; + sha256 = "00fv4r6fiq7kkfi3awvk8b7ccj21hm5f7jdgkhacs6np5kv4spnd"; + name = "kppp-16.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kqtquickcharts-16.08.0.tar.xz"; - sha256 = "1bzhql082hgsmcngaclkjlfs7k1hyz17y3prcgw9qgm4nv4i18hq"; - name = "kqtquickcharts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kqtquickcharts-16.08.1.tar.xz"; + sha256 = "0xy84v0z0mx30ynsym7qian2khck8mfgkm62sfd5v3xkgffhhdyh"; + name = "kqtquickcharts-16.08.1.tar.xz"; }; }; krdc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/krdc-16.08.0.tar.xz"; - sha256 = "1qq1r49knndy9hz4l04ix6ax2y66q4jq0qmh0b49ldamvm0b27w0"; - name = "krdc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/krdc-16.08.1.tar.xz"; + sha256 = "1mq867gv8l6i1xlykm0fnfsgz52h60hb3s06aq1rp97yddclr4q1"; + name = "krdc-16.08.1.tar.xz"; }; }; kremotecontrol = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kremotecontrol-16.08.0.tar.xz"; - sha256 = "1z6nhyq6x3kfsfsri3jmvdmkfdrxykc065w7kplfzrqqgnsw12gh"; - name = "kremotecontrol-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kremotecontrol-16.08.1.tar.xz"; + sha256 = "09iyp1sfva7rzxrp7ma90l3ls8yda5hyypvvn3kliv6rap0vrwv5"; + name = "kremotecontrol-16.08.1.tar.xz"; }; }; kreversi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kreversi-16.08.0.tar.xz"; - sha256 = "03z3f09z70f3c2lbvdmr3injjdd8nmwbs2drxcxmkx17p4vg9w1h"; - name = "kreversi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kreversi-16.08.1.tar.xz"; + sha256 = "15g87r85wh4b9vx21bsxp2vavfgzy8kdgwyvv39gg87rl62j7qxf"; + name = "kreversi-16.08.1.tar.xz"; }; }; krfb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/krfb-16.08.0.tar.xz"; - sha256 = "1rvqk8sm75idnkb99v2mpfl1r32qyjcqcmbhw78lgb8nwpfr8cbs"; - name = "krfb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/krfb-16.08.1.tar.xz"; + sha256 = "0952cxnfbwab6d1ji6wwx3snv4a9k031h8pph3n47xxr12nkjj19"; + name = "krfb-16.08.1.tar.xz"; }; }; kross-interpreters = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kross-interpreters-16.08.0.tar.xz"; - sha256 = "1njd0j893zw6bdavqiqbzp02g0y1zhb8gmbq0rb46if1q5igj10d"; - name = "kross-interpreters-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kross-interpreters-16.08.1.tar.xz"; + sha256 = "1026amgj0r1r180535mpnm5f780pm7v25ilk7ynf834lad3is95k"; + name = "kross-interpreters-16.08.1.tar.xz"; }; }; kruler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kruler-16.08.0.tar.xz"; - sha256 = "1rcy5djmwlr4jvi7ig0075z40wfjby3hs7k40nzi3hl3khq2clfg"; - name = "kruler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kruler-16.08.1.tar.xz"; + sha256 = "0j3hi77wlf5nwdmqiq5g34zb8pdzxn313hmc0k99p1gvkb1xn4zp"; + name = "kruler-16.08.1.tar.xz"; }; }; ksaneplugin = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksaneplugin-16.08.0.tar.xz"; - sha256 = "0439bsn8d0w72f73ixxh205aqvbdbks9n0xxb0dq16d9msykvflm"; - name = "ksaneplugin-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksaneplugin-16.08.1.tar.xz"; + sha256 = "0bx7vaw5vkr7fvmn6ywil8997d1qy6qv7sycxz3ydc5ljg1ansmr"; + name = "ksaneplugin-16.08.1.tar.xz"; }; }; kscd = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kscd-16.08.0.tar.xz"; - sha256 = "1jn7sp0ahgnqn8ws7qsaz9ax9ighx1w9jsgn3l1jqqwal2mz0gbv"; - name = "kscd-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kscd-16.08.1.tar.xz"; + sha256 = "1a6sq2dgkgvhycjxz95xa2b2xdibhl0ky54chj7hmdf43w69bdzc"; + name = "kscd-16.08.1.tar.xz"; }; }; kshisen = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kshisen-16.08.0.tar.xz"; - sha256 = "0asvxgkn3pqws91a93r5wvpafz7zfchk5xmk08b74shscidi4nl6"; - name = "kshisen-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kshisen-16.08.1.tar.xz"; + sha256 = "1j33byc485rxbcf3wk8kra7vxq4r1sg8cpfrlxwiyb9ibk762jlh"; + name = "kshisen-16.08.1.tar.xz"; }; }; ksirk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksirk-16.08.0.tar.xz"; - sha256 = "0gh6j8ml5062m99ps7wm9nkn5b1w5lcqsjh22rd81cvl8wy48sx4"; - name = "ksirk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksirk-16.08.1.tar.xz"; + sha256 = "121j8jz9gabdqv5fh4c2qcsg4ndj72xnmavvdrlib8a7qidjzaga"; + name = "ksirk-16.08.1.tar.xz"; }; }; ksnakeduel = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksnakeduel-16.08.0.tar.xz"; - sha256 = "1sd5vjjcg3yr8jcp76ilcql953b0wzk950w1h1lbgrll2hr81bm3"; - name = "ksnakeduel-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksnakeduel-16.08.1.tar.xz"; + sha256 = "1qzqr5ai5d7azh7xmm2vihbz3jzxxvb6qvhpfrix0yf4yr8m8fxz"; + name = "ksnakeduel-16.08.1.tar.xz"; }; }; kspaceduel = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kspaceduel-16.08.0.tar.xz"; - sha256 = "1whvibw0d1gbb28lc04q93wpalsihgqzd9hi1yabwfa5piac9ldb"; - name = "kspaceduel-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kspaceduel-16.08.1.tar.xz"; + sha256 = "0zy6m325gaivwfrr20mfwn8pdgl1i4ym1ymwb5dyw7a5yfi27m7n"; + name = "kspaceduel-16.08.1.tar.xz"; }; }; ksquares = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksquares-16.08.0.tar.xz"; - sha256 = "19rlzka8z7imhv4cbrwajkv4g38qg2mwm8pniyl0w818nj4jbjlp"; - name = "ksquares-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksquares-16.08.1.tar.xz"; + sha256 = "1rccb2qifqfb68apag01i3y97jbrskarf3480p61ixk7lrmbbrx4"; + name = "ksquares-16.08.1.tar.xz"; }; }; kstars = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kstars-16.08.0.tar.xz"; - sha256 = "0zridrc65av69q7yi3k0jq744ifr94wpv725vx3wy8v5wlsc3rcx"; - name = "kstars-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kstars-16.08.1.tar.xz"; + sha256 = "1fwl9hry23lmhyx5ldqspa7hp6bvmjp8kzwi6p9y1kbwzbzmki0k"; + name = "kstars-16.08.1.tar.xz"; }; }; ksudoku = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksudoku-16.08.0.tar.xz"; - sha256 = "15j9kjww92dmy6bvrs4pp2j6xxmz5xpci08wnab5mxsq6f6fghhs"; - name = "ksudoku-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksudoku-16.08.1.tar.xz"; + sha256 = "1msxx4hay0njp7bxjgplq7ylblbr56mf01l70sywj5madvvrmh8y"; + name = "ksudoku-16.08.1.tar.xz"; }; }; ksystemlog = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksystemlog-16.08.0.tar.xz"; - sha256 = "1ksp8innmziyxjkxdw53sqaz66jf82xp8p2cfypw6r2zb506wq96"; - name = "ksystemlog-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksystemlog-16.08.1.tar.xz"; + sha256 = "0garxwsgzdc5j6426gv3wqqgxra6qfdlk7xrk6mhlyg3wnwy8lz9"; + name = "ksystemlog-16.08.1.tar.xz"; }; }; kteatime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kteatime-16.08.0.tar.xz"; - sha256 = "1hqvyypbphsplq5aqdh24wzh7msqh757y1zgpclxl6xbjxx1ys5z"; - name = "kteatime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kteatime-16.08.1.tar.xz"; + sha256 = "0m6rri4mgr9qzcpxr5ifm1xs5mpmx7nz074gscff662nv4cj1h5n"; + name = "kteatime-16.08.1.tar.xz"; }; }; ktimer = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktimer-16.08.0.tar.xz"; - sha256 = "01gj0i5h08phhw9ds42ql1kmrl5brfasshgbxa9nvgd6i35zjp74"; - name = "ktimer-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktimer-16.08.1.tar.xz"; + sha256 = "0n94r34d24dnpi8rr6lb2vqrx1bz29xb92a63dm3s6pvbrw7zmhr"; + name = "ktimer-16.08.1.tar.xz"; }; }; ktnef = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktnef-16.08.0.tar.xz"; - sha256 = "03fhx1kyzhm1fs0p7i2488r41dbyl2knkapg0cfd8zd0pcnv518f"; - name = "ktnef-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktnef-16.08.1.tar.xz"; + sha256 = "0gjq14gcc34mqx21f74kzqb1575fhckaq13fpf00ascar0s1w0sx"; + name = "ktnef-16.08.1.tar.xz"; }; }; ktouch = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktouch-16.08.0.tar.xz"; - sha256 = "0i60f712bgldvf8dcjpd8hyf3fwlrmly96ddrkd8p5860vdyxxm1"; - name = "ktouch-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktouch-16.08.1.tar.xz"; + sha256 = "0jjn59hjbj5mc0svd8nrnqdwa4xz4wj76512gx1w1lga37ysk5gx"; + name = "ktouch-16.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-accounts-kcm-16.08.0.tar.xz"; - sha256 = "0hfs46fza537cdwmx18430qnwphvqihxa9z0ys7mlhwa8gffa9gq"; - name = "ktp-accounts-kcm-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-accounts-kcm-16.08.1.tar.xz"; + sha256 = "12icgnf165v549nlwzpn3dn7237k7xi3vfg0a1i7r2mzbhdw6xf5"; + name = "ktp-accounts-kcm-16.08.1.tar.xz"; }; }; ktp-approver = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-approver-16.08.0.tar.xz"; - sha256 = "0wvi076x2xxbrd4swf8gbi30fnwa58hxnahl3ri5gpz34c7y5c3v"; - name = "ktp-approver-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-approver-16.08.1.tar.xz"; + sha256 = "08qkcn2avc5aiakn6ksjikd50x5xd1ilwy5cf2fk1jqn6zbxglm0"; + name = "ktp-approver-16.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-auth-handler-16.08.0.tar.xz"; - sha256 = "0jyff6znszz82h3l92wjzkh9c1csnsyncd34hxvkyarxm6wb1s8f"; - name = "ktp-auth-handler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-auth-handler-16.08.1.tar.xz"; + sha256 = "0wjz5r287f13p2s34hdjg0sy23xanwnp0274pk2hxbybf9v4ryvi"; + name = "ktp-auth-handler-16.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-call-ui-16.08.0.tar.xz"; - sha256 = "16jw9jap985p411qjkzay83yy1xrnykbnq7f315d7wqxrry3pvf1"; - name = "ktp-call-ui-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-call-ui-16.08.1.tar.xz"; + sha256 = "1gbw3a1yfm6kc85gpqhx6q7kp2fwmjgmxp819w9wrgg1qwmjyxrw"; + name = "ktp-call-ui-16.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-common-internals-16.08.0.tar.xz"; - sha256 = "1l88fnagbq9b63nfvyncq5bylpv6m9h9z1znmz1z67fp5x6lcmh9"; - name = "ktp-common-internals-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-common-internals-16.08.1.tar.xz"; + sha256 = "0ylpwjn3jknp77f8g69mkcj1zcjn9khfhxla6mci4h7cbxka9wdf"; + name = "ktp-common-internals-16.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-list-16.08.0.tar.xz"; - sha256 = "06cd9yzj7lw6v6n9fqjc4lafpi1z0yl2wyipibk47xmwckx5bw9f"; - name = "ktp-contact-list-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-list-16.08.1.tar.xz"; + sha256 = "0ach7dvlch162jyyw01hdlbwwh72gdp6rmmkkx65cf3g0sqhvwp4"; + name = "ktp-contact-list-16.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-runner-16.08.0.tar.xz"; - sha256 = "10yd1z90q0a8d3qcl07lnvj1j150awl2fjf74njdlxya2s0wgdmq"; - name = "ktp-contact-runner-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-runner-16.08.1.tar.xz"; + sha256 = "0721mys632jn4i040v541997fb5pca2fr2nj9p49bp0r7kmgj6qr"; + name = "ktp-contact-runner-16.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-desktop-applets-16.08.0.tar.xz"; - sha256 = "0gbvdq7qpschhc3iq22sm505m3ph4j7r38kfzq6f51gf4284hv9x"; - name = "ktp-desktop-applets-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-desktop-applets-16.08.1.tar.xz"; + sha256 = "1fln9kndpwl8arsr1i8vsicz0cv10r00w4niv163al11yqk3ng5g"; + name = "ktp-desktop-applets-16.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-filetransfer-handler-16.08.0.tar.xz"; - sha256 = "119q2isisqpbrcffparv73n69869cc6wqih0jr34m85q2c7ifr7p"; - name = "ktp-filetransfer-handler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-filetransfer-handler-16.08.1.tar.xz"; + sha256 = "01581r1xylj6f78vqqxi0gf5nyj2k3vyyvkz5vjkq7di140mmw97"; + name = "ktp-filetransfer-handler-16.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-kded-module-16.08.0.tar.xz"; - sha256 = "1izc4gvh433gpnbbhdhb2bfx3sx5rj8bdiqcpba43xrvimq5mhbd"; - name = "ktp-kded-module-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-kded-module-16.08.1.tar.xz"; + sha256 = "1dpaay5qkqnxy0q80gqp2mydjngx815xrdmxcvh9pm3c4w0as8lh"; + name = "ktp-kded-module-16.08.1.tar.xz"; }; }; ktp-send-file = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-send-file-16.08.0.tar.xz"; - sha256 = "1lsvs101w2xldi176am896vyihbm7w2js2h033v5p7bswnkg2mgm"; - name = "ktp-send-file-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-send-file-16.08.1.tar.xz"; + sha256 = "1nchxvc2n8a2d02cz8vlazr4fl8gpngl44lq3jymdggz58w8rji9"; + name = "ktp-send-file-16.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-text-ui-16.08.0.tar.xz"; - sha256 = "11ybqnkkp2r0wdczc0p3prmq9r3vhk6v81fhl4pnmcypghcgaf3f"; - name = "ktp-text-ui-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-text-ui-16.08.1.tar.xz"; + sha256 = "0mj5zih4pbqdc2m62s85ck7r3m12ywh0frg6n4hi8xw909w7x25m"; + name = "ktp-text-ui-16.08.1.tar.xz"; }; }; ktuberling = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktuberling-16.08.0.tar.xz"; - sha256 = "1dd66s2ys266jr8pp5x2vvkzlysx93baw1kpiy550rb4gsb3l537"; - name = "ktuberling-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktuberling-16.08.1.tar.xz"; + sha256 = "1brm1xdma1d5fcgbyn8nw3pwncnyvxknrwlbr7capgwqn7s9pckl"; + name = "ktuberling-16.08.1.tar.xz"; }; }; kturtle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kturtle-16.08.0.tar.xz"; - sha256 = "01rphmyn89n32k579mg04gmfkjlphbn55cdqv0km4ngipiv32mj3"; - name = "kturtle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kturtle-16.08.1.tar.xz"; + sha256 = "1d6kw35dzyq3c62j7pqsl57l8cpw98awr6bdr1v2w8xdiw9xi73c"; + name = "kturtle-16.08.1.tar.xz"; }; }; kubrick = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kubrick-16.08.0.tar.xz"; - sha256 = "081bh8msbfcx9vkdbrlgclwngrxswpmd3hfzjfndhaw8ibp42hsi"; - name = "kubrick-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kubrick-16.08.1.tar.xz"; + sha256 = "1x34gyqa77b03hqs50vajqcmw9yrqxq1f4niyfj43wkw2b4jks9f"; + name = "kubrick-16.08.1.tar.xz"; }; }; kuser = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kuser-16.08.0.tar.xz"; - sha256 = "0yq1jil5nfm2zw5sisvcvrjbxxlzjq3z8vxn41ch0ppfdpcsknjs"; - name = "kuser-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kuser-16.08.1.tar.xz"; + sha256 = "0dkv9x052iavp3hnrvnarm8hv3416kamdizwp3c22w2cfz3q4rdc"; + name = "kuser-16.08.1.tar.xz"; }; }; kwalletmanager = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kwalletmanager-16.08.0.tar.xz"; - sha256 = "174rd9d4yqrdk93hnr5nrzq3b7ilk0hjzhlsy9dqm9pr9yix79g0"; - name = "kwalletmanager-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kwalletmanager-16.08.1.tar.xz"; + sha256 = "1w99076da86qw2271hkknrjc0mfp7f0xi5544kbk76aanaj73wvm"; + name = "kwalletmanager-16.08.1.tar.xz"; }; }; kwordquiz = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kwordquiz-16.08.0.tar.xz"; - sha256 = "1nngkkwd22nzcj4syayizmhvw8svkrhwa12ab5cfa0fmx30ivz86"; - name = "kwordquiz-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kwordquiz-16.08.1.tar.xz"; + sha256 = "08n6ajpx5x2vpf63d4fnfw2a4hcfmca2q4nd5y04kl1sccx67zig"; + name = "kwordquiz-16.08.1.tar.xz"; }; }; libgravatar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libgravatar-16.08.0.tar.xz"; - sha256 = "169sy6lzsvgrhm9arjg84qcy34hm5xwycl09cg2cw6l141c5yyv0"; - name = "libgravatar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libgravatar-16.08.1.tar.xz"; + sha256 = "1izh80plcd3ss3brl0mi0alics4y53d355smpgjkfqyc80zxs7wz"; + name = "libgravatar-16.08.1.tar.xz"; }; }; libkcddb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkcddb-16.08.0.tar.xz"; - sha256 = "1qlq62nl11dhsqn61zrvv80mybwzxhcgzdblrxqq8l352y1l916x"; - name = "libkcddb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkcddb-16.08.1.tar.xz"; + sha256 = "1i9xb96xari03q8fw20laqh5d3fyvigzqkdw6lw61fwxzpjrphk8"; + name = "libkcddb-16.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkcompactdisc-16.08.0.tar.xz"; - sha256 = "1i2pd9xr2i61xb6128dzsf5il2sk3bqp9d8ps45lm4vld73ryxmk"; - name = "libkcompactdisc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkcompactdisc-16.08.1.tar.xz"; + sha256 = "1qjij6kvvs8k650sg7skbgh0n4wgdkyjdsg8rydg93r0fqh5yagq"; + name = "libkcompactdisc-16.08.1.tar.xz"; }; }; libkdcraw = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdcraw-16.08.0.tar.xz"; - sha256 = "1cmhj1jpfpaxkkgx4imh79kcd5v3zdg27i971j9z828ysdl8b9rf"; - name = "libkdcraw-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdcraw-16.08.1.tar.xz"; + sha256 = "05206lbf2j0pry640ja5ajdlmalz4szfg2xzddfp00m87bgxbr2b"; + name = "libkdcraw-16.08.1.tar.xz"; }; }; libkdegames = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdegames-16.08.0.tar.xz"; - sha256 = "0zh8nw3ndrvinl7qg6zhnzwn3i4qixk3wyxcf1nrfz0m294ys9yf"; - name = "libkdegames-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdegames-16.08.1.tar.xz"; + sha256 = "11r5bf23fyymqqsj3ckbmya3f0zsdgrd4fw7jkfbxw7bfjjpr890"; + name = "libkdegames-16.08.1.tar.xz"; }; }; libkdepim = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdepim-16.08.0.tar.xz"; - sha256 = "1n3ijr5v73sd94hj6n0xwplx7019lljv151z0rjn6fakf199p32l"; - name = "libkdepim-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdepim-16.08.1.tar.xz"; + sha256 = "0p72dk6w0bvn7qikpqlxd7yhlrnn9wqnrq6b6p0ngnzhrsybjffm"; + name = "libkdepim-16.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkeduvocdocument-16.08.0.tar.xz"; - sha256 = "0sv5p57lk8f0skw2z42whhizk7s3nh5hh0pf9yaxml64clmypwbk"; - name = "libkeduvocdocument-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkeduvocdocument-16.08.1.tar.xz"; + sha256 = "113z6hi6v7mj4z6qk3gj04ah60ys8fn14jwlrxj8xf5qb0fvhzbn"; + name = "libkeduvocdocument-16.08.1.tar.xz"; }; }; libkexiv2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkexiv2-16.08.0.tar.xz"; - sha256 = "183h9ifbzwngi5mwdq85n2jx0k67z7dzxnd43k6fv5l6h2b5l7y7"; - name = "libkexiv2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkexiv2-16.08.1.tar.xz"; + sha256 = "1h7bd3p03xap6m6qpb0ww8ganyb9z7sdk2hpp25ar12snjpfgh0y"; + name = "libkexiv2-16.08.1.tar.xz"; }; }; libkface = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkface-16.08.0.tar.xz"; - sha256 = "175912gzb4w6ndmr164j67z3xwqhy0xpxahnqb3zqlbj0gx10wp2"; - name = "libkface-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkface-16.08.1.tar.xz"; + sha256 = "19fqg7xja2pk6wp4bvamanwpfcs5qiyzsgldpr0q4y650ipbrf4w"; + name = "libkface-16.08.1.tar.xz"; }; }; libkgeomap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkgeomap-16.08.0.tar.xz"; - sha256 = "0jxk18dfvhrxs6war4p83sfdmn4zld5yl0x81dgmzfh7kc9dhws6"; - name = "libkgeomap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkgeomap-16.08.1.tar.xz"; + sha256 = "0zlcd4k8yfz9l5skky7vyc2p5hgx2wnan1g0jawi2f2xzsy655nz"; + name = "libkgeomap-16.08.1.tar.xz"; }; }; libkipi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkipi-16.08.0.tar.xz"; - sha256 = "12829kp4sr5hzji26syw3b8awgxhhdpvgdjdid276im3a4xfhmsv"; - name = "libkipi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz"; + sha256 = "1mksgr0x446ilbqmb0wb5lh5afj8q7a88r31wzf6x3698n0s9fdb"; + name = "libkipi-16.08.1.tar.xz"; }; }; libkleo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkleo-16.08.0.tar.xz"; - sha256 = "1n5qv9azkv29w67iwkpbxka213s81dlb8svs0xx2lxfb1z2dvrvh"; - name = "libkleo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkleo-16.08.1.tar.xz"; + sha256 = "0a216q291vgf4v758l79aywp1f8wn40239jn9gx6ngw3p8zzf357"; + name = "libkleo-16.08.1.tar.xz"; }; }; libkmahjongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkmahjongg-16.08.0.tar.xz"; - sha256 = "145gi58yfcbd2magqk873hjwzk02z23zn4h3a95w236gx3r573m5"; - name = "libkmahjongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkmahjongg-16.08.1.tar.xz"; + sha256 = "1bvm86xcmx3cdslm98n5kg61rmyc9p86aj8scrp3gb8di1y987zx"; + name = "libkmahjongg-16.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkomparediff2-16.08.0.tar.xz"; - sha256 = "1fqghzfnzjcfrcdn6av5r27br9qiz48ng1vgj2g2bi1y75bnla6i"; - name = "libkomparediff2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkomparediff2-16.08.1.tar.xz"; + sha256 = "1cqd1amnxpylwzw5vdgy29wh1llhrvbqf5kmjxxb3a3kh2rafb53"; + name = "libkomparediff2-16.08.1.tar.xz"; }; }; libksane = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libksane-16.08.0.tar.xz"; - sha256 = "079fy5izsly0qkbrxhkasdk9h2359izsxhaam0mzc24cf9ls2zbr"; - name = "libksane-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libksane-16.08.1.tar.xz"; + sha256 = "0g8vhdknph32736inzf9xbrdi51asb9md254m12cabglb1mfhia3"; + name = "libksane-16.08.1.tar.xz"; }; }; libksieve = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libksieve-16.08.0.tar.xz"; - sha256 = "014ijwkzz8n53yy2gjm39i85rjakv447lz048kfighpl1m08yjjz"; - name = "libksieve-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libksieve-16.08.1.tar.xz"; + sha256 = "1paq508fsb1q7nfry3za7ykz41ly3qb6splf65d9n9l8aqbfx9fx"; + name = "libksieve-16.08.1.tar.xz"; }; }; lokalize = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/lokalize-16.08.0.tar.xz"; - sha256 = "0m7sipj53ih3g2pj1a5ny667dj0jaqyrsn46bymkpz9z7rn8z5xs"; - name = "lokalize-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/lokalize-16.08.1.tar.xz"; + sha256 = "1dg6sw4zm7cq4di9zgjc4b1nk73sngc3ilshsr1wgdylpxaq9vrf"; + name = "lokalize-16.08.1.tar.xz"; }; }; lskat = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/lskat-16.08.0.tar.xz"; - sha256 = "0lnpc5sfj4bfb1fz887fgkqs5prnjlsci90fis67rim9b3b45mhd"; - name = "lskat-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/lskat-16.08.1.tar.xz"; + sha256 = "08ds76m66ni7pfmz0cnqx6b1p6l7m8fy5mz54kh9aahchw8lwpmk"; + name = "lskat-16.08.1.tar.xz"; }; }; mailcommon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/mailcommon-16.08.0.tar.xz"; - sha256 = "1b43rfhnghm8apkl2qwg7i6mx8ci5lpjy1fgp6jrdcxip8yw0172"; - name = "mailcommon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/mailcommon-16.08.1.tar.xz"; + sha256 = "0f25z2s8bm51p2qxl2srdjf6df9h006ji6y9vn06m1vwsyfzmg3g"; + name = "mailcommon-16.08.1.tar.xz"; }; }; mailimporter = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/mailimporter-16.08.0.tar.xz"; - sha256 = "1bak75qb8x8g1x8kw3f1a20i07hcf8fas5arxjyb9qrs97zx6vbz"; - name = "mailimporter-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/mailimporter-16.08.1.tar.xz"; + sha256 = "18hy1brpl07zcwzwv83mikn17h7xrgyc5q8xqvl5awgn8cj1zk9d"; + name = "mailimporter-16.08.1.tar.xz"; }; }; marble = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/marble-16.08.0.tar.xz"; - sha256 = "1a65w4gir65cy90sxs2x1ig95mgmrk6ai3pv2ah8kwv0gy19qc6f"; - name = "marble-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/marble-16.08.1.tar.xz"; + sha256 = "0fmgqx1nc77agrrcb6qxq0zkndxkxhqybvxpf0dxyd7mpwg00zd2"; + name = "marble-16.08.1.tar.xz"; }; }; messagelib = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/messagelib-16.08.0.tar.xz"; - sha256 = "1442qvhqjm976i20h36xck9lrad29mbhcs2p146q1rggphv9yzb6"; - name = "messagelib-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/messagelib-16.08.1.tar.xz"; + sha256 = "0kjladmrj2plj5kjmjkhh35mlijc2k3q8pdmi91xq0paawlrziyc"; + name = "messagelib-16.08.1.tar.xz"; }; }; minuet = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/minuet-16.08.0.tar.xz"; - sha256 = "07h65zkikpl5wwmw996wihylij1rxbf580fkrcwq6xjh4xk6c950"; - name = "minuet-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/minuet-16.08.1.tar.xz"; + sha256 = "1qa2a3216p8x0vr9i3jw42i134qij4v0jj0625m606ihfs2mfhbq"; + name = "minuet-16.08.1.tar.xz"; }; }; okteta = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/okteta-16.08.0.tar.xz"; - sha256 = "1mnh1p7497206z7szf0aslb9s660iv3bzssbgkkcf96r3n50g96s"; - name = "okteta-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/okteta-16.08.1.tar.xz"; + sha256 = "1q9pni82frj48lncj9ipkvdb120bg49f53p09vcpfxyax6hhnb5k"; + name = "okteta-16.08.1.tar.xz"; }; }; okular = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/okular-16.08.0.tar.xz"; - sha256 = "15qzjmpzwlq2pp0cxfcklsm0dfmla9vp649rzv76bq0qlnb0vnc2"; - name = "okular-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/okular-16.08.1.tar.xz"; + sha256 = "0x3njxxwacy9cj4rzsgphl3za01d59wpbax9wxhxcdwqfi332a0d"; + name = "okular-16.08.1.tar.xz"; }; }; palapeli = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/palapeli-16.08.0.tar.xz"; - sha256 = "0l13i9gc5nqdl0zrmnnzfklv8f4v8anhhmndxs3v0r1rgjs856m4"; - name = "palapeli-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/palapeli-16.08.1.tar.xz"; + sha256 = "15dfh9802kdmlwzjfqciszf4lwy2pr9ypnk1s2i4aj69jwqygn62"; + name = "palapeli-16.08.1.tar.xz"; }; }; parley = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/parley-16.08.0.tar.xz"; - sha256 = "0ljk290z9sx30985848pixpnyyf5bjf7gqb2jfv3qy8gbbkxvrfd"; - name = "parley-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/parley-16.08.1.tar.xz"; + sha256 = "0pwwng4rx82l7j8n9llhwn6779jjhakl84nal1s6fc4i8vack49v"; + name = "parley-16.08.1.tar.xz"; }; }; picmi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/picmi-16.08.0.tar.xz"; - sha256 = "1ayxzfd6xgb02bliwcrbcnsjqid81afz4mmlvkdg079mzqgnsm5l"; - name = "picmi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/picmi-16.08.1.tar.xz"; + sha256 = "0lfmswabkkj6snwmx27iv9w5c2qpw6z85rvi997ccrw5yg1627hc"; + name = "picmi-16.08.1.tar.xz"; }; }; pimcommon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/pimcommon-16.08.0.tar.xz"; - sha256 = "0hdwdwr81viidkcxxg861pay7k3ix96wwcqj4anf1nv0cyg9i76n"; - name = "pimcommon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/pimcommon-16.08.1.tar.xz"; + sha256 = "1n15i70mgfx0jnl4952gkn05ynpnkqz4fkmwycj0ib0ry9wvi2vh"; + name = "pimcommon-16.08.1.tar.xz"; }; }; poxml = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/poxml-16.08.0.tar.xz"; - sha256 = "1r4b763rs77w03l0wwskqfjbkk83mdbk5w22s7xwr356w6h9mir1"; - name = "poxml-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/poxml-16.08.1.tar.xz"; + sha256 = "0cwnpcagsg1dbvfhra473g7wqmk5x2frw8y3831zwr47y6kgdr0c"; + name = "poxml-16.08.1.tar.xz"; }; }; print-manager = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/print-manager-16.08.0.tar.xz"; - sha256 = "033bdrzr6726a35pf7wi4dw1slfpywi2si26pkxh90863620qa87"; - name = "print-manager-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/print-manager-16.08.1.tar.xz"; + sha256 = "1nhfkw56ri8y2pik3x76v5w3dl39k2a2ajd4gdql627sc3116c5q"; + name = "print-manager-16.08.1.tar.xz"; }; }; rocs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/rocs-16.08.0.tar.xz"; - sha256 = "0fc8dgaj6n4kqkxs3m7p4g83znmvqx014shx0q5lv0azjr0bp09s"; - name = "rocs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/rocs-16.08.1.tar.xz"; + sha256 = "1qif7qj67rzljpkmbqjfm0gaji8wk7mc8fbddi7fpczgnz5jcmd5"; + name = "rocs-16.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/signon-kwallet-extension-16.08.0.tar.xz"; - sha256 = "1gbd9gf9riyrzi1gd0hxk06n6a86j103zhcwhscg9xh5fz306v3l"; - name = "signon-kwallet-extension-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/signon-kwallet-extension-16.08.1.tar.xz"; + sha256 = "0l68iz23d5k24ciyzdb7iywamfias34yhdcm69dpqpw1jchfcrkv"; + name = "signon-kwallet-extension-16.08.1.tar.xz"; }; }; spectacle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/spectacle-16.08.0.tar.xz"; - sha256 = "02fcgx8k74dqjn7bpkcydcdcw2jv2sk3w5a9kjwnwr14jcfb28zq"; - name = "spectacle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/spectacle-16.08.1.tar.xz"; + sha256 = "0a9gka5xllwcdvvdbr8fj91v8zg2hlzhrh6myb0ycj7ang45gc88"; + name = "spectacle-16.08.1.tar.xz"; }; }; step = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/step-16.08.0.tar.xz"; - sha256 = "035qflw50q22ml9nmwdl7ih3ym543dcyizc792cj3axmmhjvbpki"; - name = "step-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/step-16.08.1.tar.xz"; + sha256 = "0135568xaccswfj8zfimh5fbpb8ib3lz2aq9qsw05bbmrjfv4398"; + name = "step-16.08.1.tar.xz"; }; }; svgpart = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/svgpart-16.08.0.tar.xz"; - sha256 = "1z79056lsr4w3abqic4hk7xqnpma0sqq6ir9acrgkw89qiwjinga"; - name = "svgpart-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/svgpart-16.08.1.tar.xz"; + sha256 = "0ws41853wcfj1nbd31mr5qr23rzlijprvbpr1y7wq6g9agdfdwxs"; + name = "svgpart-16.08.1.tar.xz"; }; }; sweeper = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/sweeper-16.08.0.tar.xz"; - sha256 = "0ra8gldnbd6rkqrfrdljdjdh8naw1anga7g367mzik9n8vp0j5y4"; - name = "sweeper-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/sweeper-16.08.1.tar.xz"; + sha256 = "0ywrpdhy61hm61drclk17mlmp8i0717871mc48b5rlpgkxa31aaz"; + name = "sweeper-16.08.1.tar.xz"; }; }; syndication = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/syndication-16.08.0.tar.xz"; - sha256 = "0kg4194lrpda95pr9qk87frfvx4r0lmqvvlivyz4nqd18w9dj4r3"; - name = "syndication-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/syndication-16.08.1.tar.xz"; + sha256 = "06hpw3lr3idrrbv92qd5smnnbv4yvpn5kn99bbx5rjwxbcnrklml"; + name = "syndication-16.08.1.tar.xz"; }; }; umbrello = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/umbrello-16.08.0.tar.xz"; - sha256 = "0jhcdd8awdkky6jzki034ims04n27ix38hnxhldxj94n52crjdgl"; - name = "umbrello-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/umbrello-16.08.1.tar.xz"; + sha256 = "14kalb7fpknsflkxychian1j724kfw4klcb4l361cn53imqq0ngk"; + name = "umbrello-16.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/zeroconf-ioslave-16.08.0.tar.xz"; - sha256 = "0fb0c24rhkrrna9ymmlrxwf711bx7pnb2v0sx4jsla79r9wr2z0g"; - name = "zeroconf-ioslave-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/zeroconf-ioslave-16.08.1.tar.xz"; + sha256 = "00p6hwrc5zhll9vfs5vzff469lgp7xbmvpa2s11ix45wh8d2wm91"; + name = "zeroconf-ioslave-16.08.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index b6e59613b3cc..06a0b5b8bffb 100644 --- a/pkgs/applications/misc/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.1"; + name = "lxappearance-0.6.2"; + src = fetchurl{ url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; - sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9"; + sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4"; }; - buildInputs = [ intltool libX11 pkgconfig gtk ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ libX11 gtk2 ]; + meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; - homepage = "http://lxappearance.sourceforce.net/"; + homepage = "http://lxde.org/"; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index f6f7c4c3a54b..8e3998c05f22 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -3,21 +3,25 @@ let p_name = "xfce4-settings"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; + sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n"; }; patches = [ ./xfce4-settings-default-icon-theme.patch ]; + nativeBuildInputs = + [ pkgconfig intltool + ]; + buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower - xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon + [ exo gtk libxfce4util libxfce4ui libglade upower xfconf + xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon ]; #TODO: optional packages configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index fff958de9a07..f8ede8cae45f 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,9 +5,10 @@ let callPackage = newScope (deps // xfce_self); deps = { # xfce-global dependency overrides should be here - inherit (pkgs.gnome) libglade libwnck vte gtksourceview; + inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; + gtk = pkgs.gtk2; }; xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach @@ -74,24 +75,26 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" - xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; - xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; - xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; - xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; - xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; - xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; - xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; - xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; - xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; - xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; - xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; - xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; - xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; + xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; + xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; + xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; + xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; + xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; + xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix new file mode 100644 index 000000000000..ea17c960b2e4 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, + libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xfce4-hardware-monitor-plugin"; + version = "1.5.0"; + + src = fetchurl { + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + intltool + ]; + + buildInputs = [ + gnome2.gtkmm2 + gnome2.libgnomecanvas + gnome2.libgnomecanvasmm + libgtop + libxfce4ui + libxfce4util + xfce4panel + lm_sensors + ]; + + enableParallelBuilding = true; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + description = "Hardware monitor plugin for the XFCE4 panel"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix new file mode 100644 index 000000000000..770f34490235 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, + libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat +}: + +stdenv.mkDerivation rec { + name = "${pname}-${ver_maj}.${ver_min}"; + pname = "xfce4-sensors-plugin"; + ver_maj = "1.2"; + ver_min = "6"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${pname}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + gnome2.gtk + libxfce4ui + libxfce4util + xfce4panel + libnotify + lm_sensors + hddtemp + netcat + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-pathhddtemp=${hddtemp}/bin/hddtemp" + "--with-pathnetcat=${netcat}/bin/netcat" + ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index a5900f2ce25a..0c8b0f5ce601 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome.gtk zlib gmp - gnome.libgnomecanvas pango sqlite + file which zsh m4 gnome2.gtk zlib gmp + gnome2.libgnomecanvas pango sqlite libxml2 pkgconfig perl smlnj ]; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 68d3e4d12ed1..5fa88ab87e9e 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk +, shared_mime_info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig mono makeWrapper nant shared_mime_info gtksourceview - gtk + gtk2 ]; patches = [ ./config.patch ]; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index c13118977a17..7037bf3808f2 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -68,6 +68,14 @@ let # Change the #error on GCC > 4.9 to a #warning. sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' + + # Ensure that cmake can find CUDA. + mkdir -p $out/nix-support + echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook + + '' + lib.optionalString (lib.versionOlder version "8.0") '' + # Hack to fix building against recent Glibc/GCC. + echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; meta = { diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 4adcb995bde4..ac7a275d66ae 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "dtc-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "0wcn9x2vynwlfxk5c6jrf8lz7qvm1sbb9gh27drk1mx8msdh5hd5"; + sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 1f2be91b13a8..704d9d5be645 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , fpc -, gtk, glib, pango, atk, gdk_pixbuf +, gtk2, glib, pango, atk, gdk_pixbuf , libXi, inputproto, libX11, xproto, libXext, xextproto , makeWrapper }: @@ -15,7 +15,7 @@ let name = "lazarus-${version}"; }; buildInputs = [ - fpc gtk glib libXi inputproto + fpc gtk2 glib libXi inputproto libX11 xproto libXext xextproto pango atk stdenv.cc makeWrapper gdk_pixbuf ]; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 3f16667d1553..24a4135bde13 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { -C src/ocaml-output ''; - doCheck = !stdenv.isDarwin; + # https://github.com/FStarLang/FStar/issues/676 + doCheck = false; preCheck = "ulimit -s unlimited"; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b46ab8292bf6..5d05410a7fda 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -12,7 +12,7 @@ , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -62,7 +62,7 @@ let version = "4.5.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && gtk2 != null; /* Cross-gcc settings */ gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; @@ -122,7 +122,7 @@ let version = "4.5.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert gtk2 != null -> (filter (x: x == null) xlibs) == []; stdenv.mkDerivation ({ name = "${name}-${version}" + crossNameAddon; @@ -223,7 +223,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) + ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index f98fde69fc4b..991d4fc883fb 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -13,7 +13,7 @@ , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloog ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -82,7 +82,7 @@ let version = "4.6.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && gtk2 != null; /* Platform flags */ platformFlags = let @@ -175,7 +175,7 @@ let version = "4.6.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert gtk2 != null -> (filter (x: x == null) xlibs) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -266,7 +266,7 @@ stdenv.mkDerivation ({ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d15a9a90b794..e4e38022a6bf 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -203,7 +203,7 @@ let version = "4.8.5"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -291,7 +291,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7bf3e3bb6056..01755a74e1ec 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -207,7 +207,7 @@ let version = "4.9.4"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -296,7 +296,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 74f7f37e7f30..f5c69d24d63e 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -207,7 +207,7 @@ let version = "5.4.0"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8064f42d498c..129bde908faf 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -206,7 +206,7 @@ let version = "6.2.0"; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -293,7 +293,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index e607ef7e2706..5e903822d4bb 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -8,7 +8,7 @@ let fetchFilteredPatch = args: fetchurl (args // { downloadToTemp = true; postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x '"testsuite/"*' "$downloadedFile" > "$out" + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" ''; }); in diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 5d9ca621648b..b75b57d0f476 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: +gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: assert emacsSupport -> (emacs != null); @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download buildInputs = [ - pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] ++ stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb86..0f78646e1aa0 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,9 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand +{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre +, pcre, cacert , Security, Foundation, bash }: let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out cp -rf ${go_bootstrap}/* $out/ @@ -11,44 +19,28 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; + in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ - Security Foundation - ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - topdir=$PWD - mkdir -p $out/share - cd $out/share - ''; - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go patchShebangs ./ # replace /bin/bash # This source produces shell script at run time, @@ -81,9 +73,9 @@ stdenv.mkDerivation rec { # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go - '' + lib.optionalString stdenv.isLinux '' + '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + lib.optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -93,6 +85,7 @@ stdenv.mkDerivation rec { sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go @@ -106,20 +99,11 @@ stdenv.mkDerivation rec { touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd sed -i '1 a\exit 0' misc/cgo/errors/test.bash - - mkdir $topdir/dirtyhacks - cat <<EOF > $topdir/dirtyhacks/clang - #!${bash}/bin/bash - $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - exit $? - EOF - chmod +x $topdir/dirtyhacks/clang - PATH=$topdir/dirtyhacks:$PATH ''; - patches = [ - ./remove-tools-1.7.patch - ]; + patches = [ ./remove-tools-1.7.patch ./cacert-1.7.patch ]; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" @@ -127,7 +111,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; @@ -136,19 +120,25 @@ stdenv.mkDerivation rec { # just want the generic `cc` here. CC = if stdenv.isDarwin then "clang" else "cc"; + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - echo Building - ./all.bash + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) ''; preFixup = '' rm -r $out/share/go/pkg/bootstrap - rmdir $out/bin && mv $out/share/go/bin $out/bin + mv $out/share/go/bin $out/bin ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch new file mode 100644 index 000000000000..0fe9ff8cc239 --- /dev/null +++ b/pkgs/development/compilers/go/cacert-1.7.patch @@ -0,0 +1,82 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index a4b33c7..9700b75 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = nil + err := C.FetchPEMRoots(&data) +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 78de56c..05eada4 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -6,20 +6,31 @@ + + package x509 + +-import "os/exec" ++import ( ++ "io/ioutil" ++ "os" ++ "os/exec" ++) + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } + + func execSecurityRoots() (*CertPool, error) { ++ roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") + data, err := cmd.Output() + if err != nil { + return nil, err + } + +- roots := NewCertPool() + roots.AppendCertsFromPEM(data) + return roots, nil + } +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 7bcb3d6..3986e1a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + var firstErr error + for _, file := range certFiles { + data, err := ioutil.ReadFile(file) diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc5..b53e48e1a515 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index f8524e777a0e..6e4cd9a9c73c 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.14.5"; + version = "3.15.0"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "f516f1bb9046218f89885a220354c19dda6d8f4d"; - sha256 = "0sv856ran15rvnrj4dk0a5jirip5w4336a0aycv9wh77wm4s8xdb"; + rev = "92a682ebaa3c85b84857852d8621f528607fe27d"; + sha256 = "0mn3bfvhdf6b4lflyjfjyr7nppkq505xkaaagk111fqy91rdzd3b"; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 08958a42b44f..6bc7f66ca299 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, -testedTargets ? ["sse4" "host"] +testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: # TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; }; - enableParallelBuilding = true; + # there are missing dependencies in the Makefile, causing sporadic build failures + enableParallelBuilding = false; doCheck = true; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 9d0b506efeea..335de9b50cde 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 09b79c59e7d2..ed23bcb73ccd 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ]; @@ -131,6 +131,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index fd684fd93e86..3b0ab46bcd54 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz; - md5 = "c6ef478362295c150101cdd2efcd38e0"; + sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx"; }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 775971821aae..8fe775de146f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , mesa_noglu , freetype , fontconfig -, gnome +, gnome2 , cairo , alsaLib , atk @@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index c3e77152b3e0..b6d6388c74b9 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.6"; + version = "7.2.3"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { - url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; + sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 18bbdef8758e..d4d2790b2a3c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -56,7 +56,7 @@ let }; importGodeps = { depsFile }: - map dep2src (lib.importJSON depsFile); + map dep2src (import depsFile); goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; @@ -180,6 +180,16 @@ go.stdenv.mkDerivation ( done < <(find $bin/bin -type f 2>/dev/null) ''; + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH="$d:$GOPATH" + ''; + disallowedReferences = lib.optional (!allowGoReference) go ++ lib.optional (!dontRenameImports) govers; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 3e9736fff521..ec7723f5b7ef 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, guile, guile_lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk +, pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guileCairo, autoconf, automake, texinfo }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gconf glib gnome_vfs - gtk + gtk2 libglade libgnome libgnomecanvas diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1b02e464c3ba..64de27aa5de9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,9 +26,7 @@ self: super: { c2hs = dontCheck super.c2hs; # fix errors caused by hardening flags - epanet-haskell = super.epanet-haskell.overrideDerivation (drv: { - hardeningDisable = [ "format" ]; - }); + epanet-haskell = disableHardening super.epanet-haskell ["format"]; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -48,6 +46,7 @@ self: super: { sha256 = "0an1rafbv48m04g7crfj2qrk64d98yrjn2z4hfv2pybwmqdmx78z"; rev = drv.version; }; + doCheck = false; # version 6.20160907 has a test suite failure; reported upstream })).overrideScope (self: super: { # https://github.com/prowdsponsor/esqueleto/issues/137 persistent = self.persistent_2_2_4_1; @@ -214,24 +213,10 @@ self: super: { jwt = dontCheck super.jwt; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gio self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - glib = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.glib self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk3 = pkgs.lib.overrideDerivation (super.gtk3.override { inherit (pkgs) gtk3; }) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gtk self.gtk2hs-buildtools - ) pkgs.gtk) (drv: { - hardeningDisable = [ "fortify" ]; - }); + gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; + gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; @@ -290,8 +275,8 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; # These packages try to access the network. - amqp-conduit = dontCheck super.amqp-conduit; amqp = dontCheck super.amqp; + amqp-conduit = dontCheck super.amqp-conduit; bitcoin-api = dontCheck super.bitcoin-api; bitcoin-api-extra = dontCheck super.bitcoin-api-extra; bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw @@ -302,8 +287,9 @@ self: super: { hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; }); + hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw + mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw @@ -337,49 +323,57 @@ self: super: { acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 + angel = dontCheck super.angel; apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw + binary-search = dontCheck super.binary-search; bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw + camfort = dontCheck super.camfort; cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw - CLI = dontCheck super.CLI; # Upstream has no issue tracker. cjk = dontCheck super.cjk; + CLI = dontCheck super.CLI; # Upstream has no issue tracker. command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; craftwerk = dontCheck super.craftwerk; + css-text = dontCheck super.css-text; damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log data-hash = dontCheck super.data-hash; Deadpan-DDP = dontCheck super.Deadpan-DDP; # http://hydra.cryp.to/build/496418/log/raw DigitalOcean = dontCheck super.DigitalOcean; + direct-sqlite = dontCheck super.direct-sqlite; directory-layout = dontCheck super.directory-layout; + dlist = dontCheck super.dlist; docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw + ed25519 = dontCheck super.ed25519; either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw - ghcid = dontCheck super.ghcid; ghc-imported-from = dontCheck super.ghc-imported-from; ghc-parmake = dontCheck super.ghc-parmake; - gitlib-cmdline = dontCheck super.gitlib-cmdline; + ghcid = dontCheck super.ghcid; git-vogue = dontCheck super.git-vogue; + gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; + hastache = dontCheck super.hastache; hath = dontCheck super.hath; haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; @@ -411,13 +405,14 @@ self: super: { lensref = dontCheck super.lensref; liquidhaskell = dontCheck super.liquidhaskell; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 - lvmrun = pkgs.lib.overrideDerivation (dontCheck super.lvmrun) (drv: { - hardeningDisable = [ "format" ]; - }); + lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; memcache = dontCheck super.memcache; + MemoTrie = dontHaddock (dontCheck super.MemoTrie); + metrics = dontCheck super.metrics; milena = dontCheck super.milena; nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; + network = dontCheck super.network; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -438,6 +433,7 @@ self: super: { redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; + safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; scp-streams = dontCheck super.scp-streams; sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention @@ -447,7 +443,9 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; + symengine = dontCheck super.symengine; tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) + th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; @@ -457,11 +455,13 @@ self: super: { wai-app-file-cgi = dontCheck super.wai-app-file-cgi; wai-logger = dontCheck super.wai-logger; WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw - webdriver-angular = dontCheck super.webdriver-angular; webdriver = dontCheck super.webdriver; + webdriver-angular = dontCheck super.webdriver-angular; xsd = dontCheck super.xsd; + snap-core = dontCheck super.snap-core; + sourcemap = dontCheck super.sourcemap; - # Needs access to locale data, but looks for it in the wrong place. + # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; # These test suites run for ages, even on a fast machine. This is nuts. @@ -502,7 +502,7 @@ self: super: { duplo = dontCheck super.duplo; # Nix-specific workaround - xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch; + xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; @@ -764,14 +764,18 @@ self: super: { ''; }); - # Byte-compile elisp code for Emacs. + # Fine-tune the build. structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: { + # Statically linked Haskell libraries make the tool start-up much faster, + # which is important for use in Emacs. + enableSharedExecutables = false; + # Byte-compile elisp code for Emacs. executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) pushd >/dev/null $lispdir for i in *.el; do - emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \ + emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \ --batch --eval "(byte-compile-disable-warning 'cl-functions)" \ -f batch-byte-compile $i done @@ -788,7 +792,7 @@ self: super: { local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) pushd >/dev/null $lispdir for i in *.el; do - emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \ + emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \ --batch --eval "(byte-compile-disable-warning 'cl-functions)" \ -f batch-byte-compile $i done @@ -796,6 +800,7 @@ self: super: { mkdir -p $out/share/emacs ln -s $lispdir $out/share/emacs/site-lisp ''; + doCheck = false; # https://github.com/chrisdone/hindent/issues/299 }); # https://github.com/yesodweb/Shelly.hs/issues/106 @@ -947,9 +952,7 @@ self: super: { # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; - pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: { - hardeningDisable = [ "fortify" ]; - }); + pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; # Fix tests which would otherwise fail with "Couldn't launch intero process." intero = overrideCabal super.intero (drv: { @@ -981,9 +984,6 @@ self: super: { ''; }); - # https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath - spy = appendPatch super.spy ./patches/spy.patch; - idris = overrideCabal super.idris (drv: { # "idris" binary cannot find Idris library otherwise while building. After # installing it's completely fine though. This seems like a bug in Idris @@ -992,11 +992,11 @@ self: super: { preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; # https://github.com/idris-lang/Idris-dev/issues/2499 librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; + # test suite cannot find its own "idris" binary + doCheck = false; }); - # https://github.com/MarcWeber/hasktags/issues/32 - hasktags = overrideCabal super.hasktags (drv: { - postInstall = "rm $out/bin/test"; - }); + # https://github.com/pontarius/pontarius-xmpp/issues/105 + pontarius-xmpp = dontCheck super.pontarius-xmpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 3ffce7a52ecc..a0f8056c081c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -123,7 +123,6 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index b09680574b04..5c7348678b7e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -54,12 +54,6 @@ self: super: { broken = true; # needs template-haskell >=2.9 && <2.11 }) {}; - # https://github.com/ygale/timezone-series/issues/2 - timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { - url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; - sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; - }); - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fbbc8d47d24c..9f4294bbef1e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,11 +32,1974 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # Add overrides in this section only for packages that are *not* part of - # Stackage to make sure we're conforming to their preferred version list. + # LTS Haskell 7.0 + - abstract-deque ==0.3 + - abstract-par ==0.3.3 + - AC-Vector ==2.3.2 + - accelerate ==0.15.1.0 + - accuerr ==0.2.0.2 + - ace ==0.6 + - acid-state ==0.14.2 + - action-permutations ==0.0.0.1 + - active ==0.2.0.10 + - ad ==4.3.2.1 + - adjunctions ==4.3 + - adler32 ==0.1.1.0 + - aeson ==0.11.2.1 + - aeson-better-errors ==0.9.0.1 + - aeson-casing ==0.1.0.5 + - aeson-compat ==0.3.6 + - aeson-injector ==1.0.5.1 + - aeson-pretty ==0.8.2 + - aeson-qq ==0.8.1 + - aeson-utils ==0.3.0.2 + - Agda ==2.5.1.1 + - airship ==0.6.0 + - alarmclock ==0.4.0.2 + - alex ==3.1.7 + - amazonka ==1.4.3 + - amazonka-apigateway ==1.4.3 + - amazonka-application-autoscaling ==1.4.3 + - amazonka-autoscaling ==1.4.3 + - amazonka-certificatemanager ==1.4.3 + - amazonka-cloudformation ==1.4.3 + - amazonka-cloudfront ==1.4.3 + - amazonka-cloudhsm ==1.4.3 + - amazonka-cloudsearch ==1.4.3 + - amazonka-cloudsearch-domains ==1.4.3 + - amazonka-cloudtrail ==1.4.3 + - amazonka-cloudwatch ==1.4.3 + - amazonka-cloudwatch-events ==1.4.3 + - amazonka-cloudwatch-logs ==1.4.3 + - amazonka-codecommit ==1.4.3 + - amazonka-codedeploy ==1.4.3 + - amazonka-codepipeline ==1.4.3 + - amazonka-cognito-identity ==1.4.3 + - amazonka-cognito-idp ==1.4.3 + - amazonka-cognito-sync ==1.4.3 + - amazonka-config ==1.4.3 + - amazonka-core ==1.4.3 + - amazonka-datapipeline ==1.4.3 + - amazonka-devicefarm ==1.4.3 + - amazonka-directconnect ==1.4.3 + - amazonka-discovery ==1.4.3 + - amazonka-dms ==1.4.3 + - amazonka-ds ==1.4.3 + - amazonka-dynamodb ==1.4.3 + - amazonka-dynamodb-streams ==1.4.3 + - amazonka-ec2 ==1.4.3 + - amazonka-ecr ==1.4.3 + - amazonka-ecs ==1.4.3 + - amazonka-efs ==1.4.3 + - amazonka-elasticache ==1.4.3 + - amazonka-elasticbeanstalk ==1.4.3 + - amazonka-elasticsearch ==1.4.3 + - amazonka-elastictranscoder ==1.4.3 + - amazonka-elb ==1.4.3 + - amazonka-emr ==1.4.3 + - amazonka-gamelift ==1.4.3 + - amazonka-glacier ==1.4.3 + - amazonka-iam ==1.4.3 + - amazonka-importexport ==1.4.3 + - amazonka-inspector ==1.4.3 + - amazonka-iot ==1.4.3 + - amazonka-iot-dataplane ==1.4.3 + - amazonka-kinesis ==1.4.3 + - amazonka-kinesis-firehose ==1.4.3 + - amazonka-kms ==1.4.3 + - amazonka-lambda ==1.4.3 + - amazonka-marketplace-analytics ==1.4.3 + - amazonka-marketplace-metering ==1.4.3 + - amazonka-ml ==1.4.3 + - amazonka-opsworks ==1.4.3 + - amazonka-rds ==1.4.3 + - amazonka-redshift ==1.4.3 + - amazonka-route53 ==1.4.3 + - amazonka-route53-domains ==1.4.3 + - amazonka-s3 ==1.4.3 + - amazonka-sdb ==1.4.3 + - amazonka-ses ==1.4.3 + - amazonka-sns ==1.4.3 + - amazonka-sqs ==1.4.3 + - amazonka-ssm ==1.4.3 + - amazonka-storagegateway ==1.4.3 + - amazonka-sts ==1.4.3 + - amazonka-support ==1.4.3 + - amazonka-swf ==1.4.3 + - amazonka-test ==1.4.3 + - amazonka-waf ==1.4.3 + - amazonka-workspaces ==1.4.3 + - amqp ==0.14.0 + - angel ==0.6.2 + - annotated-wl-pprint ==0.7.0 + - anonymous-sums ==0.4.0.0 + - ansi-terminal ==0.6.2.3 + - ansi-wl-pprint ==0.6.7.3 + - ansigraph ==0.2.0.0 + - api-field-json-th ==0.1.0.1 + - app-settings ==0.2.0.7 + - appar ==0.1.4 + - apply-refact ==0.3.0.0 + - arbtt ==0.9.0.10 + - arithmoi ==0.4.2.0 + - array-memoize ==0.6.0 + - arrow-list ==0.7 + - ascii-progress ==0.3.3.0 + - asciidiagram ==1.3.1.2 + - asn1-encoding ==0.9.4 + - asn1-parse ==0.9.4 + - asn1-types ==0.3.2 + - async ==2.1.0 + - async-dejafu ==0.1.3.0 + - atndapi ==0.1.1.0 + - atom-conduit ==0.3.1.2 + - atomic-primops ==0.8.0.4 + - atomic-write ==0.2.0.5 + - attoparsec ==0.13.0.2 + - attoparsec-binary ==0.2 + - attoparsec-expr ==0.1.1.2 + - authenticate ==1.3.3.2 + - authenticate-oauth ==1.5.1.2 + - auto ==0.4.3.0 + - auto-update ==0.1.4 + - autoexporter ==0.2.2 + - aws ==0.14.0 + - b9 ==0.5.21 + - bake ==0.4 + - bank-holidays-england ==0.1.0.5 + - base-compat ==0.9.1 + - base-noprelude ==4.9.0.0 + - base-orphans ==0.5.4 + - base-prelude ==1.0.1.1 + - base-unicode-symbols ==0.2.2.4 + - base16-bytestring ==0.1.1.6 + - base32string ==0.9.1 + - base58string ==0.10.0 + - base64-bytestring ==1.0.0.1 + - base64-string ==0.2 + - basic-prelude ==0.6.1 + - bcrypt ==0.0.9 + - benchpress ==0.2.2.8 + - bencode ==0.6.0.0 + - bento ==0.1.0 + - bifunctors ==5.4.1 + - bimap ==0.3.2 + - bimap-server ==0.1.0.1 + - binary-bits ==0.5 + - binary-conduit ==1.2.4.1 + - binary-list ==1.1.1.2 + - binary-orphans ==0.1.5.1 + - binary-parser ==0.5.2 + - binary-search ==1.0.0.3 + - binary-tagged ==0.1.4.0 + - binary-typed ==1.0 + - bindings-DSL ==1.0.23 + - bindings-GLFW ==3.1.2.1 + - bindings-libzip ==1.0.1 + - bioace ==0.0.1 + - bioalign ==0.0.5 + - biocore ==0.3.1 + - biofasta ==0.0.3 + - biofastq ==0.1 + - biopsl ==0.4 + - bitcoin-api ==0.12.1 + - bitcoin-api-extra ==0.9.1 + - bitcoin-block ==0.13.1 + - bitcoin-payment-channel ==0.3.0.1 + - bitcoin-script ==0.11.1 + - bitcoin-tx ==0.13.1 + - bitcoin-types ==0.9.2 + - bits ==0.5 + - bitx-bitcoin ==0.10.0.0 + - blake2 ==0.2.0 + - blank-canvas ==0.6 + - BlastHTTP ==1.2.0 + - blastxml ==0.3.2 + - blaze-bootstrap ==0.1.0.1 + - blaze-builder ==0.4.0.2 + - blaze-html ==0.8.1.2 + - blaze-markup ==0.7.1.0 + - blaze-svg ==0.3.6 + - blaze-textual ==0.2.1.0 + - bloodhound ==0.11.0.0 + - blosum ==0.1.1.2 + - bmp ==1.2.6.3 + - Boolean ==0.2.3 + - boolsimplifier ==0.1.8 + - boomerang ==1.4.5.2 + - both ==0.1.1.0 + - BoundedChan ==1.0.3.0 + - boundingboxes ==0.2.3 + - bower-json ==0.8.0 + - boxes ==0.1.4 + - broadcast-chan ==0.1.1 + - bson ==0.3.2.3 + - bson-lens ==0.1.1 + - btrfs ==0.1.2.0 + - bumper ==0.6.0.3 + - bustle ==0.5.4 + - byteable ==0.1.1 + - bytedump ==1.0 + - byteorder ==1.0.4 + - bytes ==0.15.2 + - byteset ==0.1.1.0 + - bytestring-builder ==0.10.8.1.0 + - bytestring-conversion ==0.3.1 + - bytestring-handle ==0.1.0.4 + - bytestring-lexing ==0.5.0.2 + - bytestring-progress ==1.0.6 + - bytestring-tree-builder ==0.2.7.1 + - bytestring-trie ==0.2.4.1 + - bzlib ==0.5.0.5 + - bzlib-conduit ==0.2.1.4 + - c2hs ==0.28.1 + - Cabal ==1.24.0.0 + - cabal-dependency-licenses ==0.1.2.0 + - cabal-file-th ==0.2.3 + - cabal-helper ==0.7.2.0 + - cabal-install ==1.24.0.0 + - cabal-rpm ==0.10.0 + - cabal-sort ==0.0.5.3 + - cabal-src ==0.3.0.1 + - cabal2nix ==2.0.1 + - cache ==0.1.0.0 + - cacophony ==0.8.0 + - cairo ==0.13.3.0 + - camfort ==0.900 + - carray ==0.1.6.5 + - cartel ==0.18.0.2 + - case-insensitive ==1.2.0.7 + - cased ==0.1.0.0 + - cases ==0.1.3.1 + - cassava ==0.4.5.0 + - cassava-conduit ==0.3.2 + - cassava-megaparsec ==0.1.0 + - cassette ==0.1.0 + - cayley-client ==0.2.0.0 + - cereal ==0.5.3.0 + - cereal-conduit ==0.7.3 + - cereal-vector ==0.2.0.1 + - cgi ==3001.3.0.1 + - ChannelT ==0.0.0.2 + - charset ==0.3.7.1 + - charsetdetect-ae ==1.1.0.1 + - Chart ==1.8 + - Chart-cairo ==1.8 + - Chart-diagrams ==1.8 + - ChasingBottoms ==1.3.1.1 + - cheapskate ==0.1.0.5 + - cheapskate-highlight ==0.1.0.0 + - cheapskate-lucid ==0.1.0.0 + - check-email ==1.0 + - checkers ==0.4.5 + - chell ==0.4.0.1 + - chell-quickcheck ==0.2.5 + - chunked-data ==0.3.0 + - cipher-aes ==0.2.11 + - cipher-aes128 ==0.7.0.3 + - cipher-blowfish ==0.0.3 + - cipher-camellia ==0.0.2 + - cipher-des ==0.0.6 + - cipher-rc4 ==0.1.4 + - circle-packing ==0.1.0.5 + - clash-lib ==0.6.21 + - clash-prelude ==0.10.14 + - clash-systemverilog ==0.6.9 + - clash-verilog ==0.6.9 + - clash-vhdl ==0.6.16 + - classy-prelude ==1.0.0.2 + - classy-prelude-conduit ==1.0.0 + - classy-prelude-yesod ==1.0.0 + - clay ==0.11 + - clckwrks ==0.23.19.1 + - clckwrks-cli ==0.2.16 + - clckwrks-plugin-media ==0.6.16 + - clckwrks-plugin-page ==0.4.3.4 + - clckwrks-theme-bootstrap ==0.4.2 + - cli ==0.1.2 + - clientsession ==0.9.1.2 + - Clipboard ==2.3.0.1 + - clock ==0.7.2 + - clumpiness ==0.17.0.0 + - ClustalParser ==1.1.4 + - clustering ==0.2.1 + - cmark ==0.5.3.1 + - cmark-highlight ==0.2.0.0 + - cmark-lucid ==0.1.0.0 + - cmdargs ==0.10.14 + - code-builder ==0.1.3 + - codo-notation ==0.5.2 + - colour ==2.3.3 + - commutative ==0.0.1.4 + - comonad ==5 + - comonad-transformers ==4.0 + - comonads-fd ==4.0 + - compactmap ==0.1.4.1 + - compdata ==0.10.1 + - composition ==1.0.2.1 + - composition-extra ==2.0.0 + - concatenative ==1.0.1 + - concurrency ==1.0.0.0 + - concurrent-extra ==0.7.0.10 + - concurrent-output ==1.7.7 + - concurrent-supply ==0.1.8 + - conduit ==1.2.7 + - conduit-combinators ==1.0.6 + - conduit-extra ==1.1.13.2 + - conduit-iconv ==0.1.1.1 + - conduit-parse ==0.1.2.0 + - ConfigFile ==1.1.4 + - configuration-tools ==0.2.14 + - configurator ==0.3.0.0 + - configurator-export ==0.1.0.1 + - connection ==0.2.6 + - constraints ==0.8 + - consul-haskell ==0.3 + - containers-unicode-symbols ==0.3.1.1 + - continued-fractions ==0.9.1.1 + - contravariant ==1.4 + - contravariant-extras ==0.3.3.1 + - control-bool ==0.2.1 + - control-monad-free ==0.6.1 + - control-monad-loop ==0.1 + - control-monad-omega ==0.3.1 + - converge ==0.1.0.1 + - convertible ==1.1.1.0 + - cookie ==0.4.2.1 + - countable ==1.0 + - courier ==0.1.1.4 + - cpphs ==1.20.2 + - cprng-aes ==0.6.1 + - cpu ==0.1.2 + - crackNum ==1.5 + - criterion ==1.1.1.0 + - cron ==0.4.1.2 + - crypto-api ==0.13.2 + - crypto-api-tests ==0.3 + - crypto-cipher-tests ==0.0.11 + - crypto-cipher-types ==0.0.9 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocipher ==0.6.2 + - cryptohash ==0.11.9 + - cryptohash-conduit ==0.1.1 + - cryptohash-cryptoapi ==0.1.4 + - cryptohash-sha256 ==0.11.100.1 + - cryptol ==2.4.0 + - cryptonite ==0.19 + - cryptonite-conduit ==0.1 + - css-syntax ==0.0.5 + - css-text ==0.1.2.2 + - csv ==0.1.2 + - ctrie ==0.1.1.0 + - cubicspline ==0.1.2 + - curl ==1.3.8 + - darcs ==2.12.3 + - data-accessor ==0.2.2.7 + - data-accessor-mtl ==0.2.0.4 + - data-binary-ieee754 ==0.4.4 + - data-check ==0.1.0 + - data-default ==0.7.1.1 + - data-default-class ==0.1.2.0 + - data-default-instances-containers ==0.0.1 + - data-default-instances-dlist ==0.0.1 + - data-default-instances-old-locale ==0.0.1 + - data-hash ==0.2.0.1 + - data-inttrie ==0.1.2 + - data-lens-light ==0.1.2.2 + - data-memocombinators ==0.5.1 + - data-or ==1.0.0.5 + - data-ordlist ==0.4.7.0 + - data-reify ==0.6.1 + - dataurl ==0.1.0.0 + - DAV ==1.3.1 + - dawg-ord ==0.5.0.2 + - dbus ==0.10.12 + - debian-build ==0.10.1.0 + - Decimal ==0.4.2 + - declarative ==0.2.2 + - deepseq-generics ==0.2.0.0 + - dejafu ==0.4.0.0 + - dependent-map ==0.2.3.0 + - dependent-sum ==0.3.2.2 + - dependent-sum-template ==0.0.0.5 + - derive ==2.5.26 + - deriving-compat ==0.3.3 + - descriptive ==0.9.4 + - diagrams ==1.3.0.1 + - diagrams-cairo ==1.3.1.1 + - diagrams-canvas ==1.3.0.6 + - diagrams-contrib ==1.3.0.12 + - diagrams-core ==1.3.0.8 + - diagrams-gtk ==1.3.0.2 + - diagrams-html5 ==1.3.0.7 + - diagrams-lib ==1.3.1.4 + - diagrams-postscript ==1.3.0.7 + - diagrams-rasterific ==1.3.1.8 + - diagrams-solve ==0.1.0.1 + - diagrams-svg ==1.4.0.3 + - dice ==0.1 + - Diff ==0.3.4 + - diff3 ==0.2.0.3 + - digest ==0.0.1.2 + - digits ==0.3.1 + - dimensional ==1.0.1.2 + - direct-sqlite ==2.3.17 + - directory-tree ==0.12.1 + - discount ==0.1.1 + - disk-free-space ==0.1.0.1 + - distributed-closure ==0.3.1.0 + - distributed-static ==0.3.5.0 + - distribution-nixpkgs ==1.0.0.1 + - distributive ==0.5.0.2 + - diversity ==0.8.0.1 + - djinn-ghc ==0.0.2.3 + - djinn-lib ==0.0.1.2 + - dlist ==0.8.0.2 + - dlist-instances ==0.1.1.1 + - dns ==2.0.5 + - do-list ==1.0.0 + - dockerfile ==0.1.0.1 + - docopt ==0.7.0.4 + - doctest ==0.11.0 + - doctest-discover ==0.1.0.7 + - doctest-prop ==0.2.0.1 + - docvim ==0.3.2.1 + - dotenv ==0.3.0.3 + - dotnet-timespan ==0.0.1.0 + - double-conversion ==2.0.1.0 + - download ==0.3.2.4 + - dpor ==0.2.0.0 + - drawille ==0.1.0.6 + - DRBG ==0.5.5 + - drifter ==0.2.2 + - drifter-postgresql ==0.0.2 + - dual-tree ==0.2.0.9 + - dynamic-state ==0.2.2.0 + - dyre ==0.8.12 + - Earley ==0.11.0.1 + - easy-file ==0.2.1 + - Ebnf2ps ==1.0.15 + - ed25519 ==0.0.5.0 + - ede ==0.2.8.5 + - EdisonAPI ==1.3.1 + - EdisonCore ==1.3.1.1 + - edit-distance ==0.2.2.1 + - editor-open ==0.6.0.0 + - effect-handlers ==0.1.0.8 + - either ==4.4.1.1 + - either-unwrap ==1.1 + - ekg ==0.4.0.11 + - ekg-core ==0.1.1.1 + - ekg-json ==0.1.0.3 + - elerea ==2.9.0 + - elm-bridge ==0.3.0.2 + - elm-core-sources ==1.0.0 + - email-validate ==2.2.0 + - emailaddress ==0.1.6.0 + - enclosed-exceptions ==1.0.2 + - encoding-io ==0.0.1 + - entropy ==0.3.7 + - enummapset-th ==0.6.1.1 + - envelope ==0.1.0.0 + - eq ==4.0.4 + - equivalence ==0.3.1 + - erf ==2.0.0.0 + - errors ==2.1.2 + - ersatz ==0.3.1 + - etcd ==1.0.5 + - ether ==0.4.0.2 + - euphoria ==0.8.0.0 + - event ==0.1.4 + - eventstore ==0.13.1.2 + - exact-combinatorics ==0.2.0.8 + - exact-pi ==0.4.1.2 + - exception-mtl ==0.4.0.1 + - exception-transformers ==0.4.0.4 + - exceptional ==0.3.0.0 + - exceptions ==0.8.3 + - executable-hash ==0.2.0.2 + - executable-path ==0.0.3 + - exp-pairs ==0.1.5.1 + - expiring-cache-map ==0.0.6.1 + - explicit-exception ==0.1.8 + - extensible ==0.3.7 + - extensible-effects ==1.11.0.4 + - extensible-exceptions ==0.1.1.4 + - extra ==1.4.10 + - extract-dependencies ==0.2.0.1 + - fail ==4.9.0.0 + - farmhash ==0.1.0.5 + - fast-builder ==0.0.0.6 + - fast-digits ==0.2.1.0 + - fast-logger ==2.4.6 + - fasta ==0.10.4.0 + - fay ==0.23.1.12 + - fay-base ==0.20.0.1 + - fay-builder ==0.2.0.5 + - fay-dom ==0.5.0.1 + - fay-jquery ==0.6.1.0 + - fay-text ==0.3.2.2 + - fay-uri ==0.2.0.0 + - fb ==1.0.13 + - fclabels ==2.0.3 + - feature-flags ==0.1.0.1 + - feed ==0.3.11.1 + - FenwickTree ==0.1.2.1 + - fft ==0.1.8.4 + - fgl ==5.5.3.0 + - fgl-arbitrary ==0.2.0.2 + - file-embed ==0.0.10 + - file-modules ==0.1.2.4 + - filecache ==0.2.9 + - filelock ==0.1.0.1 + - filemanip ==0.3.6.3 + - find-clumpiness ==0.2.0.1 + - FindBin ==0.0.5 + - fingertree ==0.1.1.0 + - fingertree-psqueue ==0.3 + - fixed ==0.2.1.1 + - fixed-vector ==0.8.1.0 + - fixed-vector-hetero ==0.3.1.1 + - flat-mcmc ==1.0.1 + - flexible-defaults ==0.0.1.2 + - flock ==0.3.1.8 + - flow ==1.0.7 + - fmlist ==0.9 + - fn ==0.3.0.1 + - focus ==0.1.5 + - fold-debounce ==0.2.0.2 + - fold-debounce-conduit ==0.1.0.2 + - foldl ==1.2.1 + - FontyFruity ==0.5.3.2 + - force-layout ==0.4.0.5 + - forecast-io ==0.2.0.0 + - foreign-store ==0.2 + - formatting ==6.2.2 + - fortran-src ==0.1.0.3 + - Frames ==0.1.6 + - free ==4.12.4 + - free-vl ==0.1.4 + - freenect ==1.2.1 + - freer ==0.2.3.0 + - friendly-time ==0.4 + - frisby ==0.2 + - frontmatter ==0.1.0.2 + - fsnotify ==0.2.1 + - fsnotify-conduit ==0.1.0.0 + - funcmp ==1.8 + - fuzzcheck ==0.1.1 + - gamma ==0.9.0.2 + - gd ==3000.7.3 + - Genbank ==1.0.3 + - generic-aeson ==0.2.0.8 + - generic-deriving ==1.11.1 + - generic-xmlpickler ==0.1.0.5 + - GenericPretty ==1.2.1 + - generics-eot ==0.2.1.1 + - generics-sop ==0.2.2.0 + - generics-sop-lens ==0.1.2.0 + - geniplate-mirror ==0.7.4 + - getopt-generics ==0.13 + - ghc-events ==0.4.4.0 + - ghc-exactprint ==0.5.2.1 + - ghc-heap-view ==0.5.7 + - ghc-mod ==5.6.0.0 + - ghc-paths ==0.1.0.9 + - ghc-syb-utils ==0.2.3 + - ghc-tcplugins-extra ==0.2 + - ghc-typelits-extra ==0.2 + - ghc-typelits-knownnat ==0.2.1 + - ghc-typelits-natnormalise ==0.5 + - ghcid ==0.6.5 + - ghcjs-codemirror ==0.0.0.1 + - ghcjs-hplay ==0.3.4 + - ghcjs-perch ==0.3.3 + - gi-atk ==2.0.3 + - gi-cairo ==1.0.3 + - gi-gdk ==3.0.3 + - gi-gdkpixbuf ==2.0.3 + - gi-gio ==2.0.3 + - gi-glib ==2.0.3 + - gi-gobject ==2.0.3 + - gi-gtk ==3.0.3 + - gi-javascriptcore ==3.0.3 + - gi-pango ==1.0.3 + - gi-soup ==2.4.3 + - gi-webkit ==3.0.3 + - gio ==0.13.3.0 + - gipeda ==0.3.2.2 + - giphy-api ==0.4.0.0 + - git-fmt ==0.4.1.0 + - github-types ==0.2.1 + - github-webhook-handler ==0.0.8 + - gitlib ==3.1.1 + - gitlib-libgit2 ==3.1.1 + - gitlib-test ==3.1.0.3 + - gitrev ==1.2.0 + - gitson ==0.5.2 + - gl ==0.7.8.1 + - glabrous ==0.1.2.0 + - GLFW-b ==1.4.8.0 + - glib ==0.13.4.0 + - Glob ==0.7.11 + - gloss ==1.10.2.3 + - gloss-rendering ==1.10.3.3 + - GLURaw ==2.0.0.2 + - GLUT ==2.7.0.10 + - gogol ==0.1.0 + - gogol-adexchange-buyer ==0.1.0 + - gogol-adexchange-seller ==0.1.0 + - gogol-admin-datatransfer ==0.1.0 + - gogol-admin-directory ==0.1.0 + - gogol-admin-emailmigration ==0.1.0 + - gogol-admin-reports ==0.1.0 + - gogol-adsense ==0.1.0 + - gogol-adsense-host ==0.1.0 + - gogol-affiliates ==0.1.0 + - gogol-analytics ==0.1.0 + - gogol-android-enterprise ==0.1.0 + - gogol-android-publisher ==0.1.0 + - gogol-appengine ==0.1.0 + - gogol-apps-activity ==0.1.0 + - gogol-apps-calendar ==0.1.0 + - gogol-apps-licensing ==0.1.0 + - gogol-apps-reseller ==0.1.0 + - gogol-apps-tasks ==0.1.0 + - gogol-appstate ==0.1.0 + - gogol-autoscaler ==0.1.0 + - gogol-bigquery ==0.1.0 + - gogol-billing ==0.1.0 + - gogol-blogger ==0.1.0 + - gogol-books ==0.1.0 + - gogol-civicinfo ==0.1.0 + - gogol-classroom ==0.1.0 + - gogol-cloudmonitoring ==0.1.0 + - gogol-cloudtrace ==0.1.0 + - gogol-compute ==0.1.0 + - gogol-container ==0.1.0 + - gogol-core ==0.1.0 + - gogol-customsearch ==0.1.0 + - gogol-dataflow ==0.1.0 + - gogol-dataproc ==0.1.0 + - gogol-datastore ==0.1.0 + - gogol-debugger ==0.1.0 + - gogol-deploymentmanager ==0.1.0 + - gogol-dfareporting ==0.1.0 + - gogol-discovery ==0.1.0 + - gogol-dns ==0.1.0 + - gogol-doubleclick-bids ==0.1.0 + - gogol-doubleclick-search ==0.1.0 + - gogol-drive ==0.1.0 + - gogol-firebase-rules ==0.1.0 + - gogol-fitness ==0.1.0 + - gogol-fonts ==0.1.0 + - gogol-freebasesearch ==0.1.0 + - gogol-fusiontables ==0.1.0 + - gogol-games ==0.1.0 + - gogol-games-configuration ==0.1.0 + - gogol-games-management ==0.1.0 + - gogol-genomics ==0.1.0 + - gogol-gmail ==0.1.0 + - gogol-groups-migration ==0.1.0 + - gogol-groups-settings ==0.1.0 + - gogol-identity-toolkit ==0.1.0 + - gogol-kgsearch ==0.1.0 + - gogol-latencytest ==0.1.0 + - gogol-logging ==0.1.0 + - gogol-maps-coordinate ==0.1.0 + - gogol-maps-engine ==0.1.0 + - gogol-mirror ==0.1.0 + - gogol-monitoring ==0.1.0 + - gogol-oauth2 ==0.1.0 + - gogol-pagespeed ==0.1.0 + - gogol-partners ==0.1.0 + - gogol-people ==0.1.0 + - gogol-play-moviespartner ==0.1.0 + - gogol-plus ==0.1.0 + - gogol-plus-domains ==0.1.0 + - gogol-prediction ==0.1.0 + - gogol-proximitybeacon ==0.1.0 + - gogol-pubsub ==0.1.0 + - gogol-qpxexpress ==0.1.0 + - gogol-replicapool ==0.1.0 + - gogol-replicapool-updater ==0.1.0 + - gogol-resourcemanager ==0.1.0 + - gogol-resourceviews ==0.1.0 + - gogol-script ==0.1.0 + - gogol-sheets ==0.1.0 + - gogol-shopping-content ==0.1.0 + - gogol-siteverification ==0.1.0 + - gogol-spectrum ==0.1.0 + - gogol-sqladmin ==0.1.0 + - gogol-storage ==0.1.0 + - gogol-storage-transfer ==0.1.0 + - gogol-tagmanager ==0.1.0 + - gogol-taskqueue ==0.1.0 + - gogol-translate ==0.1.0 + - gogol-urlshortener ==0.1.0 + - gogol-useraccounts ==0.1.0 + - gogol-vision ==0.1.0 + - gogol-webmaster-tools ==0.1.0 + - gogol-youtube ==0.1.0 + - gogol-youtube-analytics ==0.1.0 + - gogol-youtube-reporting ==0.1.0 + - google-cloud ==0.0.4 + - google-oauth2-jwt ==0.1.2.0 + - gpolyline ==0.1.0.1 + - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.5.1 + - graphs ==0.7 + - GraphSCC ==1.0.4 + - graphviz ==2999.18.1.2 + - gravatar ==0.8.0 + - graylog ==0.1.0.1 + - groom ==0.1.2 + - grouped-list ==0.2.1.2 + - groupoids ==4.0 + - groups ==0.4.0.0 + - gtk ==0.14.5 + - gtk2hs-buildtools ==0.13.2.1 + - gtk3 ==0.14.5 + - gtksourceview3 ==0.13.3.0 + - H ==0.9.0.1 + - hackage-db ==1.22 + - hackage-mirror ==0.1.1.1 + - hackage-security ==0.5.2.2 + - hackage-whatsnew ==0.1.0.1 + - hackmanager ==0.1.0.0 + - haddock-api ==2.17.3 + - haddock-library ==1.4.2 + - hailgun ==0.4.1.0 + - half ==0.2.2.3 + - hamlet ==1.2.0 + - HandsomeSoup ==0.4.2 + - handwriting ==0.1.0.3 + - hapistrano ==0.2.1.2 + - happstack-authenticate ==2.3.4.4 + - happstack-clientsession ==7.3.1 + - happstack-hsp ==7.3.7 + - happstack-jmacro ==7.0.11 + - happstack-server ==7.4.6.2 + - happstack-server-tls ==7.1.6.2 + - happy ==1.19.5 + - HaRe ==0.8.3.0 + - harp ==0.4.2 + - hashable ==1.2.4.0 + - hashable-extras ==0.2.3 + - hashable-time ==0.2 + - hashmap ==1.3.1.1 + - hashtables ==1.2.1.0 + - haskeline ==0.7.2.3 + - haskell-gi ==0.18 + - haskell-gi-base ==0.18.2 + - haskell-lexer ==1.0.1 + - haskell-names ==0.7.0 + - haskell-neo4j-client ==0.3.2.2 + - haskell-packages ==0.4 + - haskell-spacegoo ==0.2.0.1 + - haskell-src ==1.0.2.0 + - haskell-src-exts ==1.17.1 + - haskell-src-meta ==0.6.0.14 + - HaskellNet ==0.5.1 + - HaskellNet-SSL ==0.3.3.0 + - haskintex ==0.6.0.1 + - haskoin-core ==0.4.0 + - hasql ==0.19.15 + - hastache ==0.6.1 + - hasty-hamiltonian ==1.1.3 + - HaTeX ==3.17.0.2 + - hatex-guide ==1.3.1.5 + - hbayes ==0.5.2 + - hbeanstalk ==0.2.4 + - Hclip ==3.0.0.4 + - HCodecs ==0.5 + - hdaemonize ==0.5.2 + - HDBC ==2.4.0.1 + - HDBC-session ==0.1.1.0 + - hdevtools ==0.1.4.1 + - heap ==1.0.3 + - heaps ==0.3.3 + - hebrew-time ==0.1.1 + - hedis ==0.9.3 + - here ==1.2.8 + - heredoc ==0.2.0.0 + - hex ==0.1.2 + - hexstring ==0.11.1 + - hflags ==0.4.2 + - hformat ==0.1.0.1 + - hfsevents ==0.1.6 + - hgettext ==0.1.30 + - hid ==0.2.2 + - hidapi ==0.1.4 + - hierarchical-clustering ==0.4.6 + - highlighting-kate ==0.6.2.1 + - hindent ==4.6.4 + - hinotify ==0.3.8.1 + - hint ==0.6.0 + - histogram-fill ==0.8.4.1 + - hit ==0.6.3 + - hjsmin ==0.2.0.2 + - hjsonpointer ==1.0.0.0 + - hjsonschema ==1.1.0.1 + - hledger ==0.27.1 + - hledger-interest ==1.4.4 + - hledger-lib ==0.27.1 + - hlibgit2 ==0.18.0.15 + - hlibsass ==0.1.5.0 + - hlint ==1.9.35 + - hmatrix ==0.17.0.2 + - hmatrix-gsl ==0.17.0.0 + - hmatrix-gsl-stats ==0.4.1.3 + - hmatrix-special ==0.4.0.0 + - hmpfr ==0.4.2 + - hmt ==0.15 + - hoauth2 ==0.5.4.0 + - hocilib ==0.1.0 + - holy-project ==0.2.0.1 + - homplexity ==0.4.3.3 + - hoogle ==5.0.1 + - hOpenPGP ==2.5.1 + - hopenpgp-tools ==0.19.2 + - hopenssl ==1.7 + - hosc ==0.15 + - hostname ==1.0 + - hostname-validate ==1.0.0 + - hourglass ==0.2.10 + - hpack ==0.14.1 + - hpack-convert ==0.14.6 + - hpc-coveralls ==1.0.6 + - hPDB ==1.2.0.9 + - hPDB-examples ==1.2.0.7 + - HPDF ==1.4.10 + - hpio ==0.8.0.3 + - hprotoc ==2.4.0 + - hquantlib ==0.0.3.2 + - hreader ==1.0.2 + - hruby ==0.3.4.2 + - hs-bibutils ==5.5 + - hs-GeoIP ==0.3 + - hsass ==0.4.0 + - hsb2hs ==0.3.1 + - hscolour ==1.24.1 + - hsdns ==1.6.1 + - hse-cpp ==0.1 + - hsebaysdk ==0.4.0.0 + - hsemail ==1.7.7 + - HSet ==0.0.0 + - hset ==2.2.0 + - hsexif ==0.6.0.8 + - hsignal ==0.2.7.4 + - hslogger ==1.2.10 + - hslua ==0.4.1 + - hsndfile ==0.8.0 + - hsndfile-vector ==0.5.2 + - HsOpenSSL ==0.11.1.1 + - HsOpenSSL-x509-system ==0.1.0.3 + - hsp ==0.10.0 + - hspec ==2.2.3 + - hspec-attoparsec ==0.1.0.2 + - hspec-contrib ==0.3.0 + - hspec-core ==2.2.3 + - hspec-discover ==2.2.3 + - hspec-expectations ==0.7.2 + - hspec-expectations-pretty-diff ==0.7.2.4 + - hspec-golden-aeson ==0.2.0.3 + - hspec-jenkins ==0.1.1 + - hspec-megaparsec ==0.2.1 + - hspec-meta ==2.2.1 + - hspec-setup ==0.1.1.1 + - hspec-smallcheck ==0.4.1 + - hspec-wai ==0.6.6 + - hspec-wai-json ==0.6.1 + - hspec-webdriver ==1.2.0 + - hstatistics ==0.2.5.3 + - hstatsd ==0.1 + - HStringTemplate ==0.8.5 + - hsx-jmacro ==7.3.8 + - hsx2hs ==0.13.5 + - hsyslog ==4 + - htaglib ==1.0.4 + - HTF ==0.13.1.0 + - html ==1.0.1.2 + - html-conduit ==1.2.1 + - htoml ==1.0.0.1 + - HTTP ==4000.3.3 + - http-api-data ==0.2.4 + - http-client ==0.4.31.1 + - http-client-openssl ==0.2.0.3 + - http-client-tls ==0.2.4.1 + - http-common ==0.8.2.0 + - http-conduit ==2.1.11 + - http-date ==0.0.6.1 + - http-link-header ==1.0.2 + - http-media ==0.6.4 + - http-reverse-proxy ==0.4.3.1 + - http-streams ==0.8.4.0 + - http-types ==0.9.1 + - http2 ==1.6.2 + - httpd-shed ==0.4.0.3 + - human-readable-duration ==0.2.0.3 + - HUnit ==1.3.1.2 + - HUnit-approx ==1.0 + - hunit-dejafu ==0.3.0.2 + - hvect ==0.3.1.0 + - hw-bits ==0.1.0.0 + - hw-conduit ==0.0.0.11 + - hw-diagnostics ==0.0.0.3 + - hw-parser ==0.0.0.1 + - hw-prim ==0.1.0.0 + - hw-rankselect ==0.3.0.0 + - hw-succinct ==0.0.0.14 + - hweblib ==0.6.3 + - hworker ==0.1.0.1 + - hworker-ses ==0.1.1.0 + - hxt ==9.3.1.15 + - hxt-charproperties ==9.2.0.1 + - hxt-css ==0.1.0.3 + - hxt-http ==9.1.5.2 + - hxt-pickle-utils ==0.1.0.3 + - hxt-regex-xmlschema ==9.2.0.2 + - hxt-unicode ==9.0.2.4 + - hybrid-vectors ==0.2.1 + - hyphenation ==0.6 + - ical ==0.0.1 + - iconv ==0.4.1.3 + - identicon ==0.1.0 + - idris ==0.12.2 + - ieee754 ==0.7.8 + - IfElse ==0.85 + - ignore ==0.1.1.0 + - ilist ==0.2.0.0 + - imagesize-conduit ==1.1 + - imm ==1.0.1.0 + - immortal ==0.2.2 + - include-file ==0.1.0.3 + - incremental-parser ==0.2.4.1 + - indentation-core ==0.0 + - indentation-parsec ==0.0 + - indents ==0.3.3 + - inflections ==0.2.0.1 + - ini ==0.3.5 + - inline-c ==0.5.5.7 + - inline-c-cpp ==0.1.0.0 + - inline-r ==0.9.0.0 + - insert-ordered-containers ==0.1.0.1 + - integration ==0.2.1 + - intero ==0.1.18 + - interpolate ==0.1.0 + - interpolatedstring-perl6 ==1.0.0 + - IntervalMap ==0.5.1.1 + - intervals ==0.7.2 + - invariant ==0.4 + - io-choice ==0.0.6 + - io-machine ==0.2.0.0 + - io-manager ==0.1.0.2 + - io-memoize ==1.1.1.0 + - io-region ==0.1.1 + - io-storage ==0.3 + - io-streams ==1.3.5.0 + - io-streams-haproxy ==1.0.0.1 + - ip6addr ==0.5.1.2 + - iproute ==1.7.0 + - IPv6Addr ==0.6.1.0 + - irc ==0.6.1.0 + - irc-client ==0.4.3.0 + - irc-conduit ==0.2.0.0 + - irc-ctcp ==0.1.3.0 + - irc-dcc ==2.0.0 + - islink ==0.1.0.0 + - iso3166-country-codes ==0.20140203.7 + - iso639 ==0.1.0.3 + - iso8601-time ==0.1.4 + - iterable ==3.0 + - ix-shapable ==0.1.0 + - ixset ==1.0.7 + - ixset-typed ==0.3.1 + - jailbreak-cabal ==1.3.1 + - jmacro ==0.6.14 + - jmacro-rpc ==0.3.2 + - jmacro-rpc-happstack ==0.3.2 + - jose ==0.4.0.2 + - jose-jwt ==0.7 + - js-flot ==0.8.3 + - js-jquery ==3.1.0 + - json ==0.9.1 + - json-autotype ==1.0.14 + - json-rpc-generic ==0.2.1.1 + - json-schema ==0.7.4.1 + - JuicyPixels ==3.2.8 + - JuicyPixels-extra ==0.1.0 + - JuicyPixels-scale-dct ==0.1.1.2 + - jwt ==0.7.2 + - kan-extensions ==5.0.1 + - kansas-comet ==0.4 + - kawhi ==0.0.1 + - kdt ==0.2.4 + - keter ==1.4.3.2 + - keycode ==0.2.2 + - keys ==3.11 + - kmeans ==0.1.3 + - knob ==0.1.1 + - koofr-client ==1.0.0.3 + - kraken ==0.0.3 + - lackey ==0.4.0 + - language-c ==0.5.0 + - language-c-quote ==0.11.6.3 + - language-dockerfile ==0.3.4.0 + - language-ecmascript ==0.17.1.0 + - language-fortran ==0.5.1 + - language-glsl ==0.2.0 + - language-haskell-extract ==0.2.4 + - language-java ==0.2.8 + - language-javascript ==0.6.0.8 + - language-lua2 ==0.1.0.5 + - language-nix ==2.1.0.1 + - language-puppet ==1.3.1.1 + - language-thrift ==0.9.0.2 + - largeword ==1.2.5 + - lattices ==1.5.0 + - lazy-csv ==0.5.1 + - lca ==0.3 + - leapseconds-announced ==2017 + - lens ==4.14 + - lens-action ==0.2.0.2 + - lens-aeson ==1.0.0.5 + - lens-datetime ==0.3 + - lens-family ==1.2.1 + - lens-family-core ==1.2.1 + - lens-family-th ==0.5.0.0 + - lens-regex ==0.1.0 + - lens-simple ==0.1.0.9 + - leveldb-haskell ==0.6.4 + - lexer-applicative ==2.1.0.1 + - lhs2tex ==1.19 + - libgit ==0.3.1 + - libinfluxdb ==0.0.4 + - libmpd ==0.9.0.6 + - libnotify ==0.2 + - libxml-sax ==0.7.5 + - LibZip ==1.0.1 + - lift-generics ==0.1.1 + - lifted-async ==0.9.0 + - lifted-base ==0.2.3.8 + - linear ==1.20.5 + - linear-accelerate ==0.2 + - linux-file-extents ==0.2.0.0 + - linux-namespaces ==0.1.2.0 + - list-fusion-probe ==0.1.0.6 + - list-prompt ==0.1.1.0 + - list-t ==1 + - ListLike ==4.5 + - load-env ==0.1.1 + - loch-th ==0.2.1 + - log-domain ==0.10.3.1 + - logfloat ==0.13.3.3 + - logging-facade ==0.1.1 + - logict ==0.6.0.2 + - loop ==0.3.0 + - lrucache ==1.2.0.0 + - lrucaching ==0.3.0 + - ltext ==0.1.2.1 + - lucid ==2.9.6 + - lucid-svg ==0.7.0.0 + - machines ==0.6.1 + - magic ==1.1 + - mainland-pretty ==0.4.1.4 + - makefile ==0.1.0.5 + - managed ==1.0.5 + - mandrill ==0.5.2.3 + - markdown ==0.1.14 + - markdown-unlit ==0.4.0 + - markup ==3.1.0 + - math-functions ==0.2.0.1 + - matrices ==0.4.3 + - matrix ==0.3.5.0 + - maximal-cliques ==0.1.1 + - mbox ==0.3.3 + - mcmc-types ==1.0.1 + - megaparsec ==5.0.1 + - memory ==0.13 + - MemoTrie ==0.6.4 + - mersenne-random ==1.0.0.1 + - mersenne-random-pure64 ==0.2.0.5 + - messagepack ==0.5.3 + - messagepack-rpc ==0.5.1 + - metrics ==0.3.0.2 + - MFlow ==0.4.6.0 + - microformats2-parser ==1.0.1.5 + - microlens ==0.4.7.0 + - microlens-aeson ==2.1.1.1 + - microlens-contra ==0.1.0.1 + - microlens-ghc ==0.4.7.0 + - microlens-mtl ==0.1.10.0 + - microlens-platform ==0.3.7.0 + - microlens-th ==0.4.1.0 + - mighty-metropolis ==1.0.2 + - mime-mail ==0.4.11 + - mime-mail-ses ==0.3.2.2 + - mime-types ==0.1.0.7 + - misfortune ==0.1.1.2 + - missing-foreign ==0.1.1 + - MissingH ==1.4.0.1 + - mmap ==0.5.9 + - mmorph ==1.0.6 + - mockery ==0.3.3 + - modify-fasta ==0.8.2.1 + - moesocks ==1.0.0.41 + - monad-control ==1.0.1.0 + - monad-coroutine ==0.9.0.3 + - monad-extras ==0.5.11 + - monad-http ==0.1.0.0 + - monad-journal ==0.7.2 + - monad-logger ==0.3.19 + - monad-logger-json ==0.1.0.0 + - monad-logger-prefix ==0.1.5 + - monad-logger-syslog ==0.1.2.0 + - monad-loops ==0.4.3 + - monad-par ==0.3.4.8 + - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.2 + - monad-peel ==0.2.1.1 + - monad-primitive ==0.1 + - monad-products ==4.0.1 + - monad-skeleton ==0.1.2.2 + - monad-time ==0.2 + - monad-unlift ==0.2.0 + - monad-unlift-ref ==0.2.0 + - monadcryptorandom ==0.7.0 + - monadic-arrays ==0.2.2 + - monadLib ==3.7.3 + - monadloc ==0.7.1 + - monadplus ==1.4.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.4.2.3 + - monads-tf ==0.1.0.3 + - mongoDB ==2.1.1.1 + - mono-traversable ==1.0.0.1 + - mono-traversable-instances ==0.1.0.0 + - monoid-extras ==0.4.2 + - monoid-subclasses ==0.4.2.1 + - monoidal-containers ==0.3.0.0 + - morte ==1.6.2 + - mountpoints ==1.0.2 + - mtl ==2.2.1 + - mtl-compat ==0.2.1.3 + - mtl-prelude ==2.0.3.1 + - multiarg ==0.30.0.10 + - multimap ==1.2.1 + - multipart ==0.1.2 + - multiset ==0.3.3 + - multiset-comb ==0.2.4.1 + - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.3 + - MusicBrainz ==0.2.4 + - mustache ==2.1 + - mutable-containers ==0.3.3 + - mwc-probability ==1.2.1 + - mwc-random ==0.13.4.0 + - mwc-random-monad ==0.7.3.1 + - nagios-check ==0.3.2 + - names-th ==0.2.0.2 + - nano-erl ==0.1.0.1 + - nanospec ==0.2.1 + - nationstates ==0.5.0.0 + - nats ==1.1.1 + - natural-sort ==0.1.2 + - natural-transformation ==0.3.1 + - ndjson-conduit ==0.1.0.3 + - neat-interpolation ==0.3.2.1 + - netpbm ==1.0.2 + - nettle ==0.2.0 + - network ==2.6.3.1 + - network-anonymous-i2p ==0.10.0 + - network-anonymous-tor ==0.11.0 + - network-attoparsec ==0.12.2 + - network-conduit-tls ==1.2.2 + - network-house ==0.1.0.2 + - network-info ==0.2.0.8 + - network-simple ==0.4.0.5 + - network-transport ==0.4.4.0 + - network-transport-composed ==0.2.0.1 + - network-transport-inmemory ==0.5.1 + - network-transport-tcp ==0.5.1 + - network-transport-tests ==0.2.3.0 + - network-uri ==2.6.1.0 + - network-uri-flag ==0.1 + - newtype ==0.2 + - nicify-lib ==1.0.1 + - nix-paths ==1.0.0.1 + - non-empty-sequence ==0.2.0.2 + - nonce ==1.0.2 + - NoTrace ==0.3.0.1 + - nsis ==0.3 + - numbers ==3000.2.0.1 + - numeric-extras ==0.1 + - NumInstances ==1.4 + - numtype-dk ==0.5.0.1 + - objective ==1.1.1 + - ObjectName ==1.1.0.1 + - octane ==0.16.1 + - Octree ==0.5.4.3 + - oeis ==0.3.7 + - ofx ==0.4.2.0 + - old-locale ==1.0.0.7 + - old-time ==1.1.0.3 + - omnifmt ==0.2.1.1 + - once ==0.2 + - OneTuple ==0.2.1 + - oo-prototypes ==0.1.0.0 + - opaleye ==0.5.1.1 + - opaleye-trans ==0.3.3 + - open-browser ==0.2.1.0 + - OpenGL ==3.0.1.0 + - OpenGLRaw ==3.2.2.0 + - openpgp-asciiarmor ==0.1 + - opensource ==0.1.0.0 + - openssl-streams ==1.2.1.0 + - operational ==0.2.3.3 + - operational-class ==0.3.0.0 + - opml-conduit ==0.5.0.1 + - optional-args ==1.0.1 + - options ==1.2.1.1 + - optparse-applicative ==0.12.1.0 + - optparse-generic ==1.1.1 + - optparse-helper ==0.2.1.1 + - optparse-simple ==0.0.3 + - optparse-text ==0.1.1.0 + - osdkeys ==0.0 + - overloaded-records ==0.4.2.0 + - package-description-remote ==0.2.0.0 + - packdeps ==0.4.2.1 + - pager ==0.1.1.0 + - pagerduty ==0.0.7 + - pagination ==0.1.0 + - palette ==0.1.0.4 + - pandoc ==1.17.1 + - pandoc-citeproc ==0.10.1 + - pandoc-types ==1.16.1.1 + - pango ==0.13.3.0 + - parallel ==3.2.1.0 + - parallel-io ==0.3.3 + - parseargs ==0.2.0.7 + - parsec ==3.1.11 + - parsers ==0.12.4 + - partial-handler ==1.0.1 + - path ==0.5.9 + - path-extra ==0.0.3 + - path-io ==1.2.0 + - path-pieces ==0.2.1 + - pathwalk ==0.3.1.2 + - patience ==0.1.1 + - pattern-arrows ==0.0.2 + - pbkdf ==1.1.1.1 + - pcap ==0.4.5.2 + - pcre-heavy ==1.0.0.2 + - pcre-light ==0.4.0.4 + - pcre-utils ==0.1.8.1 + - pdf-toolbox-content ==0.0.5.1 + - pdf-toolbox-core ==0.0.4.1 + - pdf-toolbox-document ==0.0.7.1 + - pdfinfo ==1.5.4 + - pem ==0.2.2 + - permutation ==0.5.0.5 + - persistable-record ==0.4.0.2 + - persistable-types-HDBC-pg ==0.0.1.4 + - persistent ==2.6 + - persistent-postgresql ==2.6 + - persistent-redis ==2.5.2 + - persistent-refs ==0.4 + - persistent-sqlite ==2.6 + - persistent-template ==2.5.1.6 + - pgp-wordlist ==0.1.0.1 + - phantom-state ==0.2.1.2 + - picoparsec ==0.1.2.3 + - pinboard ==0.9.6 + - pinch ==0.3.0.1 + - pinchot ==0.22.0.0 + - pipes ==4.1.9 + - pipes-aeson ==0.4.1.6 + - pipes-attoparsec ==0.5.1.4 + - pipes-bgzf ==0.2.0.1 + - pipes-bytestring ==2.1.3 + - pipes-cacophony ==0.4.0 + - pipes-cliff ==0.12.0.0 + - pipes-concurrency ==2.0.6 + - pipes-csv ==1.4.3 + - pipes-extras ==1.0.5 + - pipes-fastx ==0.3.0.0 + - pipes-group ==1.0.5 + - pipes-http ==1.0.4 + - pipes-illumina ==0.1.0.0 + - pipes-mongodb ==0.1.0.0 + - pipes-network ==0.6.4.1 + - pipes-parse ==3.0.7 + - pipes-random ==1.0.0.1 + - pipes-safe ==2.2.4 + - pipes-text ==0.0.2.4 + - pipes-wai ==3.2.0 + - pixelated-avatar-generator ==0.1.3 + - pkcs10 ==0.1.1.0 + - placeholders ==0.1 + - plan-b ==0.2.0 + - point-octree ==0.5.5.3 + - pointed ==5 + - pointedlist ==0.6.1 + - pointful ==1.0.8 + - pointless-fun ==1.1.0.6 + - polynomials-bernstein ==1.1.2 + - polyparse ==1.12 + - posix-realtime ==0.0.0.4 + - post-mess-age ==0.2.1.0 + - postgresql-binary ==0.9.1 + - postgresql-libpq ==0.9.2.0 + - postgresql-query ==3.0.1 + - postgresql-schema ==0.1.10 + - postgresql-simple ==0.5.2.1 + - postgresql-simple-url ==0.1.0.1 + - postgresql-transactional ==1.1.1 + - pred-set ==0.0.1 + - prednote ==0.36.0.4 + - prefix-units ==0.2.0 + - prelude-extras ==0.4.0.3 + - prelude-safeenum ==0.1.1.2 + - preprocessor-tools ==1.0.1 + - presburger ==1.3.1 + - pretty-class ==1.0.1.1 + - pretty-hex ==1.0 + - pretty-show ==1.6.12 + - pretty-types ==0.2.3.0 + - prettyclass ==1.0.0.0 + - primes ==0.2.1.0 + - primitive ==0.6.1.0 + - process-extras ==0.4.1.4 + - product-profunctors ==0.7.1.0 + - profiteur ==0.3.0.2 + - profunctor-extras ==4.0 + - profunctors ==5.2 + - project-template ==0.2.0 + - projectroot ==0.2.0.1 + - prometheus-client ==0.1.0.1 + - prometheus-metrics-ghc ==0.1.0.1 + - prompt ==0.1.1.2 + - protobuf ==0.2.1.1 + - protobuf-simple ==0.1.0.1 + - protocol-buffers ==2.4.0 + - protocol-buffers-descriptor ==2.4.0 + - protolude ==0.1.7 + - proxied ==0.2 + - psql-helpers ==0.1.0.0 + - PSQueue ==1.1 + - psqueues ==0.2.2.2 + - publicsuffix ==0.20160716 + - pure-cdb ==0.1.2 + - pure-io ==0.2.1 + - pureMD5 ==2.1.3 + - purescript ==0.9.3 + - purescript-bridge ==0.8.0.0 + - pwstore-fast ==2.4.4 + - pwstore-purehaskell ==2.1.4 + - quantum-random ==0.6.3 + - QuasiText ==0.1.2.6 + - questioner ==0.1.1.0 + - QuickCheck ==2.8.2 + - quickcheck-arbitrary-adt ==0.2.0.0 + - quickcheck-assertions ==0.2.0 + - quickcheck-combinators ==0.0.1 + - quickcheck-instances ==0.3.12 + - quickcheck-io ==0.1.3 + - quickcheck-properties ==0.1 + - quickcheck-simple ==0.1.0.1 + - quickcheck-text ==0.1.1.0 + - quickcheck-unicode ==1.0.0.1 + - rainbow ==0.28.0.4 + - rainbox ==0.18.0.10 + - random ==1.1 + - random-fu ==0.2.7.0 + - random-shuffle ==0.0.4 + - random-source ==0.3.0.6 + - random-tree ==0.6.0.5 + - range ==0.1.2.0 + - range-set-list ==0.1.2.0 + - rank1dynamic ==0.3.3.0 + - Rasterific ==0.6.1.1 + - rasterific-svg ==0.3.1.2 + - ratel ==0.3.1 + - ratel-wai ==0.2.0 + - raw-strings-qq ==1.1 + - read-editor ==0.1.0.2 + - read-env-var ==0.1.0.1 + - readable ==0.3.1 + - ReadArgs ==1.2.2 + - readline ==1.0.3.0 + - rebase ==1 + - redis-io ==0.7.0 + - redis-resp ==0.4.0 + - reducers ==3.12.1 + - ref-fd ==0.4.0.1 + - refact ==0.3.0.2 + - reflection ==2.1.2 + - reform ==0.2.7.1 + - reform-blaze ==0.2.4.1 + - reform-hamlet ==0.0.5.1 + - reform-happstack ==0.2.5.1 + - reform-hsp ==0.2.7 + - RefSerialize ==0.3.1.4 + - regex-applicative ==0.3.3 + - regex-applicative-text ==0.1.0.1 + - regex-base ==0.93.2 + - regex-compat ==0.95.1 + - regex-compat-tdfa ==0.95.1.4 + - regex-pcre ==0.94.4 + - regex-pcre-builtin ==0.94.4.8.8.35 + - regex-posix ==0.95.2 + - regex-tdfa ==1.2.2 + - regex-tdfa-text ==1.0.0.3 + - reinterpret-cast ==0.1.0 + - relational-query ==0.8.3.1 + - relational-query-HDBC ==0.6.0.2 + - relational-record ==0.1.5.1 + - relational-schemas ==0.1.3.1 + - renderable ==0.2.0.1 + - repa ==3.4.1.1 + - repa-algorithms ==3.4.1.1 + - repa-io ==3.4.1.1 + - RepLib ==0.5.4 + - reroute ==0.4.0.1 + - resolve-trivial-conflicts ==0.3.2.2 + - resource-pool ==0.2.3.2 + - resourcet ==1.1.7.5 + - rest-client ==0.5.1.1 + - rest-core ==0.39 + - rest-gen ==0.19.0.3 + - rest-happstack ==0.3.1.1 + - rest-stringmap ==0.2.0.6 + - rest-types ==1.14.1.1 + - rest-wai ==0.2.0.1 + - result ==0.2.5.0 + - rethinkdb ==2.2.0.6 + - rethinkdb-client-driver ==0.0.23 + - retry ==0.7.4.1 + - rev-state ==0.1.2 + - rfc5051 ==0.1.0.3 + - rng-utils ==0.2.1 + - rose-trees ==0.0.4.3 + - rosezipper ==0.2 + - rotating-log ==0.4 + - RSA ==2.2.0 + - rss-conduit ==0.2.0.2 + - runmemo ==1.0.0.1 + - rvar ==0.2.0.3 + - s3-signer ==0.3.0.0 + - safe ==0.3.9 + - safe-exceptions ==0.1.4.0 + - safecopy ==0.9.1 + - SafeSemaphore ==0.10.1 + - sampling ==0.2.0 + - sandi ==0.4.0 + - sandman ==0.2.0.1 + - sbv ==5.12 + - scalpel ==0.3.1 + - scanner ==0.2 + - scientific ==0.3.4.9 + - scotty ==0.11.0 + - scrape-changes ==0.1.0.3 + - scrypt ==0.5.0 + - sdl2 ==2.1.3 + - secp256k1 ==0.4.6 + - securemem ==0.1.9 + - SegmentTree ==0.3 + - semigroupoid-extras ==5 + - semigroupoids ==5.1 + - semigroups ==0.18.2 + - semiring-simple ==1.0.0.1 + - semver ==0.3.3.1 + - sendfile ==0.7.9 + - seqalign ==0.2.0.4 + - seqloc ==0.6.1.1 + - serf ==0.1.1.0 + - servant ==0.8.1 + - servant-aeson-specs ==0.5.1.1 + - servant-auth-cookie ==0.3.1 + - servant-blaze ==0.7.1 + - servant-cassava ==0.8 + - servant-client ==0.8.1 + - servant-docs ==0.8.1 + - servant-foreign ==0.8.1 + - servant-js ==0.8.1 + - servant-JuicyPixels ==0.3.0.2 + - servant-lucid ==0.7.1 + - servant-mock ==0.8.1 + - servant-purescript ==0.3.1.5 + - servant-server ==0.8.1 + - servant-subscriber ==0.5.0.2 + - servant-swagger ==1.1.2 + - servant-swagger-ui ==0.2.0.2.1.5 + - servant-yaml ==0.1.0.0 + - serversession ==1.0.1 + - serversession-backend-acid-state ==1.0.3 + - serversession-frontend-wai ==1.0 + - serversession-frontend-yesod ==1.0 + - servius ==1.2.0.2 + - set-monad ==0.2.0.0 + - setenv ==0.1.1.3 + - setlocale ==1.0.0.4 + - sets ==0.0.5 + - SHA ==1.6.4.2 + - shake ==0.15.10 + - shake-language-c ==0.10.0 + - shakespeare ==2.0.11.1 + - shell-conduit ==4.5.2 + - ShellCheck ==0.4.4 + - shelly ==1.6.8 + - shortcut-links ==0.4.2.0 + - should-not-typecheck ==2.1.0 + - show-type ==0.1.1 + - signal ==0.1.0.3 + - silently ==1.2.5 + - simple ==0.11.1 + - simple-download ==0.0.2 + - simple-log ==0.4.0 + - simple-reflect ==0.3.2 + - simple-sendfile ==0.2.25 + - simple-session ==0.10.1.1 + - simple-smt ==0.6.0 + - simple-templates ==0.8.0.1 + - singleton-bool ==0.1.1.0 + - singletons ==2.2 + - siphash ==1.0.3 + - skein ==1.0.9.4 + - skeletons ==0.4.0 + - slave-thread ==1.0.2 + - slug ==0.1.5 + - smallcaps ==0.6.0.3 + - smallcheck ==1.1.1 + - smoothie ==0.4.2.3 + - 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 + - snowflake ==0.1.1.1 + - soap ==0.2.3.1 + - soap-openssl ==0.1.0.2 + - soap-tls ==0.1.1.2 + - socket ==0.6.1.0 + - socks ==0.5.5 + - solga ==0.1.0.1 + - solga-swagger ==0.1.0.1 + - sorted-list ==0.2.0.0 + - sourcemap ==0.1.6 + - spdx ==0.2.1.0 + - speculation ==1.5.0.3 + - speedy-slice ==0.1.3 + - sphinx ==0.6.0.1 + - Spintax ==0.1.0.0 + - splice ==0.6.1.1 + - split ==0.2.3.1 + - Spock ==0.11.0.0 + - Spock-api ==0.11.0.0 + - Spock-api-server ==0.11.0.0 + - Spock-core ==0.11.0.0 + - Spock-lucid ==0.3.0.0 + - Spock-worker ==0.3.1.0 + - spool ==0.1 + - spoon ==0.3.1 + - sql-words ==0.1.4.1 + - sqlite-simple ==0.4.9.0 + - srcloc ==0.5.1.0 + - stache ==0.1.6 + - stack ==1.1.2 + - stack-run-auto ==0.1.1.4 + - stackage-curator ==0.14.1.1 + - stackage-types ==1.2.0 + - state-plus ==0.1.2 + - stateref ==0.3 + - statestack ==0.2.0.5 + - StateVar ==1.1.0.4 + - stateWriter ==0.2.8 + - static-canvas ==0.2.0.3 + - statistics ==0.13.3.0 + - stm ==2.4.4.1 + - stm-chans ==3.0.0.4 + - stm-conduit ==3.0.0 + - stm-containers ==0.2.15 + - stm-delay ==0.1.1.1 + - stm-stats ==0.2.0.0 + - STMonadTrans ==0.3.3 + - stopwatch ==0.1.0.2 + - storable-complex ==0.2.2 + - storable-endian ==0.2.5 + - storable-record ==0.0.3.1 + - store ==0.2.1.2 + - store-core ==0.2.0.2 + - Strafunski-StrategyLib ==5.0.0.9 + - stratosphere ==0.1.4 + - streaming ==0.1.4.3 + - streaming-bytestring ==0.1.4.4 + - streaming-commons ==0.1.15.5 + - streamproc ==1.6.2 + - streams ==3.3 + - strict ==0.3.2 + - strict-base-types ==0.5.0 + - string-class ==0.1.6.5 + - string-combinators ==0.6.0.5 + - string-conv ==0.1.2 + - string-conversions ==0.4 + - string-qq ==0.0.2 + - stringable ==0.1.3 + - stringbuilder ==0.5.0 + - stringsearch ==0.3.6.6 + - stripe-core ==2.1.0 + - strive ==3.0.1 + - stylish-haskell ==0.6.1.0 + - success ==0.2.6 + - sundown ==0.6 + - svg-builder ==0.1.0.1 + - svg-tree ==0.5.1.2 + - SVGFonts ==1.5.0.1 + - swagger ==0.2.2 + - swagger2 ==2.1.2.1 + - syb ==0.6 + - syb-with-class ==0.6.1.7 + - symbol ==0.2.4 + - symengine ==0.1.2.0 + - system-argv0 ==0.1.1 + - system-fileio ==0.3.16.3 + - system-filepath ==0.4.13.4 + - system-posix-redirect ==1.1.0.1 + - syz ==0.2.0.0 + - tabular ==0.2.2.7 + - tagged ==0.8.5 + - tagged-binary ==0.2.0.0 + - taggy ==0.2.0 + - taggy-lens ==0.1.2 + - tagshare ==0.0 + - tagsoup ==0.14 + - tagstream-conduit ==0.5.5.3 + - tar ==0.5.0.3 + - tardis ==0.4.1.0 + - tasty ==0.11.0.4 + - tasty-ant-xml ==1.0.2 + - tasty-dejafu ==0.3.0.2 + - tasty-expected-failure ==0.11.0.4 + - tasty-golden ==2.3.1.1 + - tasty-hspec ==1.1.3 + - tasty-html ==0.4.1.1 + - tasty-hunit ==0.9.2 + - tasty-kat ==0.0.3 + - tasty-program ==1.0.5 + - tasty-quickcheck ==0.8.4 + - tasty-rerun ==1.1.6 + - tasty-silver ==3.1.9 + - tasty-smallcheck ==0.8.1 + - tasty-th ==0.1.4 + - TCache ==0.12.0 + - tcp-streams ==0.4.0.0 + - template ==0.2.0.10 + - temporary ==1.2.0.4 + - temporary-rc ==1.2.0.3 + - terminal-progress-bar ==0.0.1.4 + - terminal-size ==0.3.2.1 + - terminfo ==0.4.0.2 + - test-fixture ==0.4.0.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 + - testing-feat ==0.4.0.3 + - texmath ==0.8.6.5 + - text ==1.2.2.1 + - text-all ==0.3.0.2 + - text-binary ==0.2.1 + - text-conversions ==0.3.0 + - text-format ==0.3.1.1 + - text-icu ==0.7.0.1 + - text-ldap ==0.1.1.8 + - text-manipulate ==0.2.0.1 + - text-metrics ==0.1.0 + - text-postgresql ==0.0.2.1 + - text-region ==0.1.0.1 + - text-show ==3.4 + - text-show-instances ==3.4 + - tf-random ==0.5 + - th-data-compat ==0.0.2.2 + - th-desugar ==1.6 + - th-expand-syns ==0.4.0.0 + - th-extras ==0.0.0.4 + - th-lift ==0.7.6 + - th-lift-instances ==0.1.10 + - th-orphans ==0.13.2 + - th-printf ==0.3.1 + - th-reify-compat ==0.0.1.1 + - th-reify-many ==0.1.6 + - th-utilities ==0.2.0.1 + - these ==0.7.2 + - threads ==0.5.1.4 + - through-text ==0.1.0.0 + - thumbnail-plus ==1.0.5 + - thyme ==0.3.5.5 + - tidal ==0.8.1 + - time-compat ==0.1.0.3 + - time-lens ==0.4.0.1 + - time-locale-compat ==0.1.1.3 + - time-parsers ==0.1.1.0 + - timeit ==1.0.0.0 + - timelens ==0.2.0.2 + - timemap ==0.0.4 + - timerep ==2.0.0.2 + - timezone-olson ==0.1.7 + - timezone-series ==0.1.6.1 + - tinylog ==0.14.0 + - tinytemplate ==0.1.2.0 + - tls ==1.3.8 + - tls-debug ==0.4.4 + - token-bucket ==0.1.0.1 + - tostring ==0.2.1.1 + - transformers-base ==0.4.4 + - transformers-compat ==0.5.1.4 + - transformers-lift ==0.1.0.1 + - transient ==0.4.2.2 + - transient-universe ==0.3.2.3 + - traverse-with-class ==0.2.0.4 + - tree-fun ==0.8.1.0 + - tree-view ==0.4 + - tries ==0.0.4 + - trifecta ==1.6 + - true-name ==0.1.0.2 + - ttrie ==0.1.2.1 + - tttool ==1.6.1.2 + - tuple ==0.3.0.2 + - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 + - turtle ==1.2.8 + - turtle-options ==0.1.0.4 + - twitter-conduit ==0.2.1 + - twitter-feed ==0.2.0.9 + - twitter-types ==0.7.2.2 + - twitter-types-lens ==0.7.2 + - type-aligned ==0.9.6 + - type-eq ==0.5 + - type-fun ==0.1.1 + - type-level-numbers ==0.1.1.1 + - type-list ==0.5.0.0 + - type-spec ==0.2.0.0 + - typelits-witnesses ==0.2.3.0 + - typography-geometry ==1.0.0.1 + - tzdata ==0.1.20160614.0 + - ua-parser ==0.7.1 + - uglymemo ==0.1.0.1 + - unbound ==0.5.1 + - unbound-generics ==0.3.1 + - unbounded-delays ==0.1.0.9 + - uncertain ==0.3.1.0 + - unexceptionalio ==0.3.0 + - unfoldable ==0.8.4 + - unfoldable-restricted ==0.0.2 + - unicode-show ==0.1.0.2 + - unicode-transforms ==0.1.0.1 + - unification-fd ==0.10.0.1 + - union ==0.1.1.1 + - union-find ==0.2 + - uniplate ==1.6.12 + - unit-constraint ==0.0.0 + - units ==2.4 + - units-defs ==2.0.1.1 + - units-parser ==0.1.0.0 + - universe ==1.0 + - universe-base ==1.0.2.1 + - universe-instances-base ==1.0 + - universe-instances-extended ==1.0.0.1 + - universe-instances-trans ==1.0.0.1 + - universe-reverse-instances ==1.0 + - unix-bytestring ==0.3.7.3 + - unix-compat ==0.4.2.0 + - unix-time ==0.3.7 + - Unixutils ==1.54.1 + - unordered-containers ==0.2.7.1 + - uri-bytestring ==0.2.2.0 + - uri-encode ==1.5.0.5 + - url ==2.1.3 + - urlpath ==5.0.0.1 + - userid ==0.1.2.7 + - users ==0.5.0.0 + - users-postgresql-simple ==0.5.0.2 + - users-test ==0.5.0.1 + - utf8-light ==0.4.2 + - utf8-string ==1.0.1.1 + - utility-ht ==0.0.12 + - uu-interleaved ==0.2.0.0 + - uu-parsinglib ==2.9.1.1 + - uuid ==1.3.12 + - uuid-orphans ==1.4.1 + - uuid-types ==1.0.3 + - vado ==0.0.7 + - validate-input ==0.4.0.0 + - validation ==0.5.3 + - varying ==0.5.0.3 + - vault ==0.3.0.6 + - vcswrapper ==0.1.3 + - vector ==0.11.0.0 + - vector-algorithms ==0.7.0.1 + - vector-binary-instances ==0.2.3.2 + - vector-buffer ==0.4.1 + - vector-fftw ==0.1.3.7 + - vector-instances ==3.3.1 + - vector-space ==0.10.4 + - vector-th-unbox ==0.2.1.6 + - vectortiles ==1.2.0 + - versions ==3.0.0 + - vhd ==0.2.2 + - ViennaRNAParser ==1.2.9 + - vinyl ==0.5.2 + - vinyl-utils ==0.3.0.0 + - void ==0.7.1 + - vty ==5.11 + - wai ==3.2.1.1 + - wai-app-static ==3.1.6.1 + - wai-conduit ==3.0.0.3 + - wai-cors ==0.2.5 + - wai-eventsource ==3.0.0 + - wai-extra ==3.0.17 + - wai-logger ==2.3.0 + - wai-middleware-caching ==0.1.0.2 + - wai-middleware-caching-lru ==0.1.0.0 + - wai-middleware-caching-redis ==0.2.0.0 + - wai-middleware-consul ==0.1.0.2 + - wai-middleware-content-type ==0.4.1 + - wai-middleware-crowd ==0.1.4.2 + - wai-middleware-metrics ==0.2.3 + - wai-middleware-prometheus ==0.1.0.1 + - wai-middleware-static ==0.8.0 + - wai-middleware-throttle ==0.2.1.0 + - wai-middleware-verbs ==0.3.2 + - wai-predicates ==0.9.0 + - wai-request-spec ==0.10.2.1 + - wai-session ==0.3.2 + - wai-session-postgresql ==0.2.1.0 + - wai-transformers ==0.0.7 + - wai-websockets ==3.0.1.1 + - waitra ==0.0.4.0 + - warp ==3.2.8 + - warp-tls ==3.2.2 + - web-plugins ==0.2.9 + - web-routes ==0.27.11 + - web-routes-boomerang ==0.28.4.2 + - web-routes-happstack ==0.23.10 + - web-routes-hsp ==0.24.6.1 + - web-routes-th ==0.22.5 + - web-routes-wai ==0.24.3 + - webdriver ==0.8.3 + - webdriver-angular ==0.1.11 + - webkitgtk3 ==0.14.2.0 + - webkitgtk3-javascriptcore ==0.14.2.0 + - webpage ==0.0.4 + - webrtc-vad ==0.1.0.3 + - websockets ==0.9.7.0 + - weigh ==0.0.3 + - werewolf ==1.5.1.1 + - werewolf-slack ==1.0.2.0 + - wikicfp-scraper ==0.1.0.3 + - Win32 ==2.3.1.1 + - Win32-extras ==0.2.0.1 + - Win32-notify ==0.3.0.1 + - with-location ==0.1.0 + - withdependencies ==0.2.3 + - witherable ==0.1.3.3 + - wizards ==1.0.2 + - wl-pprint ==1.2 + - wl-pprint-extras ==3.5.0.5 + - wl-pprint-terminfo ==3.7.1.4 + - wl-pprint-text ==1.1.0.4 + - word-trie ==0.3.0 + - word8 ==0.1.2 + - wordpass ==1.0.0.6 + - Workflow ==0.8.3 + - wrap ==0.0.0 + - wreq ==0.4.1.0 + - writer-cps-mtl ==0.1.0.2 + - writer-cps-transformers ==0.1.0.2 + - wuss ==1.1.1 + - X11 ==1.6.1.2 + - x509 ==1.6.3 + - x509-store ==1.6.1 + - x509-system ==1.6.3 + - x509-validation ==1.6.3 + - Xauth ==0.1 + - xdcc ==1.1.3 + - xdg-basedir ==0.2.2 + - xenstore ==0.1.1 + - xhtml ==3000.2.1 + - xlsior ==0.1.0.1 + - xlsx ==0.2.4 + - xlsx-tabular ==0.1.0.1 + - xml ==1.3.14 + - xml-conduit ==1.3.5 + - xml-conduit-parse ==0.3.1.0 + - xml-conduit-writer ==0.1.1.1 + - xml-hamlet ==0.4.0.11 + - xml-lens ==0.1.6.3 + - xml-to-json-fast ==2.0.0 + - xml-types ==0.3.6 + - xmlgen ==0.6.2.1 + - xmlhtml ==0.2.3.5 + - xmonad ==0.12 + - xss-sanitize ==0.3.5.7 + - yackage ==0.8.0 + - yahoo-finance-api ==0.1.0.0 + - yaml ==0.8.18.6 + - Yampa ==0.10.5 + - YampaSynth ==0.2 + - yarr ==1.4.0.2 + - yes-precure5-command ==5.5.2 + - yesod ==1.4.3 + - 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.3 + - yesod-core ==1.4.24 + - yesod-eventsource ==1.4.0.1 + - yesod-fay ==0.8.0 + - yesod-fb ==0.3.4 + - yesod-form ==1.4.7.1 + - yesod-form-richtext ==0.1.0.0 + - yesod-gitrepo ==0.2.1.0 + - yesod-gitrev ==0.1.0.0 + - yesod-job-queue ==0.3.0.0 + - yesod-newsfeed ==1.6 + - yesod-persistent ==1.4.0.6 + - yesod-sitemap ==1.4.0.1 + - yesod-static ==1.5.0.4 + - yesod-static-angular ==0.1.8 + - yesod-table ==2.0.3 + - yesod-test ==1.5.3 + - yesod-websockets ==0.2.4 + - yi ==0.12.6 + - yi-fuzzy-open ==0.1.0.1 + - yi-language ==0.2.1 + - yi-rope ==0.7.0.2 + - yjtools ==0.9.18 + - zero ==0.1.4 + - zeromq4-haskell ==0.6.5 + - zip ==0.1.3 + - zip-archive ==0.3.0.5 + - zippers ==0.2.2 + - zlib ==0.6.1.1 + - zlib-bindings ==0.1.1.5 + - zlib-lens ==0.1.2.1 + - zoom-refs ==0.0.0.1 + - zot ==0.0.3 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 + - aeson-pretty < 0.8 # required by elm compiler - binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions @@ -48,9 +2011,13 @@ extra-packages: - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x + - hoogle < 5 # required by current implementation of ghcWithHoogle - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 + - persistent == 2.2.* # needed for git-annex + - persistent-sqlite == 2.2.* # needed for git-annex + - persistent-template == 2.1.* # needed for git-annex - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -116,6 +2083,7 @@ dont-distribute-packages: hfsevents: [ i686-linux, x86_64-linux ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -217,6 +2185,7 @@ dont-distribute-packages: Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] + alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -485,6 +2454,7 @@ dont-distribute-packages: bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -521,6 +2491,7 @@ dont-distribute-packages: bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -578,6 +2549,7 @@ dont-distribute-packages: Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -635,7 +2607,12 @@ dont-distribute-packages: claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -657,6 +2634,7 @@ dont-distribute-packages: cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] + clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] cmath: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -686,6 +2664,7 @@ dont-distribute-packages: collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -739,6 +2718,7 @@ dont-distribute-packages: ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] consumers: [ i686-linux, x86_64-linux, x86_64-darwin ] container: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -787,6 +2767,7 @@ dont-distribute-packages: cr: [ i686-linux, x86_64-linux, x86_64-darwin ] crack: [ i686-linux, x86_64-linux, x86_64-darwin ] Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] + craft: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -924,6 +2905,8 @@ dont-distribute-packages: derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -968,9 +2951,13 @@ dont-distribute-packages: disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1006,6 +2993,7 @@ dont-distribute-packages: DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] + drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] drmaa: [ i686-linux, x86_64-linux, x86_64-darwin ] dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1113,6 +3101,7 @@ dont-distribute-packages: event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1250,6 +3239,7 @@ dont-distribute-packages: free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freer: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1382,11 +3372,13 @@ dont-distribute-packages: gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] + glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1423,6 +3415,7 @@ dont-distribute-packages: gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] + gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1448,6 +3441,7 @@ dont-distribute-packages: graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] + graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1537,6 +3531,7 @@ dont-distribute-packages: hakyll-contrib-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1582,6 +3577,7 @@ dont-distribute-packages: HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1621,6 +3617,8 @@ dont-distribute-packages: haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1833,6 +3831,7 @@ dont-distribute-packages: HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hidapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2052,6 +4051,7 @@ dont-distribute-packages: hsp-cgi: [ 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-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2123,6 +4123,8 @@ dont-distribute-packages: hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2211,6 +4213,7 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] + inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2401,6 +4404,7 @@ dont-distribute-packages: LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2414,7 +4418,7 @@ dont-distribute-packages: language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2427,6 +4431,7 @@ dont-distribute-packages: latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2468,6 +4473,7 @@ dont-distribute-packages: libroman: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2484,6 +4490,7 @@ dont-distribute-packages: linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinguisticsTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2537,6 +4544,7 @@ dont-distribute-packages: log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2584,6 +4592,7 @@ dont-distribute-packages: magico: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] maid: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2652,11 +4661,13 @@ dont-distribute-packages: metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] metric: [ i686-linux, x86_64-linux, x86_64-darwin ] Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] + microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2724,6 +4735,7 @@ dont-distribute-packages: Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2827,6 +4839,7 @@ dont-distribute-packages: nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2909,6 +4922,7 @@ dont-distribute-packages: oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3013,9 +5027,11 @@ dont-distribute-packages: periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3028,6 +5044,7 @@ dont-distribute-packages: pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3104,6 +5121,7 @@ dont-distribute-packages: posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3183,9 +5201,11 @@ dont-distribute-packages: punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3255,6 +5275,7 @@ dont-distribute-packages: raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] + raz: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3354,6 +5375,7 @@ dont-distribute-packages: restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] resumable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] ReviewBoard: [ i686-linux, x86_64-linux, x86_64-darwin ] rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3381,6 +5403,7 @@ dont-distribute-packages: roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3468,6 +5491,7 @@ dont-distribute-packages: scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] sec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3507,6 +5531,7 @@ dont-distribute-packages: servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3570,6 +5595,8 @@ dont-distribute-packages: simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3769,6 +5796,7 @@ dont-distribute-packages: supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3776,6 +5804,7 @@ dont-distribute-packages: svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] + swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3844,6 +5873,7 @@ dont-distribute-packages: tdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] teams: [ i686-linux, x86_64-linux, x86_64-darwin ] + telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3948,6 +5978,7 @@ dont-distribute-packages: topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] torch: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] + toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4123,7 +6154,9 @@ dont-distribute-packages: vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] + wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-app-file-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4136,6 +6169,8 @@ dont-distribute-packages: wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-content-type: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4143,6 +6178,7 @@ dont-distribute-packages: wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4209,6 +6245,7 @@ dont-distribute-packages: WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] + workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4244,6 +6281,7 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4310,6 +6348,7 @@ dont-distribute-packages: yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix deleted file mode 100644 index 5ccc5a7351eb..000000000000 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ /dev/null @@ -1,8592 +0,0 @@ -{ pkgs }: - -with import ./lib.nix { inherit pkgs; }; - -self: super: { - - # core libraries provided by the compiler - Cabal = null; - array = null; - base = null; - bin-package-db = null; - binary = null; - bytestring = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - transformers = null; - unix = null; - - # lts-6.9 packages - "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; - "3dmodels" = dontDistribute super."3dmodels"; - "4Blocks" = dontDistribute super."4Blocks"; - "AAI" = dontDistribute super."AAI"; - "ABList" = dontDistribute super."ABList"; - "AC-Angle" = dontDistribute super."AC-Angle"; - "AC-Boolean" = dontDistribute super."AC-Boolean"; - "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; - "AC-Colour" = dontDistribute super."AC-Colour"; - "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; - "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; - "AC-MiniTest" = dontDistribute super."AC-MiniTest"; - "AC-PPM" = dontDistribute super."AC-PPM"; - "AC-Random" = dontDistribute super."AC-Random"; - "AC-Terminal" = dontDistribute super."AC-Terminal"; - "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; - "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; - "ACME" = dontDistribute super."ACME"; - "ADPfusion" = dontDistribute super."ADPfusion"; - "AERN-Basics" = dontDistribute super."AERN-Basics"; - "AERN-Net" = dontDistribute super."AERN-Net"; - "AERN-Real" = dontDistribute super."AERN-Real"; - "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; - "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; - "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; - "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; - "AES" = dontDistribute super."AES"; - "AFSM" = dontDistribute super."AFSM"; - "AGI" = dontDistribute super."AGI"; - "ALUT" = dontDistribute super."ALUT"; - "AMI" = dontDistribute super."AMI"; - "ANum" = dontDistribute super."ANum"; - "ASN1" = dontDistribute super."ASN1"; - "AVar" = dontDistribute super."AVar"; - "AWin32Console" = dontDistribute super."AWin32Console"; - "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; - "AbortT-mtl" = dontDistribute super."AbortT-mtl"; - "AbortT-transformers" = dontDistribute super."AbortT-transformers"; - "ActionKid" = dontDistribute super."ActionKid"; - "Adaptive" = dontDistribute super."Adaptive"; - "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; - "Advgame" = dontDistribute super."Advgame"; - "AesonBson" = dontDistribute super."AesonBson"; - "Agata" = dontDistribute super."Agata"; - "Agda" = doDistribute super."Agda_2_5_1"; - "Agda-executable" = dontDistribute super."Agda-executable"; - "AhoCorasick" = dontDistribute super."AhoCorasick"; - "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren"; - "AlgorithmW" = dontDistribute super."AlgorithmW"; - "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; - "Allure" = dontDistribute super."Allure"; - "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; - "Animas" = dontDistribute super."Animas"; - "Annotations" = dontDistribute super."Annotations"; - "Ansi2Html" = dontDistribute super."Ansi2Html"; - "ApplePush" = dontDistribute super."ApplePush"; - "AppleScript" = dontDistribute super."AppleScript"; - "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; - "ArrayRef" = dontDistribute super."ArrayRef"; - "ArrowVHDL" = dontDistribute super."ArrowVHDL"; - "AspectAG" = dontDistribute super."AspectAG"; - "AttoBencode" = dontDistribute super."AttoBencode"; - "AttoJson" = dontDistribute super."AttoJson"; - "Attrac" = dontDistribute super."Attrac"; - "Aurochs" = dontDistribute super."Aurochs"; - "AutoForms" = dontDistribute super."AutoForms"; - "AvlTree" = dontDistribute super."AvlTree"; - "BASIC" = dontDistribute super."BASIC"; - "BCMtools" = dontDistribute super."BCMtools"; - "BNFC" = dontDistribute super."BNFC"; - "BNFC-meta" = dontDistribute super."BNFC-meta"; - "Baggins" = dontDistribute super."Baggins"; - "Bang" = dontDistribute super."Bang"; - "Barracuda" = dontDistribute super."Barracuda"; - "Befunge93" = dontDistribute super."Befunge93"; - "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; - "BerkeleyDB" = dontDistribute super."BerkeleyDB"; - "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; - "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; - "BiGUL" = dontDistribute super."BiGUL"; - "BigPixel" = dontDistribute super."BigPixel"; - "Binpack" = dontDistribute super."Binpack"; - "Biobase" = dontDistribute super."Biobase"; - "BiobaseBlast" = dontDistribute super."BiobaseBlast"; - "BiobaseDotP" = dontDistribute super."BiobaseDotP"; - "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; - "BiobaseFasta" = dontDistribute super."BiobaseFasta"; - "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; - "BiobaseMAF" = dontDistribute super."BiobaseMAF"; - "BiobaseNewick" = dontDistribute super."BiobaseNewick"; - "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; - "BiobaseTurner" = dontDistribute super."BiobaseTurner"; - "BiobaseTypes" = dontDistribute super."BiobaseTypes"; - "BiobaseVienna" = dontDistribute super."BiobaseVienna"; - "BiobaseXNA" = dontDistribute super."BiobaseXNA"; - "BirdPP" = dontDistribute super."BirdPP"; - "BitSyntax" = dontDistribute super."BitSyntax"; - "Bitly" = dontDistribute super."Bitly"; - "Blobs" = dontDistribute super."Blobs"; - "BluePrintCSS" = dontDistribute super."BluePrintCSS"; - "Blueprint" = dontDistribute super."Blueprint"; - "Bookshelf" = dontDistribute super."Bookshelf"; - "Bravo" = dontDistribute super."Bravo"; - "BufferedSocket" = dontDistribute super."BufferedSocket"; - "Buster" = dontDistribute super."Buster"; - "CBOR" = dontDistribute super."CBOR"; - "CC-delcont" = dontDistribute super."CC-delcont"; - "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; - "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; - "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; - "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; - "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; - "CCA" = dontDistribute super."CCA"; - "CHXHtml" = dontDistribute super."CHXHtml"; - "CLASE" = dontDistribute super."CLASE"; - "CLI" = dontDistribute super."CLI"; - "CMCompare" = dontDistribute super."CMCompare"; - "CMQ" = dontDistribute super."CMQ"; - "COrdering" = dontDistribute super."COrdering"; - "CPBrainfuck" = dontDistribute super."CPBrainfuck"; - "CPL" = dontDistribute super."CPL"; - "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; - "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; - "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; - "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; - "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; - "CSPM-cspm" = dontDistribute super."CSPM-cspm"; - "CTRex" = dontDistribute super."CTRex"; - "CV" = dontDistribute super."CV"; - "CabalSearch" = dontDistribute super."CabalSearch"; - "Capabilities" = dontDistribute super."Capabilities"; - "Cardinality" = dontDistribute super."Cardinality"; - "CarneadesDSL" = dontDistribute super."CarneadesDSL"; - "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; - "Cartesian" = dontDistribute super."Cartesian"; - "Cascade" = dontDistribute super."Cascade"; - "Catana" = dontDistribute super."Catana"; - "Chart" = doDistribute super."Chart_1_6"; - "Chart-cairo" = doDistribute super."Chart-cairo_1_6"; - "Chart-diagrams" = doDistribute super."Chart-diagrams_1_6"; - "Chart-gtk" = dontDistribute super."Chart-gtk"; - "Chart-simple" = dontDistribute super."Chart-simple"; - "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_1"; - "CheatSheet" = dontDistribute super."CheatSheet"; - "Checked" = dontDistribute super."Checked"; - "Chitra" = dontDistribute super."Chitra"; - "ChristmasTree" = dontDistribute super."ChristmasTree"; - "CirruParser" = dontDistribute super."CirruParser"; - "ClassLaws" = dontDistribute super."ClassLaws"; - "ClassyPrelude" = dontDistribute super."ClassyPrelude"; - "Clean" = dontDistribute super."Clean"; - "Clipboard" = dontDistribute super."Clipboard"; - "Coadjute" = dontDistribute super."Coadjute"; - "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; - "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; - "Combinatorrent" = dontDistribute super."Combinatorrent"; - "Command" = dontDistribute super."Command"; - "Commando" = dontDistribute super."Commando"; - "ComonadSheet" = dontDistribute super."ComonadSheet"; - "Concurrent-Cache" = dontDistribute super."Concurrent-Cache"; - "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; - "Concurrential" = dontDistribute super."Concurrential"; - "Condor" = dontDistribute super."Condor"; - "ConfigFileTH" = dontDistribute super."ConfigFileTH"; - "Configger" = dontDistribute super."Configger"; - "Configurable" = dontDistribute super."Configurable"; - "ConsStream" = dontDistribute super."ConsStream"; - "Conscript" = dontDistribute super."Conscript"; - "ConstraintKinds" = dontDistribute super."ConstraintKinds"; - "Consumer" = dontDistribute super."Consumer"; - "ContArrow" = dontDistribute super."ContArrow"; - "ContextAlgebra" = dontDistribute super."ContextAlgebra"; - "Contract" = dontDistribute super."Contract"; - "Control-Engine" = dontDistribute super."Control-Engine"; - "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; - "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; - "CoreDump" = dontDistribute super."CoreDump"; - "CoreErlang" = dontDistribute super."CoreErlang"; - "CoreFoundation" = dontDistribute super."CoreFoundation"; - "Coroutine" = dontDistribute super."Coroutine"; - "CouchDB" = dontDistribute super."CouchDB"; - "Craft3e" = dontDistribute super."Craft3e"; - "Crypto" = dontDistribute super."Crypto"; - "CurryDB" = dontDistribute super."CurryDB"; - "DAG-Tournament" = dontDistribute super."DAG-Tournament"; - "DAV" = doDistribute super."DAV_1_2"; - "DBlimited" = dontDistribute super."DBlimited"; - "DBus" = dontDistribute super."DBus"; - "DCFL" = dontDistribute super."DCFL"; - "DMuCheck" = dontDistribute super."DMuCheck"; - "DOM" = dontDistribute super."DOM"; - "DP" = dontDistribute super."DP"; - "DPM" = dontDistribute super."DPM"; - "DPutils" = dontDistribute super."DPutils"; - "DSA" = dontDistribute super."DSA"; - "DSH" = dontDistribute super."DSH"; - "DSTM" = dontDistribute super."DSTM"; - "DTC" = dontDistribute super."DTC"; - "Dangerous" = dontDistribute super."Dangerous"; - "Dao" = dontDistribute super."Dao"; - "DarcsHelpers" = dontDistribute super."DarcsHelpers"; - "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; - "Data-Rope" = dontDistribute super."Data-Rope"; - "DataTreeView" = dontDistribute super."DataTreeView"; - "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; - "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; - "DecisionTree" = dontDistribute super."DecisionTree"; - "DeepArrow" = dontDistribute super."DeepArrow"; - "DefendTheKing" = dontDistribute super."DefendTheKing"; - "Delta-Lambda" = dontDistribute super."Delta-Lambda"; - "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; - "Dflow" = dontDistribute super."Dflow"; - "Diff" = doDistribute super."Diff_0_3_2"; - "DifferenceLogic" = dontDistribute super."DifferenceLogic"; - "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; - "Digit" = dontDistribute super."Digit"; - "DigitalOcean" = dontDistribute super."DigitalOcean"; - "DimensionalHash" = dontDistribute super."DimensionalHash"; - "DirectSound" = dontDistribute super."DirectSound"; - "DisTract" = dontDistribute super."DisTract"; - "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; - "Dish" = dontDistribute super."Dish"; - "Dist" = dontDistribute super."Dist"; - "DistanceTransform" = dontDistribute super."DistanceTransform"; - "DistanceUnits" = dontDistribute super."DistanceUnits"; - "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; - "DocTest" = dontDistribute super."DocTest"; - "Docs" = dontDistribute super."Docs"; - "DrHylo" = dontDistribute super."DrHylo"; - "DrIFT" = dontDistribute super."DrIFT"; - "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; - "Dung" = dontDistribute super."Dung"; - "Dust" = dontDistribute super."Dust"; - "Dust-crypto" = dontDistribute super."Dust-crypto"; - "Dust-tools" = dontDistribute super."Dust-tools"; - "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; - "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; - "DysFRP" = dontDistribute super."DysFRP"; - "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; - "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; - "EEConfig" = dontDistribute super."EEConfig"; - "EdisonAPI" = doDistribute super."EdisonAPI_1_3"; - "EditTimeReport" = dontDistribute super."EditTimeReport"; - "EitherT" = dontDistribute super."EitherT"; - "Elm" = dontDistribute super."Elm"; - "Emping" = dontDistribute super."Emping"; - "Encode" = dontDistribute super."Encode"; - "EnumContainers" = dontDistribute super."EnumContainers"; - "EnumMap" = dontDistribute super."EnumMap"; - "Eq" = dontDistribute super."Eq"; - "EqualitySolver" = dontDistribute super."EqualitySolver"; - "EsounD" = dontDistribute super."EsounD"; - "EstProgress" = dontDistribute super."EstProgress"; - "EtaMOO" = dontDistribute super."EtaMOO"; - "Etage" = dontDistribute super."Etage"; - "Etage-Graph" = dontDistribute super."Etage-Graph"; - "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; - "Etherbunny" = dontDistribute super."Etherbunny"; - "EuroIT" = dontDistribute super."EuroIT"; - "Euterpea" = dontDistribute super."Euterpea"; - "EventSocket" = dontDistribute super."EventSocket"; - "Extra" = dontDistribute super."Extra"; - "FComp" = dontDistribute super."FComp"; - "FM-SBLEX" = dontDistribute super."FM-SBLEX"; - "FModExRaw" = dontDistribute super."FModExRaw"; - "FPretty" = dontDistribute super."FPretty"; - "FTGL" = dontDistribute super."FTGL"; - "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; - "FTPLine" = dontDistribute super."FTPLine"; - "Facts" = dontDistribute super."Facts"; - "FailureT" = dontDistribute super."FailureT"; - "FastxPipe" = dontDistribute super."FastxPipe"; - "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; - "FerryCore" = dontDistribute super."FerryCore"; - "Feval" = dontDistribute super."Feval"; - "FieldTrip" = dontDistribute super."FieldTrip"; - "FileManip" = dontDistribute super."FileManip"; - "FileManipCompat" = dontDistribute super."FileManipCompat"; - "FilePather" = dontDistribute super."FilePather"; - "FileSystem" = dontDistribute super."FileSystem"; - "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; - "Finance-Treasury" = dontDistribute super."Finance-Treasury"; - "FiniteMap" = dontDistribute super."FiniteMap"; - "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; - "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; - "Flippi" = dontDistribute super."Flippi"; - "Focus" = dontDistribute super."Focus"; - "Folly" = dontDistribute super."Folly"; - "ForSyDe" = dontDistribute super."ForSyDe"; - "ForestStructures" = dontDistribute super."ForestStructures"; - "ForkableT" = dontDistribute super."ForkableT"; - "FormalGrammars" = dontDistribute super."FormalGrammars"; - "Foster" = dontDistribute super."Foster"; - "FpMLv53" = dontDistribute super."FpMLv53"; - "FractalArt" = dontDistribute super."FractalArt"; - "Fractaler" = dontDistribute super."Fractaler"; - "Frames" = doDistribute super."Frames_0_1_4"; - "Frank" = dontDistribute super."Frank"; - "FreeTypeGL" = dontDistribute super."FreeTypeGL"; - "FunGEn" = dontDistribute super."FunGEn"; - "Fungi" = dontDistribute super."Fungi"; - "GA" = dontDistribute super."GA"; - "GGg" = dontDistribute super."GGg"; - "GHood" = dontDistribute super."GHood"; - "GLFW" = dontDistribute super."GLFW"; - "GLFW-OGL" = dontDistribute super."GLFW-OGL"; - "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; - "GLFW-task" = dontDistribute super."GLFW-task"; - "GLHUI" = dontDistribute super."GLHUI"; - "GLM" = dontDistribute super."GLM"; - "GLMatrix" = dontDistribute super."GLMatrix"; - "GLUtil" = dontDistribute super."GLUtil"; - "GPX" = dontDistribute super."GPX"; - "GPipe-Collada" = dontDistribute super."GPipe-Collada"; - "GPipe-Examples" = dontDistribute super."GPipe-Examples"; - "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; - "GTALib" = dontDistribute super."GTALib"; - "Gamgine" = dontDistribute super."Gamgine"; - "Ganymede" = dontDistribute super."Ganymede"; - "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; - "GeBoP" = dontDistribute super."GeBoP"; - "GenI" = dontDistribute super."GenI"; - "GenSmsPdu" = dontDistribute super."GenSmsPdu"; - "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; - "GenussFold" = dontDistribute super."GenussFold"; - "GeoIp" = dontDistribute super."GeoIp"; - "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; - "Geodetic" = dontDistribute super."Geodetic"; - "GeomPredicates" = dontDistribute super."GeomPredicates"; - "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; - "GiST" = dontDistribute super."GiST"; - "Gifcurry" = dontDistribute super."Gifcurry"; - "GiveYouAHead" = dontDistribute super."GiveYouAHead"; - "Glob" = doDistribute super."Glob_0_7_10"; - "GlomeTrace" = dontDistribute super."GlomeTrace"; - "GlomeVec" = dontDistribute super."GlomeVec"; - "GlomeView" = dontDistribute super."GlomeView"; - "GoogleChart" = dontDistribute super."GoogleChart"; - "GoogleDirections" = dontDistribute super."GoogleDirections"; - "GoogleSB" = dontDistribute super."GoogleSB"; - "GoogleSuggest" = dontDistribute super."GoogleSuggest"; - "GoogleTranslate" = dontDistribute super."GoogleTranslate"; - "GotoT-transformers" = dontDistribute super."GotoT-transformers"; - "GrammarProducts" = dontDistribute super."GrammarProducts"; - "Graph500" = dontDistribute super."Graph500"; - "GraphHammer" = dontDistribute super."GraphHammer"; - "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; - "Graphalyze" = dontDistribute super."Graphalyze"; - "Grempa" = dontDistribute super."Grempa"; - "GroteTrap" = dontDistribute super."GroteTrap"; - "Grow" = dontDistribute super."Grow"; - "GrowlNotify" = dontDistribute super."GrowlNotify"; - "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; - "GtkGLTV" = dontDistribute super."GtkGLTV"; - "GtkTV" = dontDistribute super."GtkTV"; - "GuiHaskell" = dontDistribute super."GuiHaskell"; - "GuiTV" = dontDistribute super."GuiTV"; - "H" = doDistribute super."H_0_8_0_0"; - "HARM" = dontDistribute super."HARM"; - "HAppS-Data" = dontDistribute super."HAppS-Data"; - "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; - "HAppS-Server" = dontDistribute super."HAppS-Server"; - "HAppS-State" = dontDistribute super."HAppS-State"; - "HAppS-Util" = dontDistribute super."HAppS-Util"; - "HAppSHelpers" = dontDistribute super."HAppSHelpers"; - "HCL" = dontDistribute super."HCL"; - "HCard" = dontDistribute super."HCard"; - "HDBC-mysql" = dontDistribute super."HDBC-mysql"; - "HDBC-odbc" = dontDistribute super."HDBC-odbc"; - "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; - "HDRUtils" = dontDistribute super."HDRUtils"; - "HERA" = dontDistribute super."HERA"; - "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; - "HFuse" = dontDistribute super."HFuse"; - "HGE2D" = dontDistribute super."HGE2D"; - "HGL" = dontDistribute super."HGL"; - "HGamer3D" = dontDistribute super."HGamer3D"; - "HGamer3D-API" = dontDistribute super."HGamer3D-API"; - "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; - "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; - "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; - "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; - "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; - "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; - "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; - "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; - "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; - "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; - "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; - "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; - "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; - "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; - "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; - "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; - "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; - "HGraphStorage" = dontDistribute super."HGraphStorage"; - "HHDL" = dontDistribute super."HHDL"; - "HJScript" = dontDistribute super."HJScript"; - "HJVM" = dontDistribute super."HJVM"; - "HJavaScript" = dontDistribute super."HJavaScript"; - "HLearn-algebra" = dontDistribute super."HLearn-algebra"; - "HLearn-approximation" = dontDistribute super."HLearn-approximation"; - "HLearn-classification" = dontDistribute super."HLearn-classification"; - "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; - "HLearn-distributions" = dontDistribute super."HLearn-distributions"; - "HListPP" = dontDistribute super."HListPP"; - "HLogger" = dontDistribute super."HLogger"; - "HMM" = dontDistribute super."HMM"; - "HMap" = dontDistribute super."HMap"; - "HNM" = dontDistribute super."HNM"; - "HODE" = dontDistribute super."HODE"; - "HOpenCV" = dontDistribute super."HOpenCV"; - "HPath" = dontDistribute super."HPath"; - "HPhone" = dontDistribute super."HPhone"; - "HPi" = dontDistribute super."HPi"; - "HPlot" = dontDistribute super."HPlot"; - "HPong" = dontDistribute super."HPong"; - "HROOT" = dontDistribute super."HROOT"; - "HROOT-core" = dontDistribute super."HROOT-core"; - "HROOT-graf" = dontDistribute super."HROOT-graf"; - "HROOT-hist" = dontDistribute super."HROOT-hist"; - "HROOT-io" = dontDistribute super."HROOT-io"; - "HROOT-math" = dontDistribute super."HROOT-math"; - "HRay" = dontDistribute super."HRay"; - "HSFFIG" = dontDistribute super."HSFFIG"; - "HSGEP" = dontDistribute super."HSGEP"; - "HSH" = dontDistribute super."HSH"; - "HSHHelpers" = dontDistribute super."HSHHelpers"; - "HSlippyMap" = dontDistribute super."HSlippyMap"; - "HSmarty" = dontDistribute super."HSmarty"; - "HSoundFile" = dontDistribute super."HSoundFile"; - "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; - "HSvm" = dontDistribute super."HSvm"; - "HTTP-Simple" = dontDistribute super."HTTP-Simple"; - "HTab" = dontDistribute super."HTab"; - "HTicTacToe" = dontDistribute super."HTicTacToe"; - "HUnit" = doDistribute super."HUnit_1_3_1_1"; - "HUnit-Diff" = dontDistribute super."HUnit-Diff"; - "HUnit-Plus" = dontDistribute super."HUnit-Plus"; - "HUnit-approx" = dontDistribute super."HUnit-approx"; - "HXMPP" = dontDistribute super."HXMPP"; - "HXQ" = dontDistribute super."HXQ"; - "HaLeX" = dontDistribute super."HaLeX"; - "HaMinitel" = dontDistribute super."HaMinitel"; - "HaPy" = dontDistribute super."HaPy"; - "HaRe" = doDistribute super."HaRe_0_8_2_3"; - "HaTeX-meta" = dontDistribute super."HaTeX-meta"; - "HaTeX-qq" = dontDistribute super."HaTeX-qq"; - "HaVSA" = dontDistribute super."HaVSA"; - "Hach" = dontDistribute super."Hach"; - "HackMail" = dontDistribute super."HackMail"; - "Haggressive" = dontDistribute super."Haggressive"; - "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; - "Hangman" = dontDistribute super."Hangman"; - "HarmTrace" = dontDistribute super."HarmTrace"; - "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; - "HasGP" = dontDistribute super."HasGP"; - "Haschoo" = dontDistribute super."Haschoo"; - "Hashell" = dontDistribute super."Hashell"; - "HaskRel" = dontDistribute super."HaskRel"; - "HaskellForMaths" = dontDistribute super."HaskellForMaths"; - "HaskellLM" = dontDistribute super."HaskellLM"; - "HaskellNN" = dontDistribute super."HaskellNN"; - "HaskellTorrent" = dontDistribute super."HaskellTorrent"; - "HaskellTutorials" = dontDistribute super."HaskellTutorials"; - "Haskelloids" = dontDistribute super."Haskelloids"; - "Hate" = dontDistribute super."Hate"; - "Hawk" = dontDistribute super."Hawk"; - "Hayoo" = dontDistribute super."Hayoo"; - "Hedi" = dontDistribute super."Hedi"; - "HerbiePlugin" = dontDistribute super."HerbiePlugin"; - "Hermes" = dontDistribute super."Hermes"; - "Hieroglyph" = dontDistribute super."Hieroglyph"; - "HiggsSet" = dontDistribute super."HiggsSet"; - "Hipmunk" = dontDistribute super."Hipmunk"; - "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; - "Hish" = dontDistribute super."Hish"; - "Histogram" = dontDistribute super."Histogram"; - "Hmpf" = dontDistribute super."Hmpf"; - "Hoed" = dontDistribute super."Hoed"; - "HoleyMonoid" = dontDistribute super."HoleyMonoid"; - "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; - "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; - "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; - "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; - "Homology" = dontDistribute super."Homology"; - "HongoDB" = dontDistribute super."HongoDB"; - "HostAndPort" = dontDistribute super."HostAndPort"; - "Hricket" = dontDistribute super."Hricket"; - "Hs2lib" = dontDistribute super."Hs2lib"; - "HsASA" = dontDistribute super."HsASA"; - "HsHaruPDF" = dontDistribute super."HsHaruPDF"; - "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; - "HsJudy" = dontDistribute super."HsJudy"; - "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; - "HsParrot" = dontDistribute super."HsParrot"; - "HsPerl5" = dontDistribute super."HsPerl5"; - "HsSVN" = dontDistribute super."HsSVN"; - "HsTools" = dontDistribute super."HsTools"; - "Hsed" = dontDistribute super."Hsed"; - "Hsmtlib" = dontDistribute super."Hsmtlib"; - "HueAPI" = dontDistribute super."HueAPI"; - "HulkImport" = dontDistribute super."HulkImport"; - "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; - "IDynamic" = dontDistribute super."IDynamic"; - "IFS" = dontDistribute super."IFS"; - "INblobs" = dontDistribute super."INblobs"; - "IOR" = dontDistribute super."IOR"; - "IORefCAS" = dontDistribute super."IORefCAS"; - "IOSpec" = dontDistribute super."IOSpec"; - "IcoGrid" = dontDistribute super."IcoGrid"; - "Imlib" = dontDistribute super."Imlib"; - "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; - "IndentParser" = dontDistribute super."IndentParser"; - "IndexedList" = dontDistribute super."IndexedList"; - "InfixApplicative" = dontDistribute super."InfixApplicative"; - "Interpolation" = dontDistribute super."Interpolation"; - "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; - "Irc" = dontDistribute super."Irc"; - "IrrHaskell" = dontDistribute super."IrrHaskell"; - "IsNull" = dontDistribute super."IsNull"; - "JSON-Combinator" = dontDistribute super."JSON-Combinator"; - "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; - "JSONb" = dontDistribute super."JSONb"; - "JYU-Utils" = dontDistribute super."JYU-Utils"; - "JackMiniMix" = dontDistribute super."JackMiniMix"; - "Javasf" = dontDistribute super."Javasf"; - "Javav" = dontDistribute super."Javav"; - "JsContracts" = dontDistribute super."JsContracts"; - "JsonGrammar" = dontDistribute super."JsonGrammar"; - "JuicyPixels" = doDistribute super."JuicyPixels_3_2_7_2"; - "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; - "JuicyPixels-extra" = dontDistribute super."JuicyPixels-extra"; - "JuicyPixels-scale-dct" = doDistribute super."JuicyPixels-scale-dct_0_1_1_0"; - "JunkDB" = dontDistribute super."JunkDB"; - "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; - "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; - "JustParse" = dontDistribute super."JustParse"; - "KMP" = dontDistribute super."KMP"; - "KSP" = dontDistribute super."KSP"; - "Kalman" = dontDistribute super."Kalman"; - "KdTree" = dontDistribute super."KdTree"; - "Ketchup" = dontDistribute super."Ketchup"; - "KiCS" = dontDistribute super."KiCS"; - "KiCS-debugger" = dontDistribute super."KiCS-debugger"; - "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; - "Kleislify" = dontDistribute super."Kleislify"; - "Konf" = dontDistribute super."Konf"; - "Kriens" = dontDistribute super."Kriens"; - "KyotoCabinet" = dontDistribute super."KyotoCabinet"; - "L-seed" = dontDistribute super."L-seed"; - "LATS" = dontDistribute super."LATS"; - "LDAP" = dontDistribute super."LDAP"; - "LRU" = dontDistribute super."LRU"; - "LTree" = dontDistribute super."LTree"; - "LambdaCalculator" = dontDistribute super."LambdaCalculator"; - "LambdaDB" = dontDistribute super."LambdaDB"; - "LambdaHack" = dontDistribute super."LambdaHack"; - "LambdaINet" = dontDistribute super."LambdaINet"; - "LambdaNet" = dontDistribute super."LambdaNet"; - "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; - "LambdaShell" = dontDistribute super."LambdaShell"; - "Lambdajudge" = dontDistribute super."Lambdajudge"; - "Lambdaya" = dontDistribute super."Lambdaya"; - "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; - "Lastik" = dontDistribute super."Lastik"; - "Lattices" = dontDistribute super."Lattices"; - "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; - "LazyVault" = dontDistribute super."LazyVault"; - "Level0" = dontDistribute super."Level0"; - "LibClang" = dontDistribute super."LibClang"; - "LibZip" = dontDistribute super."LibZip"; - "Limit" = dontDistribute super."Limit"; - "LinearSplit" = dontDistribute super."LinearSplit"; - "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; - "LinkChecker" = dontDistribute super."LinkChecker"; - "ListLike" = doDistribute super."ListLike_4_2_1"; - "ListTree" = dontDistribute super."ListTree"; - "ListWriter" = dontDistribute super."ListWriter"; - "ListZipper" = dontDistribute super."ListZipper"; - "Logic" = dontDistribute super."Logic"; - "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; - "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; - "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; - "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; - "LslPlus" = dontDistribute super."LslPlus"; - "Lucu" = dontDistribute super."Lucu"; - "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; - "MHask" = dontDistribute super."MHask"; - "MSQueue" = dontDistribute super."MSQueue"; - "MTGBuilder" = dontDistribute super."MTGBuilder"; - "MagicHaskeller" = dontDistribute super."MagicHaskeller"; - "MailchimpSimple" = dontDistribute super."MailchimpSimple"; - "MaybeT" = dontDistribute super."MaybeT"; - "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; - "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; - "MazesOfMonad" = dontDistribute super."MazesOfMonad"; - "MeanShift" = dontDistribute super."MeanShift"; - "Measure" = dontDistribute super."Measure"; - "Mecha" = dontDistribute super."Mecha"; - "Mechs" = dontDistribute super."Mechs"; - "MetaHDBC" = dontDistribute super."MetaHDBC"; - "MetaObject" = dontDistribute super."MetaObject"; - "Metrics" = dontDistribute super."Metrics"; - "Mhailist" = dontDistribute super."Mhailist"; - "Michelangelo" = dontDistribute super."Michelangelo"; - "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; - "MiniAgda" = dontDistribute super."MiniAgda"; - "MissingH" = doDistribute super."MissingH_1_3_0_2"; - "MissingK" = dontDistribute super."MissingK"; - "MissingM" = dontDistribute super."MissingM"; - "MissingPy" = dontDistribute super."MissingPy"; - "Modulo" = dontDistribute super."Modulo"; - "Moe" = dontDistribute super."Moe"; - "MoeDict" = dontDistribute super."MoeDict"; - "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; - "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; - "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; - "MonadCompose" = dontDistribute super."MonadCompose"; - "MonadLab" = dontDistribute super."MonadLab"; - "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; - "MonadStack" = dontDistribute super."MonadStack"; - "Monadius" = dontDistribute super."Monadius"; - "Monaris" = dontDistribute super."Monaris"; - "Monatron" = dontDistribute super."Monatron"; - "Monatron-IO" = dontDistribute super."Monatron-IO"; - "Monocle" = dontDistribute super."Monocle"; - "MorseCode" = dontDistribute super."MorseCode"; - "MuCheck" = dontDistribute super."MuCheck"; - "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; - "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; - "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; - "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; - "Munkres" = dontDistribute super."Munkres"; - "Munkres-simple" = dontDistribute super."Munkres-simple"; - "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; - "MyPrimes" = dontDistribute super."MyPrimes"; - "NGrams" = dontDistribute super."NGrams"; - "NTRU" = dontDistribute super."NTRU"; - "NXT" = dontDistribute super."NXT"; - "NXTDSL" = dontDistribute super."NXTDSL"; - "NanoProlog" = dontDistribute super."NanoProlog"; - "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; - "NaturalSort" = dontDistribute super."NaturalSort"; - "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; - "Neks" = dontDistribute super."Neks"; - "NestedFunctor" = dontDistribute super."NestedFunctor"; - "NestedSampling" = dontDistribute super."NestedSampling"; - "NetSNMP" = dontDistribute super."NetSNMP"; - "Network-NineP" = doDistribute super."Network-NineP_0_4_0"; - "NewBinary" = dontDistribute super."NewBinary"; - "Ninjas" = dontDistribute super."Ninjas"; - "NoSlow" = dontDistribute super."NoSlow"; - "Noise" = dontDistribute super."Noise"; - "Nomyx" = dontDistribute super."Nomyx"; - "Nomyx-Core" = dontDistribute super."Nomyx-Core"; - "Nomyx-Language" = dontDistribute super."Nomyx-Language"; - "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; - "Nomyx-Web" = dontDistribute super."Nomyx-Web"; - "NonEmpty" = dontDistribute super."NonEmpty"; - "NonEmptyList" = dontDistribute super."NonEmptyList"; - "NumLazyByteString" = dontDistribute super."NumLazyByteString"; - "NumberSieves" = dontDistribute super."NumberSieves"; - "NumberTheory" = dontDistribute super."NumberTheory"; - "Numbers" = dontDistribute super."Numbers"; - "Nussinov78" = dontDistribute super."Nussinov78"; - "Nutri" = dontDistribute super."Nutri"; - "OGL" = dontDistribute super."OGL"; - "OSM" = dontDistribute super."OSM"; - "OTP" = dontDistribute super."OTP"; - "Object" = dontDistribute super."Object"; - "ObjectIO" = dontDistribute super."ObjectIO"; - "Obsidian" = dontDistribute super."Obsidian"; - "OddWord" = dontDistribute super."OddWord"; - "Omega" = dontDistribute super."Omega"; - "OpenAFP" = dontDistribute super."OpenAFP"; - "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; - "OpenAL" = dontDistribute super."OpenAL"; - "OpenCL" = dontDistribute super."OpenCL"; - "OpenCLRaw" = dontDistribute super."OpenCLRaw"; - "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; - "OpenGLCheck" = dontDistribute super."OpenGLCheck"; - "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_1_0"; - "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; - "OpenSCAD" = dontDistribute super."OpenSCAD"; - "OpenVG" = dontDistribute super."OpenVG"; - "OpenVGRaw" = dontDistribute super."OpenVGRaw"; - "Operads" = dontDistribute super."Operads"; - "OptDir" = dontDistribute super."OptDir"; - "OrPatterns" = dontDistribute super."OrPatterns"; - "OrchestrateDB" = dontDistribute super."OrchestrateDB"; - "OrderedBits" = dontDistribute super."OrderedBits"; - "Ordinals" = dontDistribute super."Ordinals"; - "PArrows" = dontDistribute super."PArrows"; - "PBKDF2" = dontDistribute super."PBKDF2"; - "PCLT" = dontDistribute super."PCLT"; - "PCLT-DB" = dontDistribute super."PCLT-DB"; - "PDBtools" = dontDistribute super."PDBtools"; - "PPrinter" = dontDistribute super."PPrinter"; - "PTQ" = dontDistribute super."PTQ"; - "PUH-Project" = dontDistribute super."PUH-Project"; - "PageIO" = dontDistribute super."PageIO"; - "Paillier" = dontDistribute super."Paillier"; - "PandocAgda" = dontDistribute super."PandocAgda"; - "Paraiso" = dontDistribute super."Paraiso"; - "Parry" = dontDistribute super."Parry"; - "ParsecTools" = dontDistribute super."ParsecTools"; - "ParserFunction" = dontDistribute super."ParserFunction"; - "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; - "PasswordGenerator" = dontDistribute super."PasswordGenerator"; - "PastePipe" = dontDistribute super."PastePipe"; - "PathTree" = dontDistribute super."PathTree"; - "Pathfinder" = dontDistribute super."Pathfinder"; - "Peano" = dontDistribute super."Peano"; - "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; - "PerfectHash" = dontDistribute super."PerfectHash"; - "PermuteEffects" = dontDistribute super."PermuteEffects"; - "Phsu" = dontDistribute super."Phsu"; - "Pipe" = dontDistribute super."Pipe"; - "Piso" = dontDistribute super."Piso"; - "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; - "PlayingCards" = dontDistribute super."PlayingCards"; - "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; - "PlslTools" = dontDistribute super."PlslTools"; - "Plural" = dontDistribute super."Plural"; - "Pollutocracy" = dontDistribute super."Pollutocracy"; - "PortFusion" = dontDistribute super."PortFusion"; - "PortMidi" = doDistribute super."PortMidi_0_1_6_0"; - "PostgreSQL" = dontDistribute super."PostgreSQL"; - "PrimitiveArray" = dontDistribute super."PrimitiveArray"; - "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty"; - "Printf-TH" = dontDistribute super."Printf-TH"; - "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; - "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; - "PropLogic" = dontDistribute super."PropLogic"; - "Proper" = dontDistribute super."Proper"; - "ProxN" = dontDistribute super."ProxN"; - "Pugs" = dontDistribute super."Pugs"; - "Pup-Events" = dontDistribute super."Pup-Events"; - "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; - "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; - "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; - "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; - "QIO" = dontDistribute super."QIO"; - "QLearn" = dontDistribute super."QLearn"; - "QuadEdge" = dontDistribute super."QuadEdge"; - "QuadTree" = dontDistribute super."QuadTree"; - "Quelea" = dontDistribute super."Quelea"; - "QuickAnnotate" = dontDistribute super."QuickAnnotate"; - "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; - "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; - "QuickCheckVariant" = dontDistribute super."QuickCheckVariant"; - "QuickPlot" = dontDistribute super."QuickPlot"; - "Quickson" = dontDistribute super."Quickson"; - "R-pandoc" = dontDistribute super."R-pandoc"; - "RANSAC" = dontDistribute super."RANSAC"; - "RBTree" = dontDistribute super."RBTree"; - "RESTng" = dontDistribute super."RESTng"; - "RFC1751" = dontDistribute super."RFC1751"; - "RJson" = dontDistribute super."RJson"; - "RMP" = dontDistribute super."RMP"; - "RNAFold" = dontDistribute super."RNAFold"; - "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; - "RNAdesign" = dontDistribute super."RNAdesign"; - "RNAdraw" = dontDistribute super."RNAdraw"; - "RNAwolf" = dontDistribute super."RNAwolf"; - "Raincat" = dontDistribute super."Raincat"; - "Random123" = dontDistribute super."Random123"; - "RandomDotOrg" = dontDistribute super."RandomDotOrg"; - "Randometer" = dontDistribute super."Randometer"; - "Range" = dontDistribute super."Range"; - "Ranged-sets" = dontDistribute super."Ranged-sets"; - "Ranka" = dontDistribute super."Ranka"; - "Rasenschach" = dontDistribute super."Rasenschach"; - "Redmine" = dontDistribute super."Redmine"; - "Ref" = dontDistribute super."Ref"; - "Referees" = dontDistribute super."Referees"; - "RepLib" = dontDistribute super."RepLib"; - "ReplicateEffects" = dontDistribute super."ReplicateEffects"; - "ReviewBoard" = dontDistribute super."ReviewBoard"; - "RichConditional" = dontDistribute super."RichConditional"; - "RollingDirectory" = dontDistribute super."RollingDirectory"; - "RoyalMonad" = dontDistribute super."RoyalMonad"; - "RxHaskell" = dontDistribute super."RxHaskell"; - "SBench" = dontDistribute super."SBench"; - "SCalendar" = dontDistribute super."SCalendar"; - "SConfig" = dontDistribute super."SConfig"; - "SDL" = dontDistribute super."SDL"; - "SDL-gfx" = dontDistribute super."SDL-gfx"; - "SDL-image" = dontDistribute super."SDL-image"; - "SDL-mixer" = dontDistribute super."SDL-mixer"; - "SDL-mpeg" = dontDistribute super."SDL-mpeg"; - "SDL-ttf" = dontDistribute super."SDL-ttf"; - "SDL2-ttf" = dontDistribute super."SDL2-ttf"; - "SFML" = dontDistribute super."SFML"; - "SFML-control" = dontDistribute super."SFML-control"; - "SFont" = dontDistribute super."SFont"; - "SG" = dontDistribute super."SG"; - "SGdemo" = dontDistribute super."SGdemo"; - "SGplus" = dontDistribute super."SGplus"; - "SHA2" = dontDistribute super."SHA2"; - "SMTPClient" = dontDistribute super."SMTPClient"; - "SNet" = dontDistribute super."SNet"; - "SQLDeps" = dontDistribute super."SQLDeps"; - "STL" = dontDistribute super."STL"; - "SVG2Q" = dontDistribute super."SVG2Q"; - "SVGPath" = dontDistribute super."SVGPath"; - "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; - "SableCC2Hs" = dontDistribute super."SableCC2Hs"; - "Safe" = dontDistribute super."Safe"; - "Salsa" = dontDistribute super."Salsa"; - "Saturnin" = dontDistribute super."Saturnin"; - "SciFlow" = dontDistribute super."SciFlow"; - "ScratchFs" = dontDistribute super."ScratchFs"; - "Scurry" = dontDistribute super."Scurry"; - "Semantique" = dontDistribute super."Semantique"; - "Semigroup" = dontDistribute super."Semigroup"; - "SeqAlign" = dontDistribute super."SeqAlign"; - "SessionLogger" = dontDistribute super."SessionLogger"; - "ShellCheck" = dontDistribute super."ShellCheck"; - "Shellac" = dontDistribute super."Shellac"; - "Shellac-compatline" = dontDistribute super."Shellac-compatline"; - "Shellac-editline" = dontDistribute super."Shellac-editline"; - "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; - "Shellac-readline" = dontDistribute super."Shellac-readline"; - "ShowF" = dontDistribute super."ShowF"; - "Shrub" = dontDistribute super."Shrub"; - "Shu-thing" = dontDistribute super."Shu-thing"; - "SimpleAES" = dontDistribute super."SimpleAES"; - "SimpleEA" = dontDistribute super."SimpleEA"; - "SimpleGL" = dontDistribute super."SimpleGL"; - "SimpleH" = dontDistribute super."SimpleH"; - "SimpleLog" = dontDistribute super."SimpleLog"; - "SimpleServer" = dontDistribute super."SimpleServer"; - "SizeCompare" = dontDistribute super."SizeCompare"; - "Slides" = dontDistribute super."Slides"; - "Smooth" = dontDistribute super."Smooth"; - "SmtLib" = dontDistribute super."SmtLib"; - "Snusmumrik" = dontDistribute super."Snusmumrik"; - "SoOSiM" = dontDistribute super."SoOSiM"; - "SoccerFun" = dontDistribute super."SoccerFun"; - "SoccerFunGL" = dontDistribute super."SoccerFunGL"; - "Sonnex" = dontDistribute super."Sonnex"; - "SourceGraph" = dontDistribute super."SourceGraph"; - "Southpaw" = dontDistribute super."Southpaw"; - "SpaceInvaders" = dontDistribute super."SpaceInvaders"; - "SpacePrivateers" = dontDistribute super."SpacePrivateers"; - "SpinCounter" = dontDistribute super."SpinCounter"; - "Spock" = doDistribute super."Spock_0_10_0_1"; - "Spock-api" = dontDistribute super."Spock-api"; - "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs"; - "Spock-api-server" = dontDistribute super."Spock-api-server"; - "Spock-auth" = dontDistribute super."Spock-auth"; - "Spock-core" = dontDistribute super."Spock-core"; - "Spock-digestive" = doDistribute super."Spock-digestive_0_2_0_0"; - "Spock-worker" = doDistribute super."Spock-worker_0_3_0_0"; - "SpreadsheetML" = dontDistribute super."SpreadsheetML"; - "Sprig" = dontDistribute super."Sprig"; - "Stasis" = dontDistribute super."Stasis"; - "StateVar-transformer" = dontDistribute super."StateVar-transformer"; - "StatisticalMethods" = dontDistribute super."StatisticalMethods"; - "Stomp" = dontDistribute super."Stomp"; - "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; - "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; - "StrappedTemplates" = dontDistribute super."StrappedTemplates"; - "StrategyLib" = dontDistribute super."StrategyLib"; - "Stream" = dontDistribute super."Stream"; - "StrictBench" = dontDistribute super."StrictBench"; - "StringUtils" = dontDistribute super."StringUtils"; - "SuffixStructures" = dontDistribute super."SuffixStructures"; - "SybWidget" = dontDistribute super."SybWidget"; - "SyntaxMacros" = dontDistribute super."SyntaxMacros"; - "Sysmon" = dontDistribute super."Sysmon"; - "TBC" = dontDistribute super."TBC"; - "TBit" = dontDistribute super."TBit"; - "THEff" = dontDistribute super."THEff"; - "TTTAS" = dontDistribute super."TTTAS"; - "TV" = dontDistribute super."TV"; - "TYB" = dontDistribute super."TYB"; - "TableAlgebra" = dontDistribute super."TableAlgebra"; - "Tables" = dontDistribute super."Tables"; - "Tablify" = dontDistribute super."Tablify"; - "Tahin" = dontDistribute super."Tahin"; - "Tainted" = dontDistribute super."Tainted"; - "Takusen" = dontDistribute super."Takusen"; - "Tape" = dontDistribute super."Tape"; - "TeaHS" = dontDistribute super."TeaHS"; - "Tensor" = dontDistribute super."Tensor"; - "TernaryTrees" = dontDistribute super."TernaryTrees"; - "TestExplode" = dontDistribute super."TestExplode"; - "Theora" = dontDistribute super."Theora"; - "Thingie" = dontDistribute super."Thingie"; - "ThreadObjects" = dontDistribute super."ThreadObjects"; - "Thrift" = dontDistribute super."Thrift"; - "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; - "TicTacToe" = dontDistribute super."TicTacToe"; - "TigerHash" = dontDistribute super."TigerHash"; - "TimePiece" = dontDistribute super."TimePiece"; - "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; - "TinyURL" = dontDistribute super."TinyURL"; - "Titim" = dontDistribute super."Titim"; - "Top" = dontDistribute super."Top"; - "Tournament" = dontDistribute super."Tournament"; - "TraceUtils" = dontDistribute super."TraceUtils"; - "TransformeR" = dontDistribute super."TransformeR"; - "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; - "Transhare" = dontDistribute super."Transhare"; - "TreeCounter" = dontDistribute super."TreeCounter"; - "TreeStructures" = dontDistribute super."TreeStructures"; - "TreeT" = dontDistribute super."TreeT"; - "Treiber" = dontDistribute super."Treiber"; - "TrendGraph" = dontDistribute super."TrendGraph"; - "TrieMap" = dontDistribute super."TrieMap"; - "Twofish" = dontDistribute super."Twofish"; - "TypeClass" = dontDistribute super."TypeClass"; - "TypeCompose" = dontDistribute super."TypeCompose"; - "TypeIlluminator" = dontDistribute super."TypeIlluminator"; - "TypeNat" = dontDistribute super."TypeNat"; - "TypingTester" = dontDistribute super."TypingTester"; - "UISF" = dontDistribute super."UISF"; - "UMM" = dontDistribute super."UMM"; - "URLT" = dontDistribute super."URLT"; - "URLb" = dontDistribute super."URLb"; - "UTFTConverter" = dontDistribute super."UTFTConverter"; - "Unique" = dontDistribute super."Unique"; - "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; - "Updater" = dontDistribute super."Updater"; - "UrlDisp" = dontDistribute super."UrlDisp"; - "Useful" = dontDistribute super."Useful"; - "UtilityTM" = dontDistribute super."UtilityTM"; - "VKHS" = dontDistribute super."VKHS"; - "Validation" = dontDistribute super."Validation"; - "Vec" = dontDistribute super."Vec"; - "Vec-Boolean" = dontDistribute super."Vec-Boolean"; - "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; - "Vec-Transform" = dontDistribute super."Vec-Transform"; - "VecN" = dontDistribute super."VecN"; - "Verba" = dontDistribute super."Verba"; - "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; - "Vulkan" = dontDistribute super."Vulkan"; - "WAVE" = dontDistribute super."WAVE"; - "WL500gPControl" = dontDistribute super."WL500gPControl"; - "WL500gPLib" = dontDistribute super."WL500gPLib"; - "WMSigner" = dontDistribute super."WMSigner"; - "WURFL" = dontDistribute super."WURFL"; - "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; - "WashNGo" = dontDistribute super."WashNGo"; - "WaveFront" = dontDistribute super."WaveFront"; - "Weather" = dontDistribute super."Weather"; - "WebBits" = dontDistribute super."WebBits"; - "WebBits-Html" = dontDistribute super."WebBits-Html"; - "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; - "WebCont" = dontDistribute super."WebCont"; - "WeberLogic" = dontDistribute super."WeberLogic"; - "Webrexp" = dontDistribute super."Webrexp"; - "Wheb" = dontDistribute super."Wheb"; - "WikimediaParser" = dontDistribute super."WikimediaParser"; - "Win32" = doDistribute super."Win32_2_3_1_0"; - "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; - "Win32-errors" = dontDistribute super."Win32-errors"; - "Win32-junction-point" = dontDistribute super."Win32-junction-point"; - "Win32-security" = dontDistribute super."Win32-security"; - "Win32-services" = dontDistribute super."Win32-services"; - "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; - "Wired" = dontDistribute super."Wired"; - "WordAlignment" = dontDistribute super."WordAlignment"; - "WordNet" = dontDistribute super."WordNet"; - "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; - "Wordlint" = dontDistribute super."Wordlint"; - "WxGeneric" = dontDistribute super."WxGeneric"; - "X11-extras" = dontDistribute super."X11-extras"; - "X11-rm" = dontDistribute super."X11-rm"; - "X11-xdamage" = dontDistribute super."X11-xdamage"; - "X11-xfixes" = dontDistribute super."X11-xfixes"; - "X11-xft" = dontDistribute super."X11-xft"; - "X11-xshape" = dontDistribute super."X11-xshape"; - "XAttr" = dontDistribute super."XAttr"; - "XInput" = dontDistribute super."XInput"; - "XMLParser" = dontDistribute super."XMLParser"; - "XMMS" = dontDistribute super."XMMS"; - "XMPP" = dontDistribute super."XMPP"; - "XSaiga" = dontDistribute super."XSaiga"; - "Xec" = dontDistribute super."Xec"; - "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; - "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; - "YACPong" = dontDistribute super."YACPong"; - "YFrob" = dontDistribute super."YFrob"; - "Yablog" = dontDistribute super."Yablog"; - "YamlReference" = dontDistribute super."YamlReference"; - "Yampa-core" = dontDistribute super."Yampa-core"; - "Yocto" = dontDistribute super."Yocto"; - "Yogurt" = dontDistribute super."Yogurt"; - "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; - "ZEBEDDE" = dontDistribute super."ZEBEDDE"; - "ZFS" = dontDistribute super."ZFS"; - "ZMachine" = dontDistribute super."ZMachine"; - "ZipFold" = dontDistribute super."ZipFold"; - "ZipperAG" = dontDistribute super."ZipperAG"; - "Zora" = dontDistribute super."Zora"; - "Zwaluw" = dontDistribute super."Zwaluw"; - "a50" = dontDistribute super."a50"; - "abacate" = dontDistribute super."abacate"; - "abc-puzzle" = dontDistribute super."abc-puzzle"; - "abcBridge" = dontDistribute super."abcBridge"; - "abcnotation" = dontDistribute super."abcnotation"; - "abeson" = dontDistribute super."abeson"; - "abnf" = dontDistribute super."abnf"; - "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; - "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; - "abt" = dontDistribute super."abt"; - "ac-machine" = dontDistribute super."ac-machine"; - "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; - "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; - "accelerate-cublas" = dontDistribute super."accelerate-cublas"; - "accelerate-cuda" = dontDistribute super."accelerate-cuda"; - "accelerate-cufft" = dontDistribute super."accelerate-cufft"; - "accelerate-examples" = dontDistribute super."accelerate-examples"; - "accelerate-fft" = dontDistribute super."accelerate-fft"; - "accelerate-fftw" = dontDistribute super."accelerate-fftw"; - "accelerate-fourier" = dontDistribute super."accelerate-fourier"; - "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; - "accelerate-io" = dontDistribute super."accelerate-io"; - "accelerate-random" = dontDistribute super."accelerate-random"; - "accelerate-typelits" = dontDistribute super."accelerate-typelits"; - "accelerate-utility" = dontDistribute super."accelerate-utility"; - "accentuateus" = dontDistribute super."accentuateus"; - "access-time" = dontDistribute super."access-time"; - "accuerr" = dontDistribute super."accuerr"; - "acid-state" = doDistribute super."acid-state_0_14_1"; - "acid-state-dist" = dontDistribute super."acid-state-dist"; - "acid-state-tls" = dontDistribute super."acid-state-tls"; - "acl2" = dontDistribute super."acl2"; - "acme-all-monad" = dontDistribute super."acme-all-monad"; - "acme-box" = dontDistribute super."acme-box"; - "acme-cadre" = dontDistribute super."acme-cadre"; - "acme-cofunctor" = dontDistribute super."acme-cofunctor"; - "acme-colosson" = dontDistribute super."acme-colosson"; - "acme-comonad" = dontDistribute super."acme-comonad"; - "acme-cutegirl" = dontDistribute super."acme-cutegirl"; - "acme-default" = dontDistribute super."acme-default"; - "acme-dont" = dontDistribute super."acme-dont"; - "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; - "acme-grawlix" = dontDistribute super."acme-grawlix"; - "acme-hq9plus" = dontDistribute super."acme-hq9plus"; - "acme-http" = dontDistribute super."acme-http"; - "acme-inator" = dontDistribute super."acme-inator"; - "acme-io" = dontDistribute super."acme-io"; - "acme-iot" = dontDistribute super."acme-iot"; - "acme-left-pad" = dontDistribute super."acme-left-pad"; - "acme-lolcat" = dontDistribute super."acme-lolcat"; - "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; - "acme-memorandom" = dontDistribute super."acme-memorandom"; - "acme-microwave" = dontDistribute super."acme-microwave"; - "acme-miscorder" = dontDistribute super."acme-miscorder"; - "acme-missiles" = dontDistribute super."acme-missiles"; - "acme-now" = dontDistribute super."acme-now"; - "acme-numbersystem" = dontDistribute super."acme-numbersystem"; - "acme-omitted" = dontDistribute super."acme-omitted"; - "acme-one" = dontDistribute super."acme-one"; - "acme-operators" = dontDistribute super."acme-operators"; - "acme-php" = dontDistribute super."acme-php"; - "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; - "acme-realworld" = dontDistribute super."acme-realworld"; - "acme-safe" = dontDistribute super."acme-safe"; - "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; - "acme-strfry" = dontDistribute super."acme-strfry"; - "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; - "acme-strtok" = dontDistribute super."acme-strtok"; - "acme-timemachine" = dontDistribute super."acme-timemachine"; - "acme-year" = dontDistribute super."acme-year"; - "acme-zero" = dontDistribute super."acme-zero"; - "activehs" = dontDistribute super."activehs"; - "activehs-base" = dontDistribute super."activehs-base"; - "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; - "actor" = dontDistribute super."actor"; - "adaptive-containers" = dontDistribute super."adaptive-containers"; - "adaptive-tuple" = dontDistribute super."adaptive-tuple"; - "adb" = dontDistribute super."adb"; - "adblock2privoxy" = dontDistribute super."adblock2privoxy"; - "addLicenseInfo" = dontDistribute super."addLicenseInfo"; - "adhoc-network" = dontDistribute super."adhoc-network"; - "adict" = dontDistribute super."adict"; - "adler32" = dontDistribute super."adler32"; - "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; - "adp-multi" = dontDistribute super."adp-multi"; - "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; - "aeson" = doDistribute super."aeson_0_11_2_0"; - "aeson-applicative" = dontDistribute super."aeson-applicative"; - "aeson-bson" = dontDistribute super."aeson-bson"; - "aeson-coerce" = dontDistribute super."aeson-coerce"; - "aeson-diff" = dontDistribute super."aeson-diff"; - "aeson-filthy" = dontDistribute super."aeson-filthy"; - "aeson-flatten" = dontDistribute super."aeson-flatten"; - "aeson-injector" = dontDistribute super."aeson-injector"; - "aeson-iproute" = dontDistribute super."aeson-iproute"; - "aeson-json-ast" = dontDistribute super."aeson-json-ast"; - "aeson-native" = dontDistribute super."aeson-native"; - "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; - "aeson-prefix" = dontDistribute super."aeson-prefix"; - "aeson-pretty" = doDistribute super."aeson-pretty_0_7_2"; - "aeson-schema" = dontDistribute super."aeson-schema"; - "aeson-serialize" = dontDistribute super."aeson-serialize"; - "aeson-smart" = dontDistribute super."aeson-smart"; - "aeson-streams" = dontDistribute super."aeson-streams"; - "aeson-t" = dontDistribute super."aeson-t"; - "aeson-toolkit" = dontDistribute super."aeson-toolkit"; - "aeson-value-parser" = dontDistribute super."aeson-value-parser"; - "aeson-yak" = dontDistribute super."aeson-yak"; - "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; - "afis" = dontDistribute super."afis"; - "afv" = dontDistribute super."afv"; - "ag-pictgen" = dontDistribute super."ag-pictgen"; - "agda-server" = dontDistribute super."agda-server"; - "agum" = dontDistribute super."agum"; - "aig" = dontDistribute super."aig"; - "air" = dontDistribute super."air"; - "air-extra" = dontDistribute super."air-extra"; - "air-spec" = dontDistribute super."air-spec"; - "air-th" = dontDistribute super."air-th"; - "airbrake" = dontDistribute super."airbrake"; - "airship" = doDistribute super."airship_0_5_0"; - "aivika" = dontDistribute super."aivika"; - "aivika-branches" = dontDistribute super."aivika-branches"; - "aivika-distributed" = dontDistribute super."aivika-distributed"; - "aivika-experiment" = dontDistribute super."aivika-experiment"; - "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; - "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; - "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; - "aivika-lattice" = dontDistribute super."aivika-lattice"; - "aivika-transformers" = dontDistribute super."aivika-transformers"; - "ajhc" = dontDistribute super."ajhc"; - "al" = dontDistribute super."al"; - "alarmclock" = doDistribute super."alarmclock_0_2_0_9"; - "alea" = dontDistribute super."alea"; - "alex-meta" = dontDistribute super."alex-meta"; - "alex-tools" = dontDistribute super."alex-tools"; - "alfred" = dontDistribute super."alfred"; - "alga" = dontDistribute super."alga"; - "algebra" = dontDistribute super."algebra"; - "algebra-dag" = dontDistribute super."algebra-dag"; - "algebra-sql" = dontDistribute super."algebra-sql"; - "algebraic" = dontDistribute super."algebraic"; - "algebraic-classes" = dontDistribute super."algebraic-classes"; - "algo-s" = dontDistribute super."algo-s"; - "align" = dontDistribute super."align"; - "align-text" = dontDistribute super."align-text"; - "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; - "allocated-processor" = dontDistribute super."allocated-processor"; - "alloy" = dontDistribute super."alloy"; - "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; - "almost-fix" = dontDistribute super."almost-fix"; - "alms" = dontDistribute super."alms"; - "alpha" = dontDistribute super."alpha"; - "alpino-tools" = dontDistribute super."alpino-tools"; - "alsa" = dontDistribute super."alsa"; - "alsa-core" = dontDistribute super."alsa-core"; - "alsa-gui" = dontDistribute super."alsa-gui"; - "alsa-midi" = dontDistribute super."alsa-midi"; - "alsa-mixer" = dontDistribute super."alsa-mixer"; - "alsa-pcm" = dontDistribute super."alsa-pcm"; - "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; - "alsa-seq" = dontDistribute super."alsa-seq"; - "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; - "altcomposition" = dontDistribute super."altcomposition"; - "alternative-io" = dontDistribute super."alternative-io"; - "altfloat" = dontDistribute super."altfloat"; - "alure" = dontDistribute super."alure"; - "amazon-emailer" = dontDistribute super."amazon-emailer"; - "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; - "amazon-products" = dontDistribute super."amazon-products"; - "amazonka-application-autoscaling" = dontDistribute super."amazonka-application-autoscaling"; - "amazonka-discovery" = dontDistribute super."amazonka-discovery"; - "ampersand" = dontDistribute super."ampersand"; - "amqp" = doDistribute super."amqp_0_13_1"; - "amqp-conduit" = dontDistribute super."amqp-conduit"; - "amrun" = dontDistribute super."amrun"; - "analyze-client" = dontDistribute super."analyze-client"; - "anansi" = dontDistribute super."anansi"; - "anansi-hscolour" = dontDistribute super."anansi-hscolour"; - "anansi-pandoc" = dontDistribute super."anansi-pandoc"; - "anatomy" = dontDistribute super."anatomy"; - "android" = dontDistribute super."android"; - "android-lint-summary" = dontDistribute super."android-lint-summary"; - "angle" = dontDistribute super."angle"; - "animalcase" = dontDistribute super."animalcase"; - "annah" = dontDistribute super."annah"; - "annihilator" = dontDistribute super."annihilator"; - "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; - "ansi-pretty" = dontDistribute super."ansi-pretty"; - "ansigraph" = dontDistribute super."ansigraph"; - "antagonist" = dontDistribute super."antagonist"; - "antfarm" = dontDistribute super."antfarm"; - "anticiv" = dontDistribute super."anticiv"; - "antigate" = dontDistribute super."antigate"; - "antimirov" = dontDistribute super."antimirov"; - "antiquoter" = dontDistribute super."antiquoter"; - "antisplice" = dontDistribute super."antisplice"; - "antlrc" = dontDistribute super."antlrc"; - "anydbm" = dontDistribute super."anydbm"; - "aosd" = dontDistribute super."aosd"; - "ap-reflect" = dontDistribute super."ap-reflect"; - "apache-md5" = dontDistribute super."apache-md5"; - "apelsin" = dontDistribute super."apelsin"; - "api-builder" = dontDistribute super."api-builder"; - "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; - "api-tools" = dontDistribute super."api-tools"; - "apiary-helics" = dontDistribute super."apiary-helics"; - "apiary-http-client" = dontDistribute super."apiary-http-client"; - "apiary-purescript" = dontDistribute super."apiary-purescript"; - "apis" = dontDistribute super."apis"; - "apotiki" = dontDistribute super."apotiki"; - "app-lens" = dontDistribute super."app-lens"; - "appc" = dontDistribute super."appc"; - "applicative-extras" = dontDistribute super."applicative-extras"; - "applicative-fail" = dontDistribute super."applicative-fail"; - "applicative-numbers" = dontDistribute super."applicative-numbers"; - "applicative-parsec" = dontDistribute super."applicative-parsec"; - "applicative-quoters" = dontDistribute super."applicative-quoters"; - "applicative-splice" = dontDistribute super."applicative-splice"; - "apply-refact" = doDistribute super."apply-refact_0_2_0_0"; - "apportionment" = dontDistribute super."apportionment"; - "approx-rand-test" = dontDistribute super."approx-rand-test"; - "approximate-equality" = dontDistribute super."approximate-equality"; - "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; - "arb-fft" = dontDistribute super."arb-fft"; - "arbb-vm" = dontDistribute super."arbb-vm"; - "arbtt" = doDistribute super."arbtt_0_9_0_9"; - "archive" = dontDistribute super."archive"; - "archiver" = dontDistribute super."archiver"; - "archlinux" = dontDistribute super."archlinux"; - "archlinux-web" = dontDistribute super."archlinux-web"; - "archnews" = dontDistribute super."archnews"; - "arena" = dontDistribute super."arena"; - "arff" = dontDistribute super."arff"; - "arghwxhaskell" = dontDistribute super."arghwxhaskell"; - "argon" = dontDistribute super."argon"; - "argon2" = dontDistribute super."argon2"; - "argparser" = dontDistribute super."argparser"; - "arguedit" = dontDistribute super."arguedit"; - "ariadne" = dontDistribute super."ariadne"; - "arion" = dontDistribute super."arion"; - "arith-encode" = dontDistribute super."arith-encode"; - "arithmatic" = dontDistribute super."arithmatic"; - "arithmetic" = dontDistribute super."arithmetic"; - "armada" = dontDistribute super."armada"; - "arpa" = dontDistribute super."arpa"; - "array-forth" = dontDistribute super."array-forth"; - "array-memoize" = dontDistribute super."array-memoize"; - "array-primops" = dontDistribute super."array-primops"; - "array-utils" = dontDistribute super."array-utils"; - "arrow-improve" = dontDistribute super."arrow-improve"; - "arrowapply-utils" = dontDistribute super."arrowapply-utils"; - "arrowp" = dontDistribute super."arrowp"; - "arrows" = dontDistribute super."arrows"; - "artery" = dontDistribute super."artery"; - "arx" = dontDistribute super."arx"; - "arxiv" = dontDistribute super."arxiv"; - "ascetic" = dontDistribute super."ascetic"; - "ascii" = dontDistribute super."ascii"; - "ascii-cows" = dontDistribute super."ascii-cows"; - "ascii-flatten" = dontDistribute super."ascii-flatten"; - "ascii-table" = dontDistribute super."ascii-table"; - "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; - "ascii85-conduit" = dontDistribute super."ascii85-conduit"; - "asciidiagram" = doDistribute super."asciidiagram_1_3_1_1"; - "asic" = dontDistribute super."asic"; - "asil" = dontDistribute super."asil"; - "asn1-data" = dontDistribute super."asn1-data"; - "asn1dump" = dontDistribute super."asn1dump"; - "assembler" = dontDistribute super."assembler"; - "assert" = dontDistribute super."assert"; - "assert-failure" = dontDistribute super."assert-failure"; - "assertions" = dontDistribute super."assertions"; - "assimp" = dontDistribute super."assimp"; - "astar" = dontDistribute super."astar"; - "astrds" = dontDistribute super."astrds"; - "astview" = dontDistribute super."astview"; - "astview-utils" = dontDistribute super."astview-utils"; - "async-ajax" = dontDistribute super."async-ajax"; - "async-extras" = dontDistribute super."async-extras"; - "async-manager" = dontDistribute super."async-manager"; - "async-pool" = dontDistribute super."async-pool"; - "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; - "aterm" = dontDistribute super."aterm"; - "aterm-utils" = dontDistribute super."aterm-utils"; - "atl" = dontDistribute super."atl"; - "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; - "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; - "atmos" = dontDistribute super."atmos"; - "atmos-dimensional" = dontDistribute super."atmos-dimensional"; - "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; - "atom" = dontDistribute super."atom"; - "atom-basic" = dontDistribute super."atom-basic"; - "atom-conduit" = doDistribute super."atom-conduit_0_3_1_1"; - "atom-msp430" = dontDistribute super."atom-msp430"; - "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; - "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; - "atomo" = dontDistribute super."atomo"; - "atp-haskell" = dontDistribute super."atp-haskell"; - "atrans" = dontDistribute super."atrans"; - "attempt" = dontDistribute super."attempt"; - "atto-lisp" = dontDistribute super."atto-lisp"; - "attoparsec-arff" = dontDistribute super."attoparsec-arff"; - "attoparsec-binary" = dontDistribute super."attoparsec-binary"; - "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; - "attoparsec-csv" = dontDistribute super."attoparsec-csv"; - "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; - "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; - "attoparsec-text" = dontDistribute super."attoparsec-text"; - "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; - "attosplit" = dontDistribute super."attosplit"; - "atuin" = dontDistribute super."atuin"; - "audacity" = dontDistribute super."audacity"; - "audiovisual" = dontDistribute super."audiovisual"; - "augeas" = dontDistribute super."augeas"; - "augur" = dontDistribute super."augur"; - "aur" = dontDistribute super."aur"; - "aur-api" = dontDistribute super."aur-api"; - "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; - "authenticate-ldap" = dontDistribute super."authenticate-ldap"; - "authinfo-hs" = dontDistribute super."authinfo-hs"; - "authoring" = dontDistribute super."authoring"; - "automitive-cse" = dontDistribute super."automitive-cse"; - "automotive-cse" = dontDistribute super."automotive-cse"; - "autonix-deps" = dontDistribute super."autonix-deps"; - "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; - "autoproc" = dontDistribute super."autoproc"; - "avahi" = dontDistribute super."avahi"; - "avatar-generator" = dontDistribute super."avatar-generator"; - "average" = dontDistribute super."average"; - "avl-static" = dontDistribute super."avl-static"; - "avr-shake" = dontDistribute super."avr-shake"; - "avwx" = dontDistribute super."avwx"; - "awesome-prelude" = dontDistribute super."awesome-prelude"; - "awesomium" = dontDistribute super."awesomium"; - "awesomium-glut" = dontDistribute super."awesomium-glut"; - "awesomium-raw" = dontDistribute super."awesomium-raw"; - "aws" = doDistribute super."aws_0_13_2"; - "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; - "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; - "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; - "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; - "aws-ec2" = dontDistribute super."aws-ec2"; - "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; - "aws-general" = dontDistribute super."aws-general"; - "aws-kinesis" = dontDistribute super."aws-kinesis"; - "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; - "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; - "aws-lambda" = dontDistribute super."aws-lambda"; - "aws-performance-tests" = dontDistribute super."aws-performance-tests"; - "aws-route53" = dontDistribute super."aws-route53"; - "aws-sdk" = dontDistribute super."aws-sdk"; - "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; - "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; - "aws-sign4" = dontDistribute super."aws-sign4"; - "aws-sns" = dontDistribute super."aws-sns"; - "azure-acs" = dontDistribute super."azure-acs"; - "azure-service-api" = dontDistribute super."azure-service-api"; - "azure-servicebus" = dontDistribute super."azure-servicebus"; - "azurify" = dontDistribute super."azurify"; - "b-tree" = dontDistribute super."b-tree"; - "babylon" = dontDistribute super."babylon"; - "backdropper" = dontDistribute super."backdropper"; - "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; - "backward-state" = dontDistribute super."backward-state"; - "bacteria" = dontDistribute super."bacteria"; - "bag" = dontDistribute super."bag"; - "bamboo" = dontDistribute super."bamboo"; - "bamboo-launcher" = dontDistribute super."bamboo-launcher"; - "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; - "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; - "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; - "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; - "bamse" = dontDistribute super."bamse"; - "bamstats" = dontDistribute super."bamstats"; - "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; - "banwords" = dontDistribute super."banwords"; - "barchart" = dontDistribute super."barchart"; - "barcodes-code128" = dontDistribute super."barcodes-code128"; - "barecheck" = dontDistribute super."barecheck"; - "barley" = dontDistribute super."barley"; - "barrie" = dontDistribute super."barrie"; - "barrier-monad" = dontDistribute super."barrier-monad"; - "base-generics" = dontDistribute super."base-generics"; - "base-io-access" = dontDistribute super."base-io-access"; - "base-noprelude" = doDistribute super."base-noprelude_4_8_2_0"; - "base32-bytestring" = dontDistribute super."base32-bytestring"; - "base58-bytestring" = dontDistribute super."base58-bytestring"; - "base58address" = dontDistribute super."base58address"; - "base64-conduit" = dontDistribute super."base64-conduit"; - "base91" = dontDistribute super."base91"; - "basex-client" = dontDistribute super."basex-client"; - "bash" = dontDistribute super."bash"; - "basic-lens" = dontDistribute super."basic-lens"; - "basic-sop" = dontDistribute super."basic-sop"; - "baskell" = dontDistribute super."baskell"; - "battlenet" = dontDistribute super."battlenet"; - "battlenet-yesod" = dontDistribute super."battlenet-yesod"; - "battleships" = dontDistribute super."battleships"; - "bayes-stack" = dontDistribute super."bayes-stack"; - "bbdb" = dontDistribute super."bbdb"; - "bbi" = dontDistribute super."bbi"; - "bcrypt" = doDistribute super."bcrypt_0_0_8"; - "bdd" = dontDistribute super."bdd"; - "bdelta" = dontDistribute super."bdelta"; - "bdo" = dontDistribute super."bdo"; - "beam" = dontDistribute super."beam"; - "beam-th" = dontDistribute super."beam-th"; - "beamable" = dontDistribute super."beamable"; - "bearriver" = dontDistribute super."bearriver"; - "beautifHOL" = dontDistribute super."beautifHOL"; - "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; - "bein" = dontDistribute super."bein"; - "bench" = dontDistribute super."bench"; - "benchmark-function" = dontDistribute super."benchmark-function"; - "bencoding" = dontDistribute super."bencoding"; - "berkeleydb" = dontDistribute super."berkeleydb"; - "berp" = dontDistribute super."berp"; - "bert" = dontDistribute super."bert"; - "besout" = dontDistribute super."besout"; - "bet" = dontDistribute super."bet"; - "betacode" = dontDistribute super."betacode"; - "between" = dontDistribute super."between"; - "bf-cata" = dontDistribute super."bf-cata"; - "bff" = dontDistribute super."bff"; - "bff-mono" = dontDistribute super."bff-mono"; - "bgmax" = dontDistribute super."bgmax"; - "bgzf" = dontDistribute super."bgzf"; - "bibdb" = dontDistribute super."bibdb"; - "bibtex" = dontDistribute super."bibtex"; - "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; - "bidispec" = dontDistribute super."bidispec"; - "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; - "bighugethesaurus" = dontDistribute super."bighugethesaurus"; - "billboard-parser" = dontDistribute super."billboard-parser"; - "billeksah-forms" = dontDistribute super."billeksah-forms"; - "billeksah-main" = dontDistribute super."billeksah-main"; - "billeksah-main-static" = dontDistribute super."billeksah-main-static"; - "billeksah-pane" = dontDistribute super."billeksah-pane"; - "billeksah-services" = dontDistribute super."billeksah-services"; - "bimaps" = dontDistribute super."bimaps"; - "binary-communicator" = dontDistribute super."binary-communicator"; - "binary-derive" = dontDistribute super."binary-derive"; - "binary-enum" = dontDistribute super."binary-enum"; - "binary-file" = dontDistribute super."binary-file"; - "binary-generic" = dontDistribute super."binary-generic"; - "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; - "binary-literal-qq" = dontDistribute super."binary-literal-qq"; - "binary-protocol" = dontDistribute super."binary-protocol"; - "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; - "binary-state" = dontDistribute super."binary-state"; - "binary-store" = dontDistribute super."binary-store"; - "binary-streams" = dontDistribute super."binary-streams"; - "binary-strict" = dontDistribute super."binary-strict"; - "binarydefer" = dontDistribute super."binarydefer"; - "bind-marshal" = dontDistribute super."bind-marshal"; - "binding-core" = dontDistribute super."binding-core"; - "binding-gtk" = dontDistribute super."binding-gtk"; - "binding-wx" = dontDistribute super."binding-wx"; - "bindings" = dontDistribute super."bindings"; - "bindings-EsounD" = dontDistribute super."bindings-EsounD"; - "bindings-K8055" = dontDistribute super."bindings-K8055"; - "bindings-apr" = dontDistribute super."bindings-apr"; - "bindings-apr-util" = dontDistribute super."bindings-apr-util"; - "bindings-audiofile" = dontDistribute super."bindings-audiofile"; - "bindings-bfd" = dontDistribute super."bindings-bfd"; - "bindings-cctools" = dontDistribute super."bindings-cctools"; - "bindings-codec2" = dontDistribute super."bindings-codec2"; - "bindings-common" = dontDistribute super."bindings-common"; - "bindings-dc1394" = dontDistribute super."bindings-dc1394"; - "bindings-directfb" = dontDistribute super."bindings-directfb"; - "bindings-eskit" = dontDistribute super."bindings-eskit"; - "bindings-fann" = dontDistribute super."bindings-fann"; - "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; - "bindings-friso" = dontDistribute super."bindings-friso"; - "bindings-glib" = dontDistribute super."bindings-glib"; - "bindings-gobject" = dontDistribute super."bindings-gobject"; - "bindings-gpgme" = dontDistribute super."bindings-gpgme"; - "bindings-gsl" = dontDistribute super."bindings-gsl"; - "bindings-gts" = dontDistribute super."bindings-gts"; - "bindings-hamlib" = dontDistribute super."bindings-hamlib"; - "bindings-hdf5" = dontDistribute super."bindings-hdf5"; - "bindings-levmar" = dontDistribute super."bindings-levmar"; - "bindings-libcddb" = dontDistribute super."bindings-libcddb"; - "bindings-libffi" = dontDistribute super."bindings-libffi"; - "bindings-libftdi" = dontDistribute super."bindings-libftdi"; - "bindings-librrd" = dontDistribute super."bindings-librrd"; - "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; - "bindings-libusb" = dontDistribute super."bindings-libusb"; - "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; - "bindings-libzip" = dontDistribute super."bindings-libzip"; - "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; - "bindings-lxc" = dontDistribute super."bindings-lxc"; - "bindings-mmap" = dontDistribute super."bindings-mmap"; - "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; - "bindings-nettle" = dontDistribute super."bindings-nettle"; - "bindings-parport" = dontDistribute super."bindings-parport"; - "bindings-portaudio" = dontDistribute super."bindings-portaudio"; - "bindings-potrace" = dontDistribute super."bindings-potrace"; - "bindings-ppdev" = dontDistribute super."bindings-ppdev"; - "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; - "bindings-sane" = dontDistribute super."bindings-sane"; - "bindings-sc3" = dontDistribute super."bindings-sc3"; - "bindings-sipc" = dontDistribute super."bindings-sipc"; - "bindings-sophia" = dontDistribute super."bindings-sophia"; - "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; - "bindings-svm" = dontDistribute super."bindings-svm"; - "bindings-uname" = dontDistribute super."bindings-uname"; - "bindings-wlc" = dontDistribute super."bindings-wlc"; - "bindings-yices" = dontDistribute super."bindings-yices"; - "bindynamic" = dontDistribute super."bindynamic"; - "binembed" = dontDistribute super."binembed"; - "binembed-example" = dontDistribute super."binembed-example"; - "bini" = dontDistribute super."bini"; - "bio" = dontDistribute super."bio"; - "biohazard" = dontDistribute super."biohazard"; - "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; - "biophd" = doDistribute super."biophd_0_0_4"; - "biosff" = dontDistribute super."biosff"; - "biostockholm" = dontDistribute super."biostockholm"; - "bird" = dontDistribute super."bird"; - "bit-array" = dontDistribute super."bit-array"; - "bit-vector" = dontDistribute super."bit-vector"; - "bitarray" = dontDistribute super."bitarray"; - "bitcoin-payment-channel" = dontDistribute super."bitcoin-payment-channel"; - "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; - "bitly-cli" = dontDistribute super."bitly-cli"; - "bitmap" = dontDistribute super."bitmap"; - "bitmap-opengl" = dontDistribute super."bitmap-opengl"; - "bitmaps" = dontDistribute super."bitmaps"; - "bits" = doDistribute super."bits_0_4"; - "bits-atomic" = dontDistribute super."bits-atomic"; - "bits-bytestring" = dontDistribute super."bits-bytestring"; - "bits-bytestring-lazy" = dontDistribute super."bits-bytestring-lazy"; - "bits-conduit" = dontDistribute super."bits-conduit"; - "bits-extras" = dontDistribute super."bits-extras"; - "bitset" = dontDistribute super."bitset"; - "bitspeak" = dontDistribute super."bitspeak"; - "bitstream" = dontDistribute super."bitstream"; - "bitstring" = dontDistribute super."bitstring"; - "bittorrent" = dontDistribute super."bittorrent"; - "bitvec" = dontDistribute super."bitvec"; - "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; - "bk-tree" = dontDistribute super."bk-tree"; - "bkr" = dontDistribute super."bkr"; - "bktrees" = dontDistribute super."bktrees"; - "bla" = dontDistribute super."bla"; - "black-jewel" = dontDistribute super."black-jewel"; - "blacktip" = dontDistribute super."blacktip"; - "blake2" = doDistribute super."blake2_0_1_0"; - "blakesum" = dontDistribute super."blakesum"; - "blakesum-demo" = dontDistribute super."blakesum-demo"; - "blas" = dontDistribute super."blas"; - "blas-hs" = dontDistribute super."blas-hs"; - "blatex" = dontDistribute super."blatex"; - "blaze" = dontDistribute super."blaze"; - "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; - "blaze-from-html" = dontDistribute super."blaze-from-html"; - "blaze-html" = doDistribute super."blaze-html_0_8_1_1"; - "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; - "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; - "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; - "blaze-json" = dontDistribute super."blaze-json"; - "blaze-markup" = doDistribute super."blaze-markup_0_7_0_3"; - "blaze-shields" = dontDistribute super."blaze-shields"; - "blaze-textual-native" = dontDistribute super."blaze-textual-native"; - "blazeMarker" = dontDistribute super."blazeMarker"; - "blink1" = dontDistribute super."blink1"; - "blip" = dontDistribute super."blip"; - "bliplib" = dontDistribute super."bliplib"; - "blockhash" = dontDistribute super."blockhash"; - "blocking-transactions" = dontDistribute super."blocking-transactions"; - "blogination" = dontDistribute super."blogination"; - "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; - "bloomfilter-redis" = dontDistribute super."bloomfilter-redis"; - "blosum" = dontDistribute super."blosum"; - "bloxorz" = dontDistribute super."bloxorz"; - "blubber" = dontDistribute super."blubber"; - "blubber-server" = dontDistribute super."blubber-server"; - "bluetile" = dontDistribute super."bluetile"; - "bluetileutils" = dontDistribute super."bluetileutils"; - "blunt" = dontDistribute super."blunt"; - "bmp" = doDistribute super."bmp_1_2_5_2"; - "board-games" = dontDistribute super."board-games"; - "bogre-banana" = dontDistribute super."bogre-banana"; - "bond" = dontDistribute super."bond"; - "bond-haskell" = dontDistribute super."bond-haskell"; - "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; - "bookkeeper" = dontDistribute super."bookkeeper"; - "boolean-list" = dontDistribute super."boolean-list"; - "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; - "boolexpr" = dontDistribute super."boolexpr"; - "bools" = dontDistribute super."bools"; - "boolsimplifier" = dontDistribute super."boolsimplifier"; - "boomange" = dontDistribute super."boomange"; - "boombox" = dontDistribute super."boombox"; - "boomslang" = dontDistribute super."boomslang"; - "borel" = dontDistribute super."borel"; - "boring-window-switcher" = dontDistribute super."boring-window-switcher"; - "bot" = dontDistribute super."bot"; - "botpp" = dontDistribute super."botpp"; - "bound-gen" = dontDistribute super."bound-gen"; - "bounded-tchan" = dontDistribute super."bounded-tchan"; - "boundingboxes" = dontDistribute super."boundingboxes"; - "bowntz" = dontDistribute super."bowntz"; - "box-tuples" = dontDistribute super."box-tuples"; - "bpann" = dontDistribute super."bpann"; - "braid" = dontDistribute super."braid"; - "brainfuck" = dontDistribute super."brainfuck"; - "brainfuck-monad" = dontDistribute super."brainfuck-monad"; - "brainfuck-tut" = dontDistribute super."brainfuck-tut"; - "break" = dontDistribute super."break"; - "breakout" = dontDistribute super."breakout"; - "breve" = dontDistribute super."breve"; - "brians-brain" = dontDistribute super."brians-brain"; - "brick" = doDistribute super."brick_0_4_1"; - "brillig" = dontDistribute super."brillig"; - "broccoli" = dontDistribute super."broccoli"; - "broker-haskell" = dontDistribute super."broker-haskell"; - "bsd-sysctl" = dontDistribute super."bsd-sysctl"; - "bson-generic" = dontDistribute super."bson-generic"; - "bson-generics" = dontDistribute super."bson-generics"; - "bson-mapping" = dontDistribute super."bson-mapping"; - "bspack" = dontDistribute super."bspack"; - "bsparse" = dontDistribute super."bsparse"; - "btree-concurrent" = dontDistribute super."btree-concurrent"; - "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; - "buffer-pipe" = dontDistribute super."buffer-pipe"; - "buffon" = dontDistribute super."buffon"; - "bugzilla" = dontDistribute super."bugzilla"; - "buildable" = dontDistribute super."buildable"; - "buildbox" = dontDistribute super."buildbox"; - "buildbox-tools" = dontDistribute super."buildbox-tools"; - "buildwrapper" = dontDistribute super."buildwrapper"; - "bullet" = dontDistribute super."bullet"; - "burst-detection" = dontDistribute super."burst-detection"; - "bus-pirate" = dontDistribute super."bus-pirate"; - "buster" = dontDistribute super."buster"; - "buster-gtk" = dontDistribute super."buster-gtk"; - "buster-network" = dontDistribute super."buster-network"; - "butterflies" = dontDistribute super."butterflies"; - "bv" = dontDistribute super."bv"; - "byline" = dontDistribute super."byline"; - "bytable" = dontDistribute super."bytable"; - "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; - "bytestring-builder" = doDistribute super."bytestring-builder_0_10_6_0_0"; - "bytestring-class" = dontDistribute super."bytestring-class"; - "bytestring-csv" = dontDistribute super."bytestring-csv"; - "bytestring-delta" = dontDistribute super."bytestring-delta"; - "bytestring-from" = dontDistribute super."bytestring-from"; - "bytestring-nums" = dontDistribute super."bytestring-nums"; - "bytestring-plain" = dontDistribute super."bytestring-plain"; - "bytestring-rematch" = dontDistribute super."bytestring-rematch"; - "bytestring-short" = dontDistribute super."bytestring-short"; - "bytestring-show" = dontDistribute super."bytestring-show"; - "bytestring-tree-builder" = doDistribute super."bytestring-tree-builder_0_2_7"; - "bytestringparser" = dontDistribute super."bytestringparser"; - "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; - "bytestringreadp" = dontDistribute super."bytestringreadp"; - "c-dsl" = dontDistribute super."c-dsl"; - "c-io" = dontDistribute super."c-io"; - "c-storable-deriving" = dontDistribute super."c-storable-deriving"; - "c0check" = dontDistribute super."c0check"; - "c0parser" = dontDistribute super."c0parser"; - "c10k" = dontDistribute super."c10k"; - "c2hsc" = dontDistribute super."c2hsc"; - "cab" = dontDistribute super."cab"; - "cabal" = dontDistribute super."cabal"; - "cabal-audit" = dontDistribute super."cabal-audit"; - "cabal-bounds" = dontDistribute super."cabal-bounds"; - "cabal-cargs" = dontDistribute super."cabal-cargs"; - "cabal-constraints" = dontDistribute super."cabal-constraints"; - "cabal-db" = dontDistribute super."cabal-db"; - "cabal-dev" = dontDistribute super."cabal-dev"; - "cabal-dir" = dontDistribute super."cabal-dir"; - "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; - "cabal-ghci" = dontDistribute super."cabal-ghci"; - "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; - "cabal-helper" = doDistribute super."cabal-helper_0_6_3_1"; - "cabal-info" = dontDistribute super."cabal-info"; - "cabal-install" = doDistribute super."cabal-install_1_22_9_0"; - "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; - "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; - "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; - "cabal-lenses" = dontDistribute super."cabal-lenses"; - "cabal-macosx" = dontDistribute super."cabal-macosx"; - "cabal-meta" = dontDistribute super."cabal-meta"; - "cabal-mon" = dontDistribute super."cabal-mon"; - "cabal-nirvana" = dontDistribute super."cabal-nirvana"; - "cabal-progdeps" = dontDistribute super."cabal-progdeps"; - "cabal-query" = dontDistribute super."cabal-query"; - "cabal-rpm" = doDistribute super."cabal-rpm_0_9_11"; - "cabal-scripts" = dontDistribute super."cabal-scripts"; - "cabal-setup" = dontDistribute super."cabal-setup"; - "cabal-sign" = dontDistribute super."cabal-sign"; - "cabal-test" = dontDistribute super."cabal-test"; - "cabal-test-bin" = dontDistribute super."cabal-test-bin"; - "cabal-test-compat" = dontDistribute super."cabal-test-compat"; - "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; - "cabal-uninstall" = dontDistribute super."cabal-uninstall"; - "cabal-upload" = dontDistribute super."cabal-upload"; - "cabal2arch" = dontDistribute super."cabal2arch"; - "cabal2doap" = dontDistribute super."cabal2doap"; - "cabal2ebuild" = dontDistribute super."cabal2ebuild"; - "cabal2ghci" = dontDistribute super."cabal2ghci"; - "cabal2nix" = dontDistribute super."cabal2nix"; - "cabal2spec" = dontDistribute super."cabal2spec"; - "cabalQuery" = dontDistribute super."cabalQuery"; - "cabalg" = dontDistribute super."cabalg"; - "cabalgraph" = dontDistribute super."cabalgraph"; - "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; - "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; - "cabalvchk" = dontDistribute super."cabalvchk"; - "cabin" = dontDistribute super."cabin"; - "cabocha" = dontDistribute super."cabocha"; - "cache" = dontDistribute super."cache"; - "cached-io" = dontDistribute super."cached-io"; - "cached-traversable" = dontDistribute super."cached-traversable"; - "cacophony" = doDistribute super."cacophony_0_6_0"; - "caf" = dontDistribute super."caf"; - "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; - "caffegraph" = dontDistribute super."caffegraph"; - "cairo" = doDistribute super."cairo_0_13_1_1"; - "cairo-appbase" = dontDistribute super."cairo-appbase"; - "cake" = dontDistribute super."cake"; - "cake3" = dontDistribute super."cake3"; - "cakyrespa" = dontDistribute super."cakyrespa"; - "cal3d" = dontDistribute super."cal3d"; - "cal3d-examples" = dontDistribute super."cal3d-examples"; - "cal3d-opengl" = dontDistribute super."cal3d-opengl"; - "calc" = dontDistribute super."calc"; - "caldims" = dontDistribute super."caldims"; - "caledon" = dontDistribute super."caledon"; - "calendar-recycling" = dontDistribute super."calendar-recycling"; - "call" = dontDistribute super."call"; - "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; - "camfort" = dontDistribute super."camfort"; - "camh" = dontDistribute super."camh"; - "campfire" = dontDistribute super."campfire"; - "canonical-filepath" = dontDistribute super."canonical-filepath"; - "canteven-config" = dontDistribute super."canteven-config"; - "canteven-http" = dontDistribute super."canteven-http"; - "canteven-listen-http" = dontDistribute super."canteven-listen-http"; - "canteven-log" = dontDistribute super."canteven-log"; - "canteven-parsedate" = dontDistribute super."canteven-parsedate"; - "canteven-template" = dontDistribute super."canteven-template"; - "cantor" = dontDistribute super."cantor"; - "cao" = dontDistribute super."cao"; - "cap" = dontDistribute super."cap"; - "capped-list" = dontDistribute super."capped-list"; - "capri" = dontDistribute super."capri"; - "car-pool" = dontDistribute super."car-pool"; - "caramia" = dontDistribute super."caramia"; - "carboncopy" = dontDistribute super."carboncopy"; - "carettah" = dontDistribute super."carettah"; - "carray" = doDistribute super."carray_0_1_6_4"; - "cartel" = doDistribute super."cartel_0_16_0_0"; - "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; - "casadi-bindings" = dontDistribute super."casadi-bindings"; - "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; - "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; - "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; - "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; - "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; - "cascading" = dontDistribute super."cascading"; - "case-conversion" = dontDistribute super."case-conversion"; - "case-insensitive-match" = dontDistribute super."case-insensitive-match"; - "cash" = dontDistribute super."cash"; - "casing" = dontDistribute super."casing"; - "casr-logbook" = dontDistribute super."casr-logbook"; - "casr-logbook-html" = dontDistribute super."casr-logbook-html"; - "casr-logbook-meta" = dontDistribute super."casr-logbook-meta"; - "casr-logbook-meta-html" = dontDistribute super."casr-logbook-meta-html"; - "casr-logbook-reports" = dontDistribute super."casr-logbook-reports"; - "casr-logbook-reports-html" = dontDistribute super."casr-logbook-reports-html"; - "casr-logbook-reports-meta" = dontDistribute super."casr-logbook-reports-meta"; - "casr-logbook-reports-meta-html" = dontDistribute super."casr-logbook-reports-meta-html"; - "casr-logbook-types" = dontDistribute super."casr-logbook-types"; - "cassandra-cql" = dontDistribute super."cassandra-cql"; - "cassandra-thrift" = dontDistribute super."cassandra-thrift"; - "cassava-conduit" = dontDistribute super."cassava-conduit"; - "cassava-megaparsec" = dontDistribute super."cassava-megaparsec"; - "cassava-streams" = dontDistribute super."cassava-streams"; - "cassette" = dontDistribute super."cassette"; - "cassy" = dontDistribute super."cassy"; - "castle" = dontDistribute super."castle"; - "casui" = dontDistribute super."casui"; - "catamorphism" = dontDistribute super."catamorphism"; - "catch-fd" = dontDistribute super."catch-fd"; - "categorical-algebra" = dontDistribute super."categorical-algebra"; - "categories" = dontDistribute super."categories"; - "category-extras" = dontDistribute super."category-extras"; - "category-printf" = dontDistribute super."category-printf"; - "category-traced" = dontDistribute super."category-traced"; - "cayley-dickson" = dontDistribute super."cayley-dickson"; - "cblrepo" = dontDistribute super."cblrepo"; - "cci" = dontDistribute super."cci"; - "ccnx" = dontDistribute super."ccnx"; - "cctools-workqueue" = dontDistribute super."cctools-workqueue"; - "cedict" = dontDistribute super."cedict"; - "cef" = dontDistribute super."cef"; - "ceilometer-common" = dontDistribute super."ceilometer-common"; - "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; - "cerberus" = dontDistribute super."cerberus"; - "cereal" = doDistribute super."cereal_0_5_2_0"; - "cereal-derive" = dontDistribute super."cereal-derive"; - "cereal-enumerator" = dontDistribute super."cereal-enumerator"; - "cereal-ieee754" = dontDistribute super."cereal-ieee754"; - "cereal-io-streams" = dontDistribute super."cereal-io-streams"; - "cereal-plus" = dontDistribute super."cereal-plus"; - "cereal-streams" = dontDistribute super."cereal-streams"; - "cereal-text" = dontDistribute super."cereal-text"; - "certificate" = dontDistribute super."certificate"; - "cf" = dontDistribute super."cf"; - "cfipu" = dontDistribute super."cfipu"; - "cflp" = dontDistribute super."cflp"; - "cfopu" = dontDistribute super."cfopu"; - "cg" = dontDistribute super."cg"; - "cgen" = dontDistribute super."cgen"; - "cgi-undecidable" = dontDistribute super."cgi-undecidable"; - "cgi-utils" = dontDistribute super."cgi-utils"; - "cgrep" = dontDistribute super."cgrep"; - "chain-codes" = dontDistribute super."chain-codes"; - "chalk" = dontDistribute super."chalk"; - "chalkboard" = dontDistribute super."chalkboard"; - "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; - "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; - "chan-split" = dontDistribute super."chan-split"; - "change-monger" = dontDistribute super."change-monger"; - "charade" = dontDistribute super."charade"; - "charsetdetect" = dontDistribute super."charsetdetect"; - "chart-histogram" = dontDistribute super."chart-histogram"; - "chaselev-deque" = dontDistribute super."chaselev-deque"; - "chatter" = dontDistribute super."chatter"; - "chatty" = dontDistribute super."chatty"; - "chatty-text" = dontDistribute super."chatty-text"; - "chatty-utils" = dontDistribute super."chatty-utils"; - "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; - "check-pvp" = dontDistribute super."check-pvp"; - "checked" = dontDistribute super."checked"; - "chell-hunit" = dontDistribute super."chell-hunit"; - "chesshs" = dontDistribute super."chesshs"; - "chevalier-common" = dontDistribute super."chevalier-common"; - "chorale" = dontDistribute super."chorale"; - "chorale-geo" = dontDistribute super."chorale-geo"; - "chp" = dontDistribute super."chp"; - "chp-mtl" = dontDistribute super."chp-mtl"; - "chp-plus" = dontDistribute super."chp-plus"; - "chp-spec" = dontDistribute super."chp-spec"; - "chp-transformers" = dontDistribute super."chp-transformers"; - "chronograph" = dontDistribute super."chronograph"; - "chronos" = dontDistribute super."chronos"; - "chu2" = dontDistribute super."chu2"; - "chuchu" = dontDistribute super."chuchu"; - "chunked-data" = doDistribute super."chunked-data_0_2_0"; - "chunks" = dontDistribute super."chunks"; - "chunky" = dontDistribute super."chunky"; - "church-list" = dontDistribute super."church-list"; - "cil" = dontDistribute super."cil"; - "cinvoke" = dontDistribute super."cinvoke"; - "cio" = dontDistribute super."cio"; - "cipher-aes128" = doDistribute super."cipher-aes128_0_7_0_1"; - "cipher-rc5" = dontDistribute super."cipher-rc5"; - "ciphersaber2" = dontDistribute super."ciphersaber2"; - "circ" = dontDistribute super."circ"; - "circlehs" = dontDistribute super."circlehs"; - "cirru-parser" = dontDistribute super."cirru-parser"; - "citation-resolve" = dontDistribute super."citation-resolve"; - "citeproc-hs" = dontDistribute super."citeproc-hs"; - "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; - "cityhash" = dontDistribute super."cityhash"; - "cjk" = dontDistribute super."cjk"; - "clac" = dontDistribute super."clac"; - "clafer" = dontDistribute super."clafer"; - "claferIG" = dontDistribute super."claferIG"; - "claferwiki" = dontDistribute super."claferwiki"; - "clang-pure" = dontDistribute super."clang-pure"; - "clanki" = dontDistribute super."clanki"; - "clarifai" = dontDistribute super."clarifai"; - "clash" = dontDistribute super."clash"; - "clash-ghc" = doDistribute super."clash-ghc_0_6_21"; - "clash-lib" = doDistribute super."clash-lib_0_6_19"; - "clash-prelude" = doDistribute super."clash-prelude_0_10_10"; - "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; - "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_7"; - "clash-verilog" = doDistribute super."clash-verilog_0_6_7"; - "clash-vhdl" = doDistribute super."clash-vhdl_0_6_15"; - "classify" = dontDistribute super."classify"; - "classy-parallel" = dontDistribute super."classy-parallel"; - "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; - "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_8"; - "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_8"; - "clay" = doDistribute super."clay_0_10_1"; - "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; - "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; - "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; - "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_3"; - "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; - "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; - "cld2" = dontDistribute super."cld2"; - "clean-home" = dontDistribute super."clean-home"; - "clean-unions" = dontDistribute super."clean-unions"; - "cless" = dontDistribute super."cless"; - "clevercss" = dontDistribute super."clevercss"; - "cli" = dontDistribute super."cli"; - "click-clack" = dontDistribute super."click-clack"; - "clifford" = dontDistribute super."clifford"; - "clippard" = dontDistribute super."clippard"; - "clipper" = dontDistribute super."clipper"; - "clippings" = dontDistribute super."clippings"; - "clist" = dontDistribute super."clist"; - "cloben" = dontDistribute super."cloben"; - "clocked" = dontDistribute super."clocked"; - "clogparse" = dontDistribute super."clogparse"; - "clone-all" = dontDistribute super."clone-all"; - "closure" = dontDistribute super."closure"; - "cloud-haskell" = dontDistribute super."cloud-haskell"; - "cloudfront-signer" = dontDistribute super."cloudfront-signer"; - "cloudyfs" = dontDistribute super."cloudyfs"; - "cltw" = dontDistribute super."cltw"; - "clua" = dontDistribute super."clua"; - "cluss" = dontDistribute super."cluss"; - "clustertools" = dontDistribute super."clustertools"; - "clutterhs" = dontDistribute super."clutterhs"; - "cmaes" = dontDistribute super."cmaes"; - "cmark-highlight" = dontDistribute super."cmark-highlight"; - "cmark-lucid" = dontDistribute super."cmark-lucid"; - "cmark-sections" = dontDistribute super."cmark-sections"; - "cmath" = dontDistribute super."cmath"; - "cmathml3" = dontDistribute super."cmathml3"; - "cmd-item" = dontDistribute super."cmd-item"; - "cmdargs-browser" = dontDistribute super."cmdargs-browser"; - "cmdlib" = dontDistribute super."cmdlib"; - "cmdtheline" = dontDistribute super."cmdtheline"; - "cml" = dontDistribute super."cml"; - "cmonad" = dontDistribute super."cmonad"; - "cmph" = dontDistribute super."cmph"; - "cmu" = dontDistribute super."cmu"; - "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; - "cndict" = dontDistribute super."cndict"; - "codec" = dontDistribute super."codec"; - "codec-libevent" = dontDistribute super."codec-libevent"; - "codec-mbox" = dontDistribute super."codec-mbox"; - "codecov-haskell" = dontDistribute super."codecov-haskell"; - "codemonitor" = dontDistribute super."codemonitor"; - "codepad" = dontDistribute super."codepad"; - "codeworld-api" = dontDistribute super."codeworld-api"; - "codex" = doDistribute super."codex_0_4_0_10"; - "codo-notation" = dontDistribute super."codo-notation"; - "cofunctor" = dontDistribute super."cofunctor"; - "cognimeta-utils" = dontDistribute super."cognimeta-utils"; - "coin" = dontDistribute super."coin"; - "coinbase-exchange" = dontDistribute super."coinbase-exchange"; - "colada" = dontDistribute super."colada"; - "colchis" = dontDistribute super."colchis"; - "collada-output" = dontDistribute super."collada-output"; - "collada-types" = dontDistribute super."collada-types"; - "collapse-util" = dontDistribute super."collapse-util"; - "collection-json" = dontDistribute super."collection-json"; - "collections" = dontDistribute super."collections"; - "collections-api" = dontDistribute super."collections-api"; - "collections-base-instances" = dontDistribute super."collections-base-instances"; - "colock" = dontDistribute super."colock"; - "colonnade" = dontDistribute super."colonnade"; - "color-counter" = dontDistribute super."color-counter"; - "colorize-haskell" = dontDistribute super."colorize-haskell"; - "colors" = dontDistribute super."colors"; - "coltrane" = dontDistribute super."coltrane"; - "com" = dontDistribute super."com"; - "combinat" = dontDistribute super."combinat"; - "combinat-diagrams" = dontDistribute super."combinat-diagrams"; - "combinator-interactive" = dontDistribute super."combinator-interactive"; - "combinatorial-problems" = dontDistribute super."combinatorial-problems"; - "combinatorics" = dontDistribute super."combinatorics"; - "combobuffer" = dontDistribute super."combobuffer"; - "comfort-graph" = dontDistribute super."comfort-graph"; - "command" = dontDistribute super."command"; - "command-qq" = dontDistribute super."command-qq"; - "commander" = dontDistribute super."commander"; - "commodities" = dontDistribute super."commodities"; - "commsec" = dontDistribute super."commsec"; - "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; - "comonad" = doDistribute super."comonad_4_2_7_2"; - "comonad-extras" = dontDistribute super."comonad-extras"; - "comonad-random" = dontDistribute super."comonad-random"; - "compact-map" = dontDistribute super."compact-map"; - "compact-socket" = dontDistribute super."compact-socket"; - "compact-string" = dontDistribute super."compact-string"; - "compact-string-fix" = dontDistribute super."compact-string-fix"; - "compare-type" = dontDistribute super."compare-type"; - "compdata-automata" = dontDistribute super."compdata-automata"; - "compdata-dags" = dontDistribute super."compdata-dags"; - "compdata-param" = dontDistribute super."compdata-param"; - "compensated" = dontDistribute super."compensated"; - "competition" = dontDistribute super."competition"; - "compilation" = dontDistribute super."compilation"; - "complex-generic" = dontDistribute super."complex-generic"; - "complex-integrate" = dontDistribute super."complex-integrate"; - "complexity" = dontDistribute super."complexity"; - "compose-ltr" = dontDistribute super."compose-ltr"; - "compose-trans" = dontDistribute super."compose-trans"; - "compound-types" = dontDistribute super."compound-types"; - "compression" = dontDistribute super."compression"; - "compstrat" = dontDistribute super."compstrat"; - "comptrans" = dontDistribute super."comptrans"; - "computational-algebra" = dontDistribute super."computational-algebra"; - "computations" = dontDistribute super."computations"; - "concorde" = dontDistribute super."concorde"; - "concraft" = dontDistribute super."concraft"; - "concraft-hr" = dontDistribute super."concraft-hr"; - "concraft-pl" = dontDistribute super."concraft-pl"; - "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; - "concrete-typerep" = dontDistribute super."concrete-typerep"; - "concurrent-barrier" = dontDistribute super."concurrent-barrier"; - "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; - "concurrent-machines" = dontDistribute super."concurrent-machines"; - "concurrent-output" = doDistribute super."concurrent-output_1_7_6"; - "concurrent-rpc" = dontDistribute super."concurrent-rpc"; - "concurrent-sa" = dontDistribute super."concurrent-sa"; - "concurrent-split" = dontDistribute super."concurrent-split"; - "concurrent-state" = dontDistribute super."concurrent-state"; - "concurrent-utilities" = dontDistribute super."concurrent-utilities"; - "concurrentoutput" = dontDistribute super."concurrentoutput"; - "cond" = dontDistribute super."cond"; - "condor" = dontDistribute super."condor"; - "condorcet" = dontDistribute super."condorcet"; - "conductive-base" = dontDistribute super."conductive-base"; - "conductive-clock" = dontDistribute super."conductive-clock"; - "conductive-hsc3" = dontDistribute super."conductive-hsc3"; - "conductive-song" = dontDistribute super."conductive-song"; - "conduit" = doDistribute super."conduit_1_2_6_6"; - "conduit-audio" = dontDistribute super."conduit-audio"; - "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; - "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; - "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; - "conduit-combinators" = doDistribute super."conduit-combinators_1_0_4"; - "conduit-find" = dontDistribute super."conduit-find"; - "conduit-merge" = dontDistribute super."conduit-merge"; - "conduit-network-stream" = dontDistribute super."conduit-network-stream"; - "conduit-parse" = doDistribute super."conduit-parse_0_1_1_1"; - "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; - "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; - "conf" = dontDistribute super."conf"; - "conffmt" = dontDistribute super."conffmt"; - "config-manager" = dontDistribute super."config-manager"; - "config-select" = dontDistribute super."config-select"; - "config-value" = dontDistribute super."config-value"; - "config-value-getopt" = dontDistribute super."config-value-getopt"; - "configifier" = dontDistribute super."configifier"; - "configuration" = dontDistribute super."configuration"; - "confsolve" = dontDistribute super."confsolve"; - "congruence-relation" = dontDistribute super."congruence-relation"; - "conjugateGradient" = dontDistribute super."conjugateGradient"; - "conjure" = dontDistribute super."conjure"; - "conlogger" = dontDistribute super."conlogger"; - "connection" = doDistribute super."connection_0_2_5"; - "connection-pool" = dontDistribute super."connection-pool"; - "consistent" = dontDistribute super."consistent"; - "console-program" = dontDistribute super."console-program"; - "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; - "constrained-categories" = dontDistribute super."constrained-categories"; - "constrained-dynamic" = dontDistribute super."constrained-dynamic"; - "constrained-normal" = dontDistribute super."constrained-normal"; - "constraint-classes" = dontDistribute super."constraint-classes"; - "constructible" = dontDistribute super."constructible"; - "constructive-algebra" = dontDistribute super."constructive-algebra"; - "consumers" = dontDistribute super."consumers"; - "container" = dontDistribute super."container"; - "container-builder" = dontDistribute super."container-builder"; - "container-classes" = dontDistribute super."container-classes"; - "containers-benchmark" = dontDistribute super."containers-benchmark"; - "containers-deepseq" = dontDistribute super."containers-deepseq"; - "context-free-grammar" = dontDistribute super."context-free-grammar"; - "context-stack" = dontDistribute super."context-stack"; - "continue" = dontDistribute super."continue"; - "continuum" = dontDistribute super."continuum"; - "continuum-client" = dontDistribute super."continuum-client"; - "contravariant-extras" = doDistribute super."contravariant-extras_0_3_2"; - "control-event" = dontDistribute super."control-event"; - "control-monad-attempt" = dontDistribute super."control-monad-attempt"; - "control-monad-exception" = dontDistribute super."control-monad-exception"; - "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; - "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; - "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; - "control-monad-failure" = dontDistribute super."control-monad-failure"; - "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; - "control-monad-queue" = dontDistribute super."control-monad-queue"; - "control-timeout" = dontDistribute super."control-timeout"; - "contstuff" = dontDistribute super."contstuff"; - "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; - "contstuff-transformers" = dontDistribute super."contstuff-transformers"; - "conversion" = dontDistribute super."conversion"; - "conversion-bytestring" = dontDistribute super."conversion-bytestring"; - "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; - "conversion-text" = dontDistribute super."conversion-text"; - "convert" = dontDistribute super."convert"; - "convertible-ascii" = dontDistribute super."convertible-ascii"; - "convertible-text" = dontDistribute super."convertible-text"; - "cookbook" = dontDistribute super."cookbook"; - "coordinate" = dontDistribute super."coordinate"; - "copilot" = dontDistribute super."copilot"; - "copilot-c99" = dontDistribute super."copilot-c99"; - "copilot-cbmc" = dontDistribute super."copilot-cbmc"; - "copilot-core" = dontDistribute super."copilot-core"; - "copilot-language" = dontDistribute super."copilot-language"; - "copilot-libraries" = dontDistribute super."copilot-libraries"; - "copilot-sbv" = dontDistribute super."copilot-sbv"; - "copilot-theorem" = dontDistribute super."copilot-theorem"; - "copr" = dontDistribute super."copr"; - "core" = dontDistribute super."core"; - "core-compiler" = dontDistribute super."core-compiler"; - "core-haskell" = dontDistribute super."core-haskell"; - "corebot-bliki" = dontDistribute super."corebot-bliki"; - "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; - "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; - "coroutine-object" = dontDistribute super."coroutine-object"; - "couch-hs" = dontDistribute super."couch-hs"; - "couch-simple" = dontDistribute super."couch-simple"; - "couchdb-conduit" = dontDistribute super."couchdb-conduit"; - "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; - "count" = dontDistribute super."count"; - "countable" = dontDistribute super."countable"; - "counter" = dontDistribute super."counter"; - "courier" = doDistribute super."courier_0_1_1_3"; - "court" = dontDistribute super."court"; - "coverage" = dontDistribute super."coverage"; - "cpio-conduit" = dontDistribute super."cpio-conduit"; - "cplex-hs" = dontDistribute super."cplex-hs"; - "cplusplus-th" = dontDistribute super."cplusplus-th"; - "cpphs" = doDistribute super."cpphs_1_20_1"; - "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; - "cpsa" = dontDistribute super."cpsa"; - "cpuid" = dontDistribute super."cpuid"; - "cpuinfo" = dontDistribute super."cpuinfo"; - "cpuperf" = dontDistribute super."cpuperf"; - "cpython" = dontDistribute super."cpython"; - "cql" = doDistribute super."cql_3_0_7"; - "cql-io" = doDistribute super."cql-io_0_15_2"; - "cqrs" = dontDistribute super."cqrs"; - "cqrs-core" = dontDistribute super."cqrs-core"; - "cqrs-example" = dontDistribute super."cqrs-example"; - "cqrs-memory" = dontDistribute super."cqrs-memory"; - "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; - "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; - "cqrs-test" = dontDistribute super."cqrs-test"; - "cqrs-testkit" = dontDistribute super."cqrs-testkit"; - "cqrs-types" = dontDistribute super."cqrs-types"; - "cr" = dontDistribute super."cr"; - "crack" = dontDistribute super."crack"; - "craftwerk" = dontDistribute super."craftwerk"; - "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; - "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; - "crawlchain" = dontDistribute super."crawlchain"; - "craze" = dontDistribute super."craze"; - "crc" = dontDistribute super."crc"; - "crc16" = dontDistribute super."crc16"; - "crc16-table" = dontDistribute super."crc16-table"; - "creatur" = dontDistribute super."creatur"; - "credentials" = dontDistribute super."credentials"; - "credentials-cli" = dontDistribute super."credentials-cli"; - "crf-chain1" = dontDistribute super."crf-chain1"; - "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; - "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; - "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; - "critbit" = dontDistribute super."critbit"; - "criterion-plus" = dontDistribute super."criterion-plus"; - "criterion-to-html" = dontDistribute super."criterion-to-html"; - "crockford" = dontDistribute super."crockford"; - "crocodile" = dontDistribute super."crocodile"; - "cron-compat" = dontDistribute super."cron-compat"; - "cruncher-types" = dontDistribute super."cruncher-types"; - "crunghc" = dontDistribute super."crunghc"; - "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; - "crypto-classical" = dontDistribute super."crypto-classical"; - "crypto-conduit" = dontDistribute super."crypto-conduit"; - "crypto-enigma" = dontDistribute super."crypto-enigma"; - "crypto-multihash" = dontDistribute super."crypto-multihash"; - "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; - "crypto-random-effect" = dontDistribute super."crypto-random-effect"; - "crypto-totp" = dontDistribute super."crypto-totp"; - "cryptohash-md5" = dontDistribute super."cryptohash-md5"; - "cryptohash-sha1" = dontDistribute super."cryptohash-sha1"; - "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; - "cryptol" = doDistribute super."cryptol_2_3_0"; - "cryptonite" = doDistribute super."cryptonite_0_15"; - "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; - "cryptsy-api" = dontDistribute super."cryptsy-api"; - "crystalfontz" = dontDistribute super."crystalfontz"; - "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; - "csound-catalog" = dontDistribute super."csound-catalog"; - "csound-expression" = dontDistribute super."csound-expression"; - "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; - "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; - "csound-expression-typed" = dontDistribute super."csound-expression-typed"; - "csound-sampler" = dontDistribute super."csound-sampler"; - "csp" = dontDistribute super."csp"; - "cspmchecker" = dontDistribute super."cspmchecker"; - "css" = dontDistribute super."css"; - "css-text" = doDistribute super."css-text_0_1_2_1"; - "csv-enumerator" = dontDistribute super."csv-enumerator"; - "csv-nptools" = dontDistribute super."csv-nptools"; - "csv-table" = dontDistribute super."csv-table"; - "csv-to-qif" = dontDistribute super."csv-to-qif"; - "ctemplate" = dontDistribute super."ctemplate"; - "ctkl" = dontDistribute super."ctkl"; - "ctpl" = dontDistribute super."ctpl"; - "cube" = dontDistribute super."cube"; - "cubical" = dontDistribute super."cubical"; - "cubicbezier" = dontDistribute super."cubicbezier"; - "cublas" = dontDistribute super."cublas"; - "cuboid" = dontDistribute super."cuboid"; - "cuda" = dontDistribute super."cuda"; - "cudd" = dontDistribute super."cudd"; - "cufft" = dontDistribute super."cufft"; - "curl-aeson" = dontDistribute super."curl-aeson"; - "curlhs" = dontDistribute super."curlhs"; - "currency" = dontDistribute super."currency"; - "currency-convert" = dontDistribute super."currency-convert"; - "current-locale" = dontDistribute super."current-locale"; - "curry-base" = dontDistribute super."curry-base"; - "curry-frontend" = dontDistribute super."curry-frontend"; - "cursedcsv" = dontDistribute super."cursedcsv"; - "curve25519" = dontDistribute super."curve25519"; - "curves" = dontDistribute super."curves"; - "custom-prelude" = dontDistribute super."custom-prelude"; - "cv-combinators" = dontDistribute super."cv-combinators"; - "cyclotomic" = dontDistribute super."cyclotomic"; - "cypher" = dontDistribute super."cypher"; - "d-bus" = dontDistribute super."d-bus"; - "d3d11binding" = dontDistribute super."d3d11binding"; - "d3js" = dontDistribute super."d3js"; - "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; - "daemons" = dontDistribute super."daemons"; - "dag" = dontDistribute super."dag"; - "damnpacket" = dontDistribute super."damnpacket"; - "danibot" = dontDistribute super."danibot"; - "dao" = dontDistribute super."dao"; - "dapi" = dontDistribute super."dapi"; - "darcs" = doDistribute super."darcs_2_12_0"; - "darcs-benchmark" = dontDistribute super."darcs-benchmark"; - "darcs-beta" = dontDistribute super."darcs-beta"; - "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; - "darcs-cabalized" = dontDistribute super."darcs-cabalized"; - "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; - "darcs-graph" = dontDistribute super."darcs-graph"; - "darcs-monitor" = dontDistribute super."darcs-monitor"; - "darcs-scripts" = dontDistribute super."darcs-scripts"; - "darcs2dot" = dontDistribute super."darcs2dot"; - "darcsden" = dontDistribute super."darcsden"; - "darcswatch" = dontDistribute super."darcswatch"; - "darkplaces-demo" = dontDistribute super."darkplaces-demo"; - "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; - "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; - "darkplaces-text" = dontDistribute super."darkplaces-text"; - "dash-haskell" = dontDistribute super."dash-haskell"; - "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; - "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; - "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; - "data-accessor-template" = dontDistribute super."data-accessor-template"; - "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; - "data-aviary" = dontDistribute super."data-aviary"; - "data-base" = dontDistribute super."data-base"; - "data-bword" = dontDistribute super."data-bword"; - "data-carousel" = dontDistribute super."data-carousel"; - "data-category" = dontDistribute super."data-category"; - "data-cell" = dontDistribute super."data-cell"; - "data-check" = dontDistribute super."data-check"; - "data-checked" = dontDistribute super."data-checked"; - "data-clist" = dontDistribute super."data-clist"; - "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; - "data-construction" = dontDistribute super."data-construction"; - "data-cycle" = dontDistribute super."data-cycle"; - "data-default" = doDistribute super."data-default_0_5_3"; - "data-default-class" = doDistribute super."data-default-class_0_0_1"; - "data-default-extra" = dontDistribute super."data-default-extra"; - "data-default-generics" = dontDistribute super."data-default-generics"; - "data-default-instances-base" = doDistribute super."data-default-instances-base_0_1_0"; - "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; - "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; - "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; - "data-default-instances-text" = dontDistribute super."data-default-instances-text"; - "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; - "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; - "data-dispersal" = dontDistribute super."data-dispersal"; - "data-dword" = dontDistribute super."data-dword"; - "data-easy" = dontDistribute super."data-easy"; - "data-elf" = dontDistribute super."data-elf"; - "data-embed" = dontDistribute super."data-embed"; - "data-endian" = dontDistribute super."data-endian"; - "data-extend-generic" = dontDistribute super."data-extend-generic"; - "data-extra" = dontDistribute super."data-extra"; - "data-filepath" = dontDistribute super."data-filepath"; - "data-files-gen" = dontDistribute super."data-files-gen"; - "data-fin" = dontDistribute super."data-fin"; - "data-fin-simple" = dontDistribute super."data-fin-simple"; - "data-fix" = dontDistribute super."data-fix"; - "data-fix-cse" = dontDistribute super."data-fix-cse"; - "data-flags" = dontDistribute super."data-flags"; - "data-flagset" = dontDistribute super."data-flagset"; - "data-fresh" = dontDistribute super."data-fresh"; - "data-function-meld" = dontDistribute super."data-function-meld"; - "data-function-tacit" = dontDistribute super."data-function-tacit"; - "data-interval" = dontDistribute super."data-interval"; - "data-ivar" = dontDistribute super."data-ivar"; - "data-json-token" = dontDistribute super."data-json-token"; - "data-kiln" = dontDistribute super."data-kiln"; - "data-layer" = dontDistribute super."data-layer"; - "data-layout" = dontDistribute super."data-layout"; - "data-lens" = dontDistribute super."data-lens"; - "data-lens-fd" = dontDistribute super."data-lens-fd"; - "data-lens-ixset" = dontDistribute super."data-lens-ixset"; - "data-lens-template" = dontDistribute super."data-lens-template"; - "data-list-sequences" = dontDistribute super."data-list-sequences"; - "data-map-multikey" = dontDistribute super."data-map-multikey"; - "data-msgpack" = dontDistribute super."data-msgpack"; - "data-named" = dontDistribute super."data-named"; - "data-nat" = dontDistribute super."data-nat"; - "data-object" = dontDistribute super."data-object"; - "data-object-json" = dontDistribute super."data-object-json"; - "data-object-yaml" = dontDistribute super."data-object-yaml"; - "data-partition" = dontDistribute super."data-partition"; - "data-pprint" = dontDistribute super."data-pprint"; - "data-quotientref" = dontDistribute super."data-quotientref"; - "data-r-tree" = dontDistribute super."data-r-tree"; - "data-ref" = dontDistribute super."data-ref"; - "data-reify-cse" = dontDistribute super."data-reify-cse"; - "data-repr" = dontDistribute super."data-repr"; - "data-result" = dontDistribute super."data-result"; - "data-rev" = dontDistribute super."data-rev"; - "data-rope" = dontDistribute super."data-rope"; - "data-rtuple" = dontDistribute super."data-rtuple"; - "data-serializer" = dontDistribute super."data-serializer"; - "data-size" = dontDistribute super."data-size"; - "data-spacepart" = dontDistribute super."data-spacepart"; - "data-store" = dontDistribute super."data-store"; - "data-stringmap" = dontDistribute super."data-stringmap"; - "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; - "data-sword" = dontDistribute super."data-sword"; - "data-tensor" = dontDistribute super."data-tensor"; - "data-textual" = dontDistribute super."data-textual"; - "data-timeout" = dontDistribute super."data-timeout"; - "data-transform" = dontDistribute super."data-transform"; - "data-treify" = dontDistribute super."data-treify"; - "data-type" = dontDistribute super."data-type"; - "data-util" = dontDistribute super."data-util"; - "data-variant" = dontDistribute super."data-variant"; - "database-migrate" = dontDistribute super."database-migrate"; - "database-study" = dontDistribute super."database-study"; - "datadog" = dontDistribute super."datadog"; - "dataenc" = dontDistribute super."dataenc"; - "dataflow" = dontDistribute super."dataflow"; - "datalog" = dontDistribute super."datalog"; - "datapacker" = dontDistribute super."datapacker"; - "date-cache" = dontDistribute super."date-cache"; - "dates" = dontDistribute super."dates"; - "datetime" = dontDistribute super."datetime"; - "datetime-sb" = dontDistribute super."datetime-sb"; - "dawdle" = dontDistribute super."dawdle"; - "dawg" = dontDistribute super."dawg"; - "dawg-ord" = doDistribute super."dawg-ord_0_5_0_1"; - "dbcleaner" = dontDistribute super."dbcleaner"; - "dbf" = dontDistribute super."dbf"; - "dbjava" = dontDistribute super."dbjava"; - "dbm" = dontDistribute super."dbm"; - "dbus-client" = dontDistribute super."dbus-client"; - "dbus-core" = dontDistribute super."dbus-core"; - "dbus-qq" = dontDistribute super."dbus-qq"; - "dbus-th" = dontDistribute super."dbus-th"; - "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; - "dclabel" = dontDistribute super."dclabel"; - "dclabel-eci11" = dontDistribute super."dclabel-eci11"; - "ddate" = dontDistribute super."ddate"; - "ddc-base" = dontDistribute super."ddc-base"; - "ddc-build" = dontDistribute super."ddc-build"; - "ddc-code" = dontDistribute super."ddc-code"; - "ddc-core" = dontDistribute super."ddc-core"; - "ddc-core-babel" = dontDistribute super."ddc-core-babel"; - "ddc-core-eval" = dontDistribute super."ddc-core-eval"; - "ddc-core-flow" = dontDistribute super."ddc-core-flow"; - "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; - "ddc-core-salt" = dontDistribute super."ddc-core-salt"; - "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; - "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; - "ddc-driver" = dontDistribute super."ddc-driver"; - "ddc-interface" = dontDistribute super."ddc-interface"; - "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; - "ddc-tools" = dontDistribute super."ddc-tools"; - "ddc-war" = dontDistribute super."ddc-war"; - "ddci-core" = dontDistribute super."ddci-core"; - "dead-code-detection" = dontDistribute super."dead-code-detection"; - "dead-simple-json" = dontDistribute super."dead-simple-json"; - "debian-binary" = dontDistribute super."debian-binary"; - "debian-build" = doDistribute super."debian-build_0_9_2_0"; - "debug-diff" = dontDistribute super."debug-diff"; - "debug-time" = dontDistribute super."debug-time"; - "decepticons" = dontDistribute super."decepticons"; - "decimal-arithmetic" = dontDistribute super."decimal-arithmetic"; - "decode-utf8" = dontDistribute super."decode-utf8"; - "decoder-conduit" = dontDistribute super."decoder-conduit"; - "dedukti" = dontDistribute super."dedukti"; - "deepcontrol" = dontDistribute super."deepcontrol"; - "deeplearning-hs" = dontDistribute super."deeplearning-hs"; - "deepseq-bounded" = dontDistribute super."deepseq-bounded"; - "deepseq-generics" = doDistribute super."deepseq-generics_0_1_1_2"; - "deepseq-magic" = dontDistribute super."deepseq-magic"; - "deepseq-th" = dontDistribute super."deepseq-th"; - "deepzoom" = dontDistribute super."deepzoom"; - "defargs" = dontDistribute super."defargs"; - "definitive-base" = dontDistribute super."definitive-base"; - "definitive-filesystem" = dontDistribute super."definitive-filesystem"; - "definitive-graphics" = dontDistribute super."definitive-graphics"; - "definitive-parser" = dontDistribute super."definitive-parser"; - "definitive-reactive" = dontDistribute super."definitive-reactive"; - "definitive-sound" = dontDistribute super."definitive-sound"; - "deiko-config" = dontDistribute super."deiko-config"; - "deka" = dontDistribute super."deka"; - "deka-tests" = dontDistribute super."deka-tests"; - "delaunay" = dontDistribute super."delaunay"; - "delay" = dontDistribute super."delay"; - "delicious" = dontDistribute super."delicious"; - "delimited-text" = dontDistribute super."delimited-text"; - "delimiter-separated" = dontDistribute super."delimiter-separated"; - "delta" = dontDistribute super."delta"; - "delta-h" = dontDistribute super."delta-h"; - "delude" = dontDistribute super."delude"; - "demarcate" = dontDistribute super."demarcate"; - "denominate" = dontDistribute super."denominate"; - "dense" = dontDistribute super."dense"; - "dependent-map" = doDistribute super."dependent-map_0_2_2_0"; - "dependent-state" = dontDistribute super."dependent-state"; - "depends" = dontDistribute super."depends"; - "dephd" = dontDistribute super."dephd"; - "deque" = dontDistribute super."deque"; - "dequeue" = dontDistribute super."dequeue"; - "derangement" = dontDistribute super."derangement"; - "derivation-trees" = dontDistribute super."derivation-trees"; - "derive-IG" = dontDistribute super."derive-IG"; - "derive-enumerable" = dontDistribute super."derive-enumerable"; - "derive-gadt" = dontDistribute super."derive-gadt"; - "derive-monoid" = dontDistribute super."derive-monoid"; - "derive-topdown" = dontDistribute super."derive-topdown"; - "derive-trie" = dontDistribute super."derive-trie"; - "deriving-compat" = doDistribute super."deriving-compat_0_2"; - "derp" = dontDistribute super."derp"; - "derp-lib" = dontDistribute super."derp-lib"; - "descrilo" = dontDistribute super."descrilo"; - "desert" = dontDistribute super."desert"; - "despair" = dontDistribute super."despair"; - "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; - "detrospector" = dontDistribute super."detrospector"; - "deunicode" = dontDistribute super."deunicode"; - "devil" = dontDistribute super."devil"; - "dewdrop" = dontDistribute super."dewdrop"; - "dfrac" = dontDistribute super."dfrac"; - "dfsbuild" = dontDistribute super."dfsbuild"; - "dgim" = dontDistribute super."dgim"; - "dgs" = dontDistribute super."dgs"; - "dia-base" = dontDistribute super."dia-base"; - "dia-functions" = dontDistribute super."dia-functions"; - "diagrams-boolean" = dontDistribute super."diagrams-boolean"; - "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_3"; - "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1"; - "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5"; - "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_11"; - "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; - "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; - "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6"; - "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_3"; - "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; - "diagrams-pdf" = dontDistribute super."diagrams-pdf"; - "diagrams-pgf" = dontDistribute super."diagrams-pgf"; - "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; - "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_7"; - "diagrams-reflex" = dontDistribute super."diagrams-reflex"; - "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; - "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_10"; - "diagrams-tikz" = dontDistribute super."diagrams-tikz"; - "diagrams-wx" = dontDistribute super."diagrams-wx"; - "dialog" = dontDistribute super."dialog"; - "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; - "dicom" = dontDistribute super."dicom"; - "dictionary-sharing" = dontDistribute super."dictionary-sharing"; - "dictparser" = dontDistribute super."dictparser"; - "diet" = dontDistribute super."diet"; - "diff-gestalt" = dontDistribute super."diff-gestalt"; - "diff-parse" = dontDistribute super."diff-parse"; - "diffarray" = dontDistribute super."diffarray"; - "diffcabal" = dontDistribute super."diffcabal"; - "diffdump" = dontDistribute super."diffdump"; - "difftodo" = dontDistribute super."difftodo"; - "digamma" = dontDistribute super."digamma"; - "digest-pure" = dontDistribute super."digest-pure"; - "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; - "digestive-functors" = doDistribute super."digestive-functors_0_8_0_1"; - "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; - "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; - "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; - "digestive-functors-lucid" = doDistribute super."digestive-functors-lucid_0_0_0_3"; - "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; - "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; - "digit" = dontDistribute super."digit"; - "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; - "digits" = doDistribute super."digits_0_2"; - "dimensional-codata" = dontDistribute super."dimensional-codata"; - "dimensional-tf" = dontDistribute super."dimensional-tf"; - "dingo-core" = dontDistribute super."dingo-core"; - "dingo-example" = dontDistribute super."dingo-example"; - "dingo-widgets" = dontDistribute super."dingo-widgets"; - "diophantine" = dontDistribute super."diophantine"; - "diplomacy" = dontDistribute super."diplomacy"; - "diplomacy-server" = dontDistribute super."diplomacy-server"; - "direct-binary-files" = dontDistribute super."direct-binary-files"; - "direct-daemonize" = dontDistribute super."direct-daemonize"; - "direct-fastcgi" = dontDistribute super."direct-fastcgi"; - "direct-http" = dontDistribute super."direct-http"; - "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; - "direct-plugins" = dontDistribute super."direct-plugins"; - "directed-cubical" = dontDistribute super."directed-cubical"; - "directory-layout" = dontDistribute super."directory-layout"; - "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser"; - "directory-tree" = doDistribute super."directory-tree_0_12_0"; - "dirfiles" = dontDistribute super."dirfiles"; - "dirstream" = dontDistribute super."dirstream"; - "disassembler" = dontDistribute super."disassembler"; - "discogs-haskell" = dontDistribute super."discogs-haskell"; - "discordian-calendar" = dontDistribute super."discordian-calendar"; - "discrete-space-map" = dontDistribute super."discrete-space-map"; - "discrimination" = dontDistribute super."discrimination"; - "disjoint-set" = dontDistribute super."disjoint-set"; - "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; - "dist-upload" = dontDistribute super."dist-upload"; - "distributed-process-azure" = dontDistribute super."distributed-process-azure"; - "distributed-process-ekg" = dontDistribute super."distributed-process-ekg"; - "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; - "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; - "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; - "distributed-process-platform" = dontDistribute super."distributed-process-platform"; - "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; - "distribution" = dontDistribute super."distribution"; - "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; - "distribution-plot" = dontDistribute super."distribution-plot"; - "djembe" = dontDistribute super."djembe"; - "djinn" = dontDistribute super."djinn"; - "djinn-th" = dontDistribute super."djinn-th"; - "dlist" = doDistribute super."dlist_0_7_1_2"; - "dns" = doDistribute super."dns_2_0_4"; - "dnscache" = dontDistribute super."dnscache"; - "dnsrbl" = dontDistribute super."dnsrbl"; - "dnssd" = dontDistribute super."dnssd"; - "do-list" = dontDistribute super."do-list"; - "doc-review" = dontDistribute super."doc-review"; - "doccheck" = dontDistribute super."doccheck"; - "docidx" = dontDistribute super."docidx"; - "docker" = dontDistribute super."docker"; - "dockercook" = dontDistribute super."dockercook"; - "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; - "doctest-prop" = dontDistribute super."doctest-prop"; - "docvim" = dontDistribute super."docvim"; - "dom-lt" = dontDistribute super."dom-lt"; - "dom-parser" = dontDistribute super."dom-parser"; - "dom-selector" = dontDistribute super."dom-selector"; - "domain-auth" = dontDistribute super."domain-auth"; - "dominion" = dontDistribute super."dominion"; - "domplate" = dontDistribute super."domplate"; - "dot" = dontDistribute super."dot"; - "dot-linker" = dontDistribute super."dot-linker"; - "dot2graphml" = dontDistribute super."dot2graphml"; - "dotenv" = doDistribute super."dotenv_0_3_0_1"; - "dotfs" = dontDistribute super."dotfs"; - "dotgen" = dontDistribute super."dotgen"; - "double-metaphone" = dontDistribute super."double-metaphone"; - "dove" = dontDistribute super."dove"; - "dow" = dontDistribute super."dow"; - "download-curl" = dontDistribute super."download-curl"; - "download-media-content" = dontDistribute super."download-media-content"; - "dozenal" = dontDistribute super."dozenal"; - "dozens" = dontDistribute super."dozens"; - "dph-base" = dontDistribute super."dph-base"; - "dph-examples" = dontDistribute super."dph-examples"; - "dph-lifted-base" = dontDistribute super."dph-lifted-base"; - "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; - "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; - "dph-par" = dontDistribute super."dph-par"; - "dph-prim-interface" = dontDistribute super."dph-prim-interface"; - "dph-prim-par" = dontDistribute super."dph-prim-par"; - "dph-prim-seq" = dontDistribute super."dph-prim-seq"; - "dph-seq" = dontDistribute super."dph-seq"; - "dpkg" = dontDistribute super."dpkg"; - "dpor" = doDistribute super."dpor_0_1_0_1"; - "drClickOn" = dontDistribute super."drClickOn"; - "draw-poker" = dontDistribute super."draw-poker"; - "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; - "drmaa" = dontDistribute super."drmaa"; - "dropbox-sdk" = dontDistribute super."dropbox-sdk"; - "dropsolve" = dontDistribute super."dropsolve"; - "ds-kanren" = dontDistribute super."ds-kanren"; - "dsh-sql" = dontDistribute super."dsh-sql"; - "dsmc" = dontDistribute super."dsmc"; - "dsmc-tools" = dontDistribute super."dsmc-tools"; - "dson" = dontDistribute super."dson"; - "dson-parsec" = dontDistribute super."dson-parsec"; - "dsp" = dontDistribute super."dsp"; - "dstring" = dontDistribute super."dstring"; - "dtab" = dontDistribute super."dtab"; - "dtd" = dontDistribute super."dtd"; - "dtd-text" = dontDistribute super."dtd-text"; - "dtd-types" = dontDistribute super."dtd-types"; - "dtrace" = dontDistribute super."dtrace"; - "dtw" = dontDistribute super."dtw"; - "dump" = dontDistribute super."dump"; - "dunai" = dontDistribute super."dunai"; - "duplo" = dontDistribute super."duplo"; - "dustme" = dontDistribute super."dustme"; - "dvda" = dontDistribute super."dvda"; - "dvdread" = dontDistribute super."dvdread"; - "dvi-processing" = dontDistribute super."dvi-processing"; - "dvorak" = dontDistribute super."dvorak"; - "dwarf" = dontDistribute super."dwarf"; - "dwarf-el" = dontDistribute super."dwarf-el"; - "dwarfadt" = dontDistribute super."dwarfadt"; - "dx9base" = dontDistribute super."dx9base"; - "dx9d3d" = dontDistribute super."dx9d3d"; - "dx9d3dx" = dontDistribute super."dx9d3dx"; - "dynamic-cabal" = dontDistribute super."dynamic-cabal"; - "dynamic-graph" = dontDistribute super."dynamic-graph"; - "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; - "dynamic-loader" = dontDistribute super."dynamic-loader"; - "dynamic-mvector" = dontDistribute super."dynamic-mvector"; - "dynamic-object" = dontDistribute super."dynamic-object"; - "dynamic-plot" = dontDistribute super."dynamic-plot"; - "dynamic-pp" = dontDistribute super."dynamic-pp"; - "dynobud" = dontDistribute super."dynobud"; - "dywapitchtrack" = dontDistribute super."dywapitchtrack"; - "dzen-utils" = dontDistribute super."dzen-utils"; - "eager-sockets" = dontDistribute super."eager-sockets"; - "easy-api" = dontDistribute super."easy-api"; - "easy-bitcoin" = dontDistribute super."easy-bitcoin"; - "easyjson" = dontDistribute super."easyjson"; - "easyplot" = dontDistribute super."easyplot"; - "easyrender" = dontDistribute super."easyrender"; - "ebeats" = dontDistribute super."ebeats"; - "ebnf-bff" = dontDistribute super."ebnf-bff"; - "ec2-signature" = dontDistribute super."ec2-signature"; - "ec2-unikernel" = dontDistribute super."ec2-unikernel"; - "eccrypto" = dontDistribute super."eccrypto"; - "ecdsa" = dontDistribute super."ecdsa"; - "ecma262" = dontDistribute super."ecma262"; - "ecu" = dontDistribute super."ecu"; - "ed25519" = dontDistribute super."ed25519"; - "ed25519-donna" = dontDistribute super."ed25519-donna"; - "eddie" = dontDistribute super."eddie"; - "ede" = doDistribute super."ede_0_2_8_4"; - "edenmodules" = dontDistribute super."edenmodules"; - "edenskel" = dontDistribute super."edenskel"; - "edentv" = dontDistribute super."edentv"; - "edge" = dontDistribute super."edge"; - "edis" = dontDistribute super."edis"; - "edit-lenses" = dontDistribute super."edit-lenses"; - "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; - "editable" = dontDistribute super."editable"; - "editline" = dontDistribute super."editline"; - "editpipe" = dontDistribute super."editpipe"; - "effect-monad" = dontDistribute super."effect-monad"; - "effective-aspects" = dontDistribute super."effective-aspects"; - "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; - "effects" = dontDistribute super."effects"; - "effects-parser" = dontDistribute super."effects-parser"; - "effin" = dontDistribute super."effin"; - "egison" = dontDistribute super."egison"; - "egison-quote" = dontDistribute super."egison-quote"; - "egison-tutorial" = dontDistribute super."egison-tutorial"; - "ehaskell" = dontDistribute super."ehaskell"; - "ehs" = dontDistribute super."ehs"; - "eibd-client-simple" = dontDistribute super."eibd-client-simple"; - "eigen" = dontDistribute super."eigen"; - "eithers" = dontDistribute super."eithers"; - "ekg-bosun" = dontDistribute super."ekg-bosun"; - "ekg-carbon" = dontDistribute super."ekg-carbon"; - "ekg-log" = dontDistribute super."ekg-log"; - "ekg-push" = dontDistribute super."ekg-push"; - "ekg-rrd" = dontDistribute super."ekg-rrd"; - "ekg-statsd" = doDistribute super."ekg-statsd_0_2_0_4"; - "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; - "elerea" = dontDistribute super."elerea"; - "elerea-examples" = dontDistribute super."elerea-examples"; - "elerea-sdl" = dontDistribute super."elerea-sdl"; - "elevator" = dontDistribute super."elevator"; - "elf" = dontDistribute super."elf"; - "elision" = dontDistribute super."elision"; - "elm-build-lib" = dontDistribute super."elm-build-lib"; - "elm-compiler" = dontDistribute super."elm-compiler"; - "elm-export" = dontDistribute super."elm-export"; - "elm-get" = dontDistribute super."elm-get"; - "elm-hybrid" = dontDistribute super."elm-hybrid"; - "elm-init" = dontDistribute super."elm-init"; - "elm-make" = dontDistribute super."elm-make"; - "elm-package" = dontDistribute super."elm-package"; - "elm-reactor" = dontDistribute super."elm-reactor"; - "elm-repl" = dontDistribute super."elm-repl"; - "elm-server" = dontDistribute super."elm-server"; - "elm-yesod" = dontDistribute super."elm-yesod"; - "elo" = dontDistribute super."elo"; - "elocrypt" = dontDistribute super."elocrypt"; - "emacs-keys" = dontDistribute super."emacs-keys"; - "email" = dontDistribute super."email"; - "email-header" = dontDistribute super."email-header"; - "email-postmark" = dontDistribute super."email-postmark"; - "email-validate-json" = dontDistribute super."email-validate-json"; - "email-validator" = dontDistribute super."email-validator"; - "emailaddress" = dontDistribute super."emailaddress"; - "emailparse" = dontDistribute super."emailparse"; - "embeddock" = dontDistribute super."embeddock"; - "embeddock-example" = dontDistribute super."embeddock-example"; - "embroidery" = dontDistribute super."embroidery"; - "emgm" = dontDistribute super."emgm"; - "empty" = dontDistribute super."empty"; - "enchant" = dontDistribute super."enchant"; - "encoding" = dontDistribute super."encoding"; - "encoding-io" = dontDistribute super."encoding-io"; - "endo" = dontDistribute super."endo"; - "engine-io-growler" = dontDistribute super."engine-io-growler"; - "engine-io-snap" = dontDistribute super."engine-io-snap"; - "engineering-units" = dontDistribute super."engineering-units"; - "enumerable" = dontDistribute super."enumerable"; - "enumerate" = dontDistribute super."enumerate"; - "enumeration" = dontDistribute super."enumeration"; - "enumerator-fd" = dontDistribute super."enumerator-fd"; - "enumerator-tf" = dontDistribute super."enumerator-tf"; - "enumfun" = dontDistribute super."enumfun"; - "enummapmap" = dontDistribute super."enummapmap"; - "enummapset" = dontDistribute super."enummapset"; - "enummapset-th" = dontDistribute super."enummapset-th"; - "enumset" = dontDistribute super."enumset"; - "env-locale" = dontDistribute super."env-locale"; - "env-parser" = dontDistribute super."env-parser"; - "envparse" = dontDistribute super."envparse"; - "envy" = doDistribute super."envy_1_1_0_0"; - "epanet-haskell" = dontDistribute super."epanet-haskell"; - "epass" = dontDistribute super."epass"; - "epic" = dontDistribute super."epic"; - "epoll" = dontDistribute super."epoll"; - "eprocess" = dontDistribute super."eprocess"; - "epub" = dontDistribute super."epub"; - "epub-metadata" = dontDistribute super."epub-metadata"; - "epub-tools" = dontDistribute super."epub-tools"; - "epubname" = dontDistribute super."epubname"; - "equal-files" = dontDistribute super."equal-files"; - "equational-reasoning" = dontDistribute super."equational-reasoning"; - "erd" = dontDistribute super."erd"; - "erf-native" = dontDistribute super."erf-native"; - "erlang" = dontDistribute super."erlang"; - "eros" = dontDistribute super."eros"; - "eros-client" = dontDistribute super."eros-client"; - "eros-http" = dontDistribute super."eros-http"; - "errno" = dontDistribute super."errno"; - "error-analyze" = dontDistribute super."error-analyze"; - "error-continuations" = dontDistribute super."error-continuations"; - "error-list" = dontDistribute super."error-list"; - "error-loc" = dontDistribute super."error-loc"; - "error-location" = dontDistribute super."error-location"; - "error-message" = dontDistribute super."error-message"; - "error-util" = dontDistribute super."error-util"; - "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; - "ersatz" = dontDistribute super."ersatz"; - "ersatz-toysat" = dontDistribute super."ersatz-toysat"; - "ert" = dontDistribute super."ert"; - "esotericbot" = dontDistribute super."esotericbot"; - "ess" = dontDistribute super."ess"; - "estimator" = dontDistribute super."estimator"; - "estimators" = dontDistribute super."estimators"; - "estreps" = dontDistribute super."estreps"; - "eternal" = dontDistribute super."eternal"; - "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; - "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; - "ethereum-rlp" = dontDistribute super."ethereum-rlp"; - "ety" = dontDistribute super."ety"; - "euler" = dontDistribute super."euler"; - "euphoria" = dontDistribute super."euphoria"; - "eurofxref" = dontDistribute super."eurofxref"; - "event-driven" = dontDistribute super."event-driven"; - "event-handlers" = dontDistribute super."event-handlers"; - "event-list" = dontDistribute super."event-list"; - "event-monad" = dontDistribute super."event-monad"; - "eventloop" = dontDistribute super."eventloop"; - "eventsourced" = dontDistribute super."eventsourced"; - "eventstore" = doDistribute super."eventstore_0_12_0_0"; - "every-bit-counts" = dontDistribute super."every-bit-counts"; - "ewe" = dontDistribute super."ewe"; - "ex-pool" = dontDistribute super."ex-pool"; - "exception-hierarchy" = dontDistribute super."exception-hierarchy"; - "exception-mailer" = dontDistribute super."exception-mailer"; - "exception-monads-fd" = dontDistribute super."exception-monads-fd"; - "exception-monads-tf" = dontDistribute super."exception-monads-tf"; - "execs" = dontDistribute super."execs"; - "exherbo-cabal" = dontDistribute super."exherbo-cabal"; - "exif" = dontDistribute super."exif"; - "exinst" = dontDistribute super."exinst"; - "exinst-aeson" = dontDistribute super."exinst-aeson"; - "exinst-bytes" = dontDistribute super."exinst-bytes"; - "exinst-deepseq" = dontDistribute super."exinst-deepseq"; - "exinst-hashable" = dontDistribute super."exinst-hashable"; - "existential" = dontDistribute super."existential"; - "exists" = dontDistribute super."exists"; - "exit-codes" = dontDistribute super."exit-codes"; - "exp-extended" = dontDistribute super."exp-extended"; - "exp-pairs" = dontDistribute super."exp-pairs"; - "expand" = dontDistribute super."expand"; - "expat-enumerator" = dontDistribute super."expat-enumerator"; - "expiring-cache-map" = doDistribute super."expiring-cache-map_0_0_5_4"; - "expiring-mvar" = dontDistribute super."expiring-mvar"; - "explain" = dontDistribute super."explain"; - "explicit-determinant" = dontDistribute super."explicit-determinant"; - "explicit-iomodes" = dontDistribute super."explicit-iomodes"; - "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; - "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; - "explicit-sharing" = dontDistribute super."explicit-sharing"; - "explore" = dontDistribute super."explore"; - "exposed-containers" = dontDistribute super."exposed-containers"; - "expression-parser" = dontDistribute super."expression-parser"; - "extcore" = dontDistribute super."extcore"; - "extemp" = dontDistribute super."extemp"; - "extended-categories" = dontDistribute super."extended-categories"; - "extended-reals" = dontDistribute super."extended-reals"; - "extensible" = dontDistribute super."extensible"; - "extensible-data" = dontDistribute super."extensible-data"; - "external-sort" = dontDistribute super."external-sort"; - "extractelf" = dontDistribute super."extractelf"; - "ez-couch" = dontDistribute super."ez-couch"; - "faceted" = dontDistribute super."faceted"; - "factory" = dontDistribute super."factory"; - "factual-api" = dontDistribute super."factual-api"; - "fad" = dontDistribute super."fad"; - "fadno-braids" = dontDistribute super."fadno-braids"; - "failable-list" = dontDistribute super."failable-list"; - "failure" = dontDistribute super."failure"; - "failure-detector" = dontDistribute super."failure-detector"; - "fair-predicates" = dontDistribute super."fair-predicates"; - "fake-type" = dontDistribute super."fake-type"; - "faker" = dontDistribute super."faker"; - "falling-turnip" = dontDistribute super."falling-turnip"; - "fallingblocks" = dontDistribute super."fallingblocks"; - "family-tree" = dontDistribute super."family-tree"; - "fast-digits" = dontDistribute super."fast-digits"; - "fast-math" = dontDistribute super."fast-math"; - "fast-tags" = dontDistribute super."fast-tags"; - "fast-tagsoup" = dontDistribute super."fast-tagsoup"; - "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; - "fastbayes" = dontDistribute super."fastbayes"; - "fastcgi" = dontDistribute super."fastcgi"; - "fastedit" = dontDistribute super."fastedit"; - "fastirc" = dontDistribute super."fastirc"; - "fathead-util" = dontDistribute super."fathead-util"; - "fault-tree" = dontDistribute super."fault-tree"; - "fay-geoposition" = dontDistribute super."fay-geoposition"; - "fay-hsx" = dontDistribute super."fay-hsx"; - "fay-ref" = dontDistribute super."fay-ref"; - "fbmessenger-api" = dontDistribute super."fbmessenger-api"; - "fca" = dontDistribute super."fca"; - "fcache" = dontDistribute super."fcache"; - "fcd" = dontDistribute super."fcd"; - "fckeditor" = dontDistribute super."fckeditor"; - "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; - "fdo-trash" = dontDistribute super."fdo-trash"; - "fec" = dontDistribute super."fec"; - "fedora-packages" = dontDistribute super."fedora-packages"; - "feed-cli" = dontDistribute super."feed-cli"; - "feed-collect" = dontDistribute super."feed-collect"; - "feed-crawl" = dontDistribute super."feed-crawl"; - "feed-gipeda" = dontDistribute super."feed-gipeda"; - "feed-translator" = dontDistribute super."feed-translator"; - "feed2lj" = dontDistribute super."feed2lj"; - "feed2twitter" = dontDistribute super."feed2twitter"; - "feldspar-compiler" = dontDistribute super."feldspar-compiler"; - "feldspar-language" = dontDistribute super."feldspar-language"; - "feldspar-signal" = dontDistribute super."feldspar-signal"; - "fen2s" = dontDistribute super."fen2s"; - "fences" = dontDistribute super."fences"; - "fenfire" = dontDistribute super."fenfire"; - "fez-conf" = dontDistribute super."fez-conf"; - "ffeed" = dontDistribute super."ffeed"; - "fficxx" = dontDistribute super."fficxx"; - "fficxx-runtime" = dontDistribute super."fficxx-runtime"; - "ffmpeg-light" = dontDistribute super."ffmpeg-light"; - "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; - "fft" = doDistribute super."fft_0_1_8_3"; - "fftwRaw" = dontDistribute super."fftwRaw"; - "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; - "fgl-visualize" = dontDistribute super."fgl-visualize"; - "fibon" = dontDistribute super."fibon"; - "fibonacci" = dontDistribute super."fibonacci"; - "fields" = dontDistribute super."fields"; - "fields-json" = dontDistribute super."fields-json"; - "fieldwise" = dontDistribute super."fieldwise"; - "fig" = dontDistribute super."fig"; - "file-collection" = dontDistribute super."file-collection"; - "file-command-qq" = dontDistribute super."file-command-qq"; - "file-embed-poly" = dontDistribute super."file-embed-poly"; - "file-modules" = doDistribute super."file-modules_0_1_2_3"; - "filediff" = dontDistribute super."filediff"; - "filepath-io-access" = dontDistribute super."filepath-io-access"; - "filepather" = dontDistribute super."filepather"; - "filestore" = dontDistribute super."filestore"; - "filesystem-conduit" = dontDistribute super."filesystem-conduit"; - "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; - "filesystem-trees" = dontDistribute super."filesystem-trees"; - "filtrable" = dontDistribute super."filtrable"; - "final" = dontDistribute super."final"; - "find-conduit" = dontDistribute super."find-conduit"; - "fingertree-tf" = dontDistribute super."fingertree-tf"; - "finite-field" = dontDistribute super."finite-field"; - "finite-typelits" = dontDistribute super."finite-typelits"; - "first-and-last" = dontDistribute super."first-and-last"; - "first-class-patterns" = dontDistribute super."first-class-patterns"; - "firstify" = dontDistribute super."firstify"; - "fishfood" = dontDistribute super."fishfood"; - "fit" = dontDistribute super."fit"; - "fitsio" = dontDistribute super."fitsio"; - "fitspec" = dontDistribute super."fitspec"; - "fix-imports" = dontDistribute super."fix-imports"; - "fix-parser-simple" = dontDistribute super."fix-parser-simple"; - "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; - "fixed-length" = dontDistribute super."fixed-length"; - "fixed-point" = dontDistribute super."fixed-point"; - "fixed-point-vector" = dontDistribute super."fixed-point-vector"; - "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; - "fixed-precision" = dontDistribute super."fixed-precision"; - "fixed-storable-array" = dontDistribute super."fixed-storable-array"; - "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; - "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; - "fixedprec" = dontDistribute super."fixedprec"; - "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; - "fixfile" = dontDistribute super."fixfile"; - "fixhs" = dontDistribute super."fixhs"; - "fixplate" = dontDistribute super."fixplate"; - "fixpoint" = dontDistribute super."fixpoint"; - "fixtime" = dontDistribute super."fixtime"; - "fizz-buzz" = dontDistribute super."fizz-buzz"; - "fizzbuzz" = dontDistribute super."fizzbuzz"; - "flaccuraterip" = dontDistribute super."flaccuraterip"; - "flamethrower" = dontDistribute super."flamethrower"; - "flamingra" = dontDistribute super."flamingra"; - "flat-maybe" = dontDistribute super."flat-maybe"; - "flat-tex" = dontDistribute super."flat-tex"; - "flexible-time" = dontDistribute super."flexible-time"; - "flexible-unlit" = dontDistribute super."flexible-unlit"; - "flexiwrap" = dontDistribute super."flexiwrap"; - "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; - "flickr" = dontDistribute super."flickr"; - "flippers" = dontDistribute super."flippers"; - "flite" = dontDistribute super."flite"; - "flo" = dontDistribute super."flo"; - "float-binstring" = dontDistribute super."float-binstring"; - "floating-bits" = dontDistribute super."floating-bits"; - "floatshow" = dontDistribute super."floatshow"; - "flow-er" = dontDistribute super."flow-er"; - "flow2dot" = dontDistribute super."flow2dot"; - "flowdock" = dontDistribute super."flowdock"; - "flowdock-api" = dontDistribute super."flowdock-api"; - "flowdock-rest" = dontDistribute super."flowdock-rest"; - "flower" = dontDistribute super."flower"; - "flowlocks-framework" = dontDistribute super."flowlocks-framework"; - "flowsim" = dontDistribute super."flowsim"; - "fltkhs" = dontDistribute super."fltkhs"; - "fltkhs-demos" = dontDistribute super."fltkhs-demos"; - "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos"; - "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; - "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; - "fluent-logger" = dontDistribute super."fluent-logger"; - "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; - "fluidsynth" = dontDistribute super."fluidsynth"; - "fmark" = dontDistribute super."fmark"; - "foldl-incremental" = dontDistribute super."foldl-incremental"; - "foldl-transduce" = dontDistribute super."foldl-transduce"; - "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; - "folds" = dontDistribute super."folds"; - "folds-common" = dontDistribute super."folds-common"; - "follower" = dontDistribute super."follower"; - "foma" = dontDistribute super."foma"; - "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; - "foo" = dontDistribute super."foo"; - "foobar" = dontDistribute super."foobar"; - "for-free" = dontDistribute super."for-free"; - "forbidden-fruit" = dontDistribute super."forbidden-fruit"; - "fordo" = dontDistribute super."fordo"; - "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; - "foreign-var" = dontDistribute super."foreign-var"; - "forger" = dontDistribute super."forger"; - "forkable-monad" = dontDistribute super."forkable-monad"; - "formal" = dontDistribute super."formal"; - "format" = dontDistribute super."format"; - "format-status" = dontDistribute super."format-status"; - "formattable" = dontDistribute super."formattable"; - "forml" = dontDistribute super."forml"; - "formlets" = dontDistribute super."formlets"; - "formlets-hsp" = dontDistribute super."formlets-hsp"; - "formura" = dontDistribute super."formura"; - "forth-hll" = dontDistribute super."forth-hll"; - "fortran-src" = dontDistribute super."fortran-src"; - "foscam-directory" = dontDistribute super."foscam-directory"; - "foscam-filename" = dontDistribute super."foscam-filename"; - "foscam-sort" = dontDistribute super."foscam-sort"; - "foundation" = dontDistribute super."foundation"; - "foundation-edge" = dontDistribute super."foundation-edge"; - "fountain" = dontDistribute super."fountain"; - "fpco-api" = dontDistribute super."fpco-api"; - "fpipe" = dontDistribute super."fpipe"; - "fpnla" = dontDistribute super."fpnla"; - "fpnla-examples" = dontDistribute super."fpnla-examples"; - "fptest" = dontDistribute super."fptest"; - "fquery" = dontDistribute super."fquery"; - "fractal" = dontDistribute super."fractal"; - "fractals" = dontDistribute super."fractals"; - "fraction" = dontDistribute super."fraction"; - "frag" = dontDistribute super."frag"; - "frame" = dontDistribute super."frame"; - "frame-markdown" = dontDistribute super."frame-markdown"; - "franchise" = dontDistribute super."franchise"; - "fraxl" = dontDistribute super."fraxl"; - "freddy" = dontDistribute super."freddy"; - "free-concurrent" = dontDistribute super."free-concurrent"; - "free-functors" = dontDistribute super."free-functors"; - "free-game" = dontDistribute super."free-game"; - "free-http" = dontDistribute super."free-http"; - "free-operational" = dontDistribute super."free-operational"; - "free-theorems" = dontDistribute super."free-theorems"; - "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; - "free-theorems-seq" = dontDistribute super."free-theorems-seq"; - "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; - "free-theorems-webui" = dontDistribute super."free-theorems-webui"; - "free-vector-spaces" = dontDistribute super."free-vector-spaces"; - "freekick2" = dontDistribute super."freekick2"; - "freer" = dontDistribute super."freer"; - "freesect" = dontDistribute super."freesect"; - "freesound" = dontDistribute super."freesound"; - "freetype-simple" = dontDistribute super."freetype-simple"; - "freetype2" = dontDistribute super."freetype2"; - "fresco-binding" = dontDistribute super."fresco-binding"; - "fresh" = dontDistribute super."fresh"; - "friday" = dontDistribute super."friday"; - "friday-devil" = dontDistribute super."friday-devil"; - "friday-juicypixels" = dontDistribute super."friday-juicypixels"; - "friday-scale-dct" = dontDistribute super."friday-scale-dct"; - "friendly-time" = dontDistribute super."friendly-time"; - "frown" = dontDistribute super."frown"; - "frp-arduino" = dontDistribute super."frp-arduino"; - "frpnow" = dontDistribute super."frpnow"; - "frpnow-gloss" = dontDistribute super."frpnow-gloss"; - "frpnow-gtk" = dontDistribute super."frpnow-gtk"; - "frquotes" = dontDistribute super."frquotes"; - "fs-events" = dontDistribute super."fs-events"; - "fsharp" = dontDistribute super."fsharp"; - "fsmActions" = dontDistribute super."fsmActions"; - "fsnotify-conduit" = dontDistribute super."fsnotify-conduit"; - "fst" = dontDistribute super."fst"; - "fsutils" = dontDistribute super."fsutils"; - "fswatcher" = dontDistribute super."fswatcher"; - "ftdi" = dontDistribute super."ftdi"; - "ftp-conduit" = dontDistribute super."ftp-conduit"; - "ftphs" = dontDistribute super."ftphs"; - "ftree" = dontDistribute super."ftree"; - "ftshell" = dontDistribute super."ftshell"; - "fugue" = dontDistribute super."fugue"; - "full-sessions" = dontDistribute super."full-sessions"; - "full-text-search" = dontDistribute super."full-text-search"; - "fullstop" = dontDistribute super."fullstop"; - "funbot" = dontDistribute super."funbot"; - "funbot-client" = dontDistribute super."funbot-client"; - "funbot-ext-events" = dontDistribute super."funbot-ext-events"; - "funbot-git-hook" = dontDistribute super."funbot-git-hook"; - "funcons-tools" = dontDistribute super."funcons-tools"; - "function-combine" = dontDistribute super."function-combine"; - "function-instances-algebra" = dontDistribute super."function-instances-algebra"; - "functional-arrow" = dontDistribute super."functional-arrow"; - "functional-kmp" = dontDistribute super."functional-kmp"; - "functor-apply" = dontDistribute super."functor-apply"; - "functor-combo" = dontDistribute super."functor-combo"; - "functor-infix" = dontDistribute super."functor-infix"; - "functor-monadic" = dontDistribute super."functor-monadic"; - "functor-utils" = dontDistribute super."functor-utils"; - "functorm" = dontDistribute super."functorm"; - "functors" = dontDistribute super."functors"; - "funion" = dontDistribute super."funion"; - "funnyprint" = dontDistribute super."funnyprint"; - "funpat" = dontDistribute super."funpat"; - "funsat" = dontDistribute super."funsat"; - "fusion" = dontDistribute super."fusion"; - "futun" = dontDistribute super."futun"; - "future" = dontDistribute super."future"; - "future-resource" = dontDistribute super."future-resource"; - "fuzzy" = dontDistribute super."fuzzy"; - "fuzzy-timings" = dontDistribute super."fuzzy-timings"; - "fuzzytime" = dontDistribute super."fuzzytime"; - "fwgl" = dontDistribute super."fwgl"; - "fwgl-glfw" = dontDistribute super."fwgl-glfw"; - "fwgl-javascript" = dontDistribute super."fwgl-javascript"; - "g-npm" = dontDistribute super."g-npm"; - "gact" = dontDistribute super."gact"; - "game-of-life" = dontDistribute super."game-of-life"; - "game-probability" = dontDistribute super."game-probability"; - "game-tree" = dontDistribute super."game-tree"; - "gameclock" = dontDistribute super."gameclock"; - "gang-of-threads" = dontDistribute super."gang-of-threads"; - "garepinoh" = dontDistribute super."garepinoh"; - "garsia-wachs" = dontDistribute super."garsia-wachs"; - "gasp" = dontDistribute super."gasp"; - "gbu" = dontDistribute super."gbu"; - "gc" = dontDistribute super."gc"; - "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; - "gcodehs" = dontDistribute super."gcodehs"; - "gconf" = dontDistribute super."gconf"; - "gdiff" = dontDistribute super."gdiff"; - "gdiff-ig" = dontDistribute super."gdiff-ig"; - "gdiff-th" = dontDistribute super."gdiff-th"; - "gdo" = dontDistribute super."gdo"; - "gearbox" = dontDistribute super."gearbox"; - "geek" = dontDistribute super."geek"; - "geek-server" = dontDistribute super."geek-server"; - "gelatin" = dontDistribute super."gelatin"; - "gemstone" = dontDistribute super."gemstone"; - "gencheck" = dontDistribute super."gencheck"; - "gender" = dontDistribute super."gender"; - "genders" = dontDistribute super."genders"; - "general-prelude" = dontDistribute super."general-prelude"; - "generator" = dontDistribute super."generator"; - "generators" = dontDistribute super."generators"; - "generic-accessors" = dontDistribute super."generic-accessors"; - "generic-binary" = dontDistribute super."generic-binary"; - "generic-church" = dontDistribute super."generic-church"; - "generic-deepseq" = dontDistribute super."generic-deepseq"; - "generic-deriving" = doDistribute super."generic-deriving_1_10_5"; - "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; - "generic-maybe" = dontDistribute super."generic-maybe"; - "generic-pretty" = dontDistribute super."generic-pretty"; - "generic-random" = dontDistribute super."generic-random"; - "generic-records" = dontDistribute super."generic-records"; - "generic-server" = dontDistribute super."generic-server"; - "generic-storable" = dontDistribute super."generic-storable"; - "generic-tree" = dontDistribute super."generic-tree"; - "generic-xml" = dontDistribute super."generic-xml"; - "generics-sop-lens" = dontDistribute super."generics-sop-lens"; - "genericserialize" = dontDistribute super."genericserialize"; - "genetics" = dontDistribute super."genetics"; - "geni-gui" = dontDistribute super."geni-gui"; - "geni-util" = dontDistribute super."geni-util"; - "geniconvert" = dontDistribute super."geniconvert"; - "genifunctors" = dontDistribute super."genifunctors"; - "geniplate" = dontDistribute super."geniplate"; - "geniserver" = dontDistribute super."geniserver"; - "genprog" = dontDistribute super."genprog"; - "gentlemark" = dontDistribute super."gentlemark"; - "genvalidity" = dontDistribute super."genvalidity"; - "genvalidity-containers" = dontDistribute super."genvalidity-containers"; - "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; - "genvalidity-text" = dontDistribute super."genvalidity-text"; - "geo-resolver" = dontDistribute super."geo-resolver"; - "geo-uk" = dontDistribute super."geo-uk"; - "geocalc" = dontDistribute super."geocalc"; - "geocode-google" = dontDistribute super."geocode-google"; - "geodetic" = dontDistribute super."geodetic"; - "geodetics" = dontDistribute super."geodetics"; - "geohash" = dontDistribute super."geohash"; - "geoip2" = dontDistribute super."geoip2"; - "geojson" = dontDistribute super."geojson"; - "geojson-types" = dontDistribute super."geojson-types"; - "geolite-csv" = dontDistribute super."geolite-csv"; - "geom2d" = dontDistribute super."geom2d"; - "getemx" = dontDistribute super."getemx"; - "getflag" = dontDistribute super."getflag"; - "getopt-simple" = dontDistribute super."getopt-simple"; - "gf" = dontDistribute super."gf"; - "ggtsTC" = dontDistribute super."ggtsTC"; - "ghc-core" = dontDistribute super."ghc-core"; - "ghc-core-html" = dontDistribute super."ghc-core-html"; - "ghc-datasize" = dontDistribute super."ghc-datasize"; - "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; - "ghc-dup" = dontDistribute super."ghc-dup"; - "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; - "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; - "ghc-exactprint" = doDistribute super."ghc-exactprint_0_5_1_1"; - "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; - "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; - "ghc-make" = dontDistribute super."ghc-make"; - "ghc-man-completion" = dontDistribute super."ghc-man-completion"; - "ghc-mod" = doDistribute super."ghc-mod_5_5_0_0"; - "ghc-options" = dontDistribute super."ghc-options"; - "ghc-parmake" = dontDistribute super."ghc-parmake"; - "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; - "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; - "ghc-prof" = dontDistribute super."ghc-prof"; - "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; - "ghc-server" = dontDistribute super."ghc-server"; - "ghc-simple" = dontDistribute super."ghc-simple"; - "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; - "ghc-syb" = dontDistribute super."ghc-syb"; - "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; - "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1_3"; - "ghc-typelits-knownnat" = dontDistribute super."ghc-typelits-knownnat"; - "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_6"; - "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; - "ghc-vis" = dontDistribute super."ghc-vis"; - "ghci-diagrams" = dontDistribute super."ghci-diagrams"; - "ghci-haskeline" = dontDistribute super."ghci-haskeline"; - "ghci-history-parser" = dontDistribute super."ghci-history-parser"; - "ghci-lib" = dontDistribute super."ghci-lib"; - "ghci-ng" = dontDistribute super."ghci-ng"; - "ghci-pretty" = dontDistribute super."ghci-pretty"; - "ghcid" = doDistribute super."ghcid_0_6_4"; - "ghcjs-ajax" = dontDistribute super."ghcjs-ajax"; - "ghcjs-dom" = doDistribute super."ghcjs-dom_0_2_4_0"; - "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; - "ghcjs-dom-jsaddle" = dontDistribute super."ghcjs-dom-jsaddle"; - "ghcjs-dom-jsffi" = dontDistribute super."ghcjs-dom-jsffi"; - "ghcjs-dom-webkit" = dontDistribute super."ghcjs-dom-webkit"; - "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; - "ghcjs-perch" = dontDistribute super."ghcjs-perch"; - "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; - "ghclive" = dontDistribute super."ghclive"; - "ghczdecode" = dontDistribute super."ghczdecode"; - "ght" = dontDistribute super."ght"; - "gi-girepository" = dontDistribute super."gi-girepository"; - "gi-gst" = dontDistribute super."gi-gst"; - "gi-gstaudio" = dontDistribute super."gi-gstaudio"; - "gi-gstbase" = dontDistribute super."gi-gstbase"; - "gi-gstvideo" = dontDistribute super."gi-gstvideo"; - "gi-gtk-hs" = dontDistribute super."gi-gtk-hs"; - "gi-gtkosxapplication" = dontDistribute super."gi-gtkosxapplication"; - "gi-gtksource" = dontDistribute super."gi-gtksource"; - "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; - "gi-notify" = dontDistribute super."gi-notify"; - "gi-pangocairo" = dontDistribute super."gi-pangocairo"; - "gi-poppler" = dontDistribute super."gi-poppler"; - "gi-soup" = dontDistribute super."gi-soup"; - "gi-vte" = dontDistribute super."gi-vte"; - "gi-webkit" = dontDistribute super."gi-webkit"; - "gi-webkit2" = dontDistribute super."gi-webkit2"; - "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; - "giak" = dontDistribute super."giak"; - "gimlh" = dontDistribute super."gimlh"; - "ginger" = dontDistribute super."ginger"; - "ginsu" = dontDistribute super."ginsu"; - "gio" = doDistribute super."gio_0_13_1_1"; - "gipeda" = doDistribute super."gipeda_0_2_0_1"; - "gist" = dontDistribute super."gist"; - "git" = dontDistribute super."git"; - "git-all" = dontDistribute super."git-all"; - "git-annex" = doDistribute super."git-annex_6_20160511"; - "git-checklist" = dontDistribute super."git-checklist"; - "git-date" = dontDistribute super."git-date"; - "git-embed" = dontDistribute super."git-embed"; - "git-freq" = dontDistribute super."git-freq"; - "git-gpush" = dontDistribute super."git-gpush"; - "git-jump" = dontDistribute super."git-jump"; - "git-monitor" = dontDistribute super."git-monitor"; - "git-object" = dontDistribute super."git-object"; - "git-repair" = dontDistribute super."git-repair"; - "git-sanity" = dontDistribute super."git-sanity"; - "git-vogue" = dontDistribute super."git-vogue"; - "gitHUD" = dontDistribute super."gitHUD"; - "gitcache" = dontDistribute super."gitcache"; - "gitdo" = dontDistribute super."gitdo"; - "github-backup" = doDistribute super."github-backup_1_20160522"; - "github-post-receive" = dontDistribute super."github-post-receive"; - "github-utils" = dontDistribute super."github-utils"; - "gitignore" = dontDistribute super."gitignore"; - "gitit" = dontDistribute super."gitit"; - "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; - "gitlib-cross" = dontDistribute super."gitlib-cross"; - "gitlib-s3" = dontDistribute super."gitlib-s3"; - "gitlib-sample" = dontDistribute super."gitlib-sample"; - "gitlib-utils" = dontDistribute super."gitlib-utils"; - "gitson" = doDistribute super."gitson_0_5_1"; - "gitter" = dontDistribute super."gitter"; - "givegif" = dontDistribute super."givegif"; - "gl-capture" = dontDistribute super."gl-capture"; - "glabrous" = dontDistribute super."glabrous"; - "glade" = dontDistribute super."glade"; - "gladexml-accessor" = dontDistribute super."gladexml-accessor"; - "glambda" = dontDistribute super."glambda"; - "glapp" = dontDistribute super."glapp"; - "glasso" = dontDistribute super."glasso"; - "glib" = doDistribute super."glib_0_13_2_2"; - "glicko" = dontDistribute super."glicko"; - "glider-nlp" = dontDistribute super."glider-nlp"; - "glintcollider" = dontDistribute super."glintcollider"; - "glirc" = dontDistribute super."glirc"; - "gll" = dontDistribute super."gll"; - "global" = dontDistribute super."global"; - "global-config" = dontDistribute super."global-config"; - "global-lock" = dontDistribute super."global-lock"; - "global-variables" = dontDistribute super."global-variables"; - "glome-hs" = dontDistribute super."glome-hs"; - "gloss" = dontDistribute super."gloss"; - "gloss-accelerate" = dontDistribute super."gloss-accelerate"; - "gloss-algorithms" = dontDistribute super."gloss-algorithms"; - "gloss-banana" = dontDistribute super."gloss-banana"; - "gloss-devil" = dontDistribute super."gloss-devil"; - "gloss-examples" = dontDistribute super."gloss-examples"; - "gloss-game" = dontDistribute super."gloss-game"; - "gloss-juicy" = dontDistribute super."gloss-juicy"; - "gloss-raster" = dontDistribute super."gloss-raster"; - "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; - "gloss-rendering" = dontDistribute super."gloss-rendering"; - "gloss-sodium" = dontDistribute super."gloss-sodium"; - "glpk-hs" = dontDistribute super."glpk-hs"; - "glue" = dontDistribute super."glue"; - "glue-common" = dontDistribute super."glue-common"; - "glue-core" = dontDistribute super."glue-core"; - "glue-ekg" = dontDistribute super."glue-ekg"; - "glue-example" = dontDistribute super."glue-example"; - "gluturtle" = dontDistribute super."gluturtle"; - "gmap" = dontDistribute super."gmap"; - "gmndl" = dontDistribute super."gmndl"; - "gnome-desktop" = dontDistribute super."gnome-desktop"; - "gnome-keyring" = dontDistribute super."gnome-keyring"; - "gnomevfs" = dontDistribute super."gnomevfs"; - "gnss-converters" = dontDistribute super."gnss-converters"; - "gnuplot" = dontDistribute super."gnuplot"; - "goa" = dontDistribute super."goa"; - "goal-core" = dontDistribute super."goal-core"; - "goal-geometry" = dontDistribute super."goal-geometry"; - "goal-probability" = dontDistribute super."goal-probability"; - "goal-simulation" = dontDistribute super."goal-simulation"; - "goatee" = dontDistribute super."goatee"; - "goatee-gtk" = dontDistribute super."goatee-gtk"; - "gofer-prelude" = dontDistribute super."gofer-prelude"; - "gogol" = dontDistribute super."gogol"; - "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; - "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; - "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; - "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; - "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; - "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; - "gogol-adsense" = dontDistribute super."gogol-adsense"; - "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; - "gogol-affiliates" = dontDistribute super."gogol-affiliates"; - "gogol-analytics" = dontDistribute super."gogol-analytics"; - "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; - "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; - "gogol-appengine" = dontDistribute super."gogol-appengine"; - "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; - "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; - "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; - "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; - "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; - "gogol-appstate" = dontDistribute super."gogol-appstate"; - "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; - "gogol-bigquery" = dontDistribute super."gogol-bigquery"; - "gogol-billing" = dontDistribute super."gogol-billing"; - "gogol-blogger" = dontDistribute super."gogol-blogger"; - "gogol-books" = dontDistribute super."gogol-books"; - "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; - "gogol-classroom" = dontDistribute super."gogol-classroom"; - "gogol-cloudmonitoring" = dontDistribute super."gogol-cloudmonitoring"; - "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; - "gogol-compute" = dontDistribute super."gogol-compute"; - "gogol-container" = dontDistribute super."gogol-container"; - "gogol-core" = dontDistribute super."gogol-core"; - "gogol-customsearch" = dontDistribute super."gogol-customsearch"; - "gogol-dataflow" = dontDistribute super."gogol-dataflow"; - "gogol-dataproc" = dontDistribute super."gogol-dataproc"; - "gogol-datastore" = dontDistribute super."gogol-datastore"; - "gogol-debugger" = dontDistribute super."gogol-debugger"; - "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; - "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; - "gogol-discovery" = dontDistribute super."gogol-discovery"; - "gogol-dns" = dontDistribute super."gogol-dns"; - "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; - "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; - "gogol-drive" = dontDistribute super."gogol-drive"; - "gogol-firebase-rules" = dontDistribute super."gogol-firebase-rules"; - "gogol-fitness" = dontDistribute super."gogol-fitness"; - "gogol-fonts" = dontDistribute super."gogol-fonts"; - "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; - "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; - "gogol-games" = dontDistribute super."gogol-games"; - "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; - "gogol-games-management" = dontDistribute super."gogol-games-management"; - "gogol-genomics" = dontDistribute super."gogol-genomics"; - "gogol-gmail" = dontDistribute super."gogol-gmail"; - "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; - "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; - "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; - "gogol-kgsearch" = dontDistribute super."gogol-kgsearch"; - "gogol-latencytest" = dontDistribute super."gogol-latencytest"; - "gogol-logging" = dontDistribute super."gogol-logging"; - "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; - "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; - "gogol-mirror" = dontDistribute super."gogol-mirror"; - "gogol-monitoring" = dontDistribute super."gogol-monitoring"; - "gogol-oauth2" = dontDistribute super."gogol-oauth2"; - "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; - "gogol-partners" = dontDistribute super."gogol-partners"; - "gogol-people" = dontDistribute super."gogol-people"; - "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; - "gogol-plus" = dontDistribute super."gogol-plus"; - "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; - "gogol-prediction" = dontDistribute super."gogol-prediction"; - "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; - "gogol-pubsub" = dontDistribute super."gogol-pubsub"; - "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; - "gogol-replicapool" = dontDistribute super."gogol-replicapool"; - "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; - "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; - "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; - "gogol-script" = dontDistribute super."gogol-script"; - "gogol-sheets" = dontDistribute super."gogol-sheets"; - "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; - "gogol-siteverification" = dontDistribute super."gogol-siteverification"; - "gogol-spectrum" = dontDistribute super."gogol-spectrum"; - "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; - "gogol-storage" = dontDistribute super."gogol-storage"; - "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; - "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; - "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; - "gogol-translate" = dontDistribute super."gogol-translate"; - "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; - "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; - "gogol-vision" = dontDistribute super."gogol-vision"; - "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; - "gogol-youtube" = dontDistribute super."gogol-youtube"; - "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; - "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; - "gooey" = dontDistribute super."gooey"; - "google-dictionary" = dontDistribute super."google-dictionary"; - "google-drive" = dontDistribute super."google-drive"; - "google-html5-slide" = dontDistribute super."google-html5-slide"; - "google-mail-filters" = dontDistribute super."google-mail-filters"; - "google-oauth2" = dontDistribute super."google-oauth2"; - "google-oauth2-jwt" = dontDistribute super."google-oauth2-jwt"; - "google-search" = dontDistribute super."google-search"; - "google-translate" = dontDistribute super."google-translate"; - "googleplus" = dontDistribute super."googleplus"; - "googlepolyline" = dontDistribute super."googlepolyline"; - "gopherbot" = dontDistribute super."gopherbot"; - "gore-and-ash" = dontDistribute super."gore-and-ash"; - "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor"; - "gore-and-ash-async" = dontDistribute super."gore-and-ash-async"; - "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo"; - "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw"; - "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging"; - "gore-and-ash-network" = dontDistribute super."gore-and-ash-network"; - "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl"; - "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; - "gpah" = dontDistribute super."gpah"; - "gpcsets" = dontDistribute super."gpcsets"; - "gpio" = dontDistribute super."gpio"; - "gps" = dontDistribute super."gps"; - "gps2htmlReport" = dontDistribute super."gps2htmlReport"; - "gpx-conduit" = dontDistribute super."gpx-conduit"; - "graceful" = dontDistribute super."graceful"; - "grammar-combinators" = dontDistribute super."grammar-combinators"; - "grapefruit-examples" = dontDistribute super."grapefruit-examples"; - "grapefruit-frp" = dontDistribute super."grapefruit-frp"; - "grapefruit-records" = dontDistribute super."grapefruit-records"; - "grapefruit-ui" = dontDistribute super."grapefruit-ui"; - "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; - "graph-generators" = dontDistribute super."graph-generators"; - "graph-matchings" = dontDistribute super."graph-matchings"; - "graph-rewriting" = dontDistribute super."graph-rewriting"; - "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; - "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; - "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; - "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; - "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; - "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; - "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; - "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; - "graph-serialize" = dontDistribute super."graph-serialize"; - "graph-utils" = dontDistribute super."graph-utils"; - "graph-visit" = dontDistribute super."graph-visit"; - "graphbuilder" = dontDistribute super."graphbuilder"; - "graphene" = dontDistribute super."graphene"; - "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; - "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; - "graphicsFormats" = dontDistribute super."graphicsFormats"; - "graphicstools" = dontDistribute super."graphicstools"; - "graphmod" = dontDistribute super."graphmod"; - "graphql" = dontDistribute super."graphql"; - "graphtype" = dontDistribute super."graphtype"; - "grasp" = dontDistribute super."grasp"; - "gray-code" = dontDistribute super."gray-code"; - "gray-extended" = dontDistribute super."gray-extended"; - "greencard" = dontDistribute super."greencard"; - "greencard-lib" = dontDistribute super."greencard-lib"; - "greg-client" = dontDistribute super."greg-client"; - "gremlin-haskell" = dontDistribute super."gremlin-haskell"; - "greplicate" = dontDistribute super."greplicate"; - "grid" = dontDistribute super."grid"; - "gridfs" = dontDistribute super."gridfs"; - "gridland" = dontDistribute super."gridland"; - "grm" = dontDistribute super."grm"; - "groundhog-converters" = dontDistribute super."groundhog-converters"; - "groundhog-inspector" = dontDistribute super."groundhog-inspector"; - "group-with" = dontDistribute super."group-with"; - "groupoid" = dontDistribute super."groupoid"; - "gruff" = dontDistribute super."gruff"; - "gruff-examples" = dontDistribute super."gruff-examples"; - "gsc-weighting" = dontDistribute super."gsc-weighting"; - "gsl-random" = dontDistribute super."gsl-random"; - "gsl-random-fu" = dontDistribute super."gsl-random-fu"; - "gsmenu" = dontDistribute super."gsmenu"; - "gstreamer" = dontDistribute super."gstreamer"; - "gt-tools" = dontDistribute super."gt-tools"; - "gtfs" = dontDistribute super."gtfs"; - "gtk" = doDistribute super."gtk_0_14_2"; - "gtk-helpers" = dontDistribute super."gtk-helpers"; - "gtk-jsinput" = dontDistribute super."gtk-jsinput"; - "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; - "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; - "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; - "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; - "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; - "gtk-toy" = dontDistribute super."gtk-toy"; - "gtk-traymanager" = dontDistribute super."gtk-traymanager"; - "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_5"; - "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; - "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; - "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; - "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; - "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; - "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; - "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; - "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; - "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; - "gtk3" = doDistribute super."gtk3_0_14_2"; - "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; - "gtkglext" = dontDistribute super."gtkglext"; - "gtkimageview" = dontDistribute super."gtkimageview"; - "gtkrsync" = dontDistribute super."gtkrsync"; - "gtksourceview2" = dontDistribute super."gtksourceview2"; - "gtksourceview3" = doDistribute super."gtksourceview3_0_13_2_1"; - "guarded-rewriting" = dontDistribute super."guarded-rewriting"; - "guess-combinator" = dontDistribute super."guess-combinator"; - "guid" = dontDistribute super."guid"; - "gulcii" = dontDistribute super."gulcii"; - "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; - "gyah-bin" = dontDistribute super."gyah-bin"; - "h-booru" = dontDistribute super."h-booru"; - "h-gpgme" = dontDistribute super."h-gpgme"; - "h2048" = dontDistribute super."h2048"; - "hArduino" = dontDistribute super."hArduino"; - "hBDD" = dontDistribute super."hBDD"; - "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; - "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; - "hCsound" = dontDistribute super."hCsound"; - "hDFA" = dontDistribute super."hDFA"; - "hF2" = dontDistribute super."hF2"; - "hGelf" = dontDistribute super."hGelf"; - "hLLVM" = dontDistribute super."hLLVM"; - "hMollom" = dontDistribute super."hMollom"; - "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4"; - "hPDB-examples" = dontDistribute super."hPDB-examples"; - "hPushover" = dontDistribute super."hPushover"; - "hR" = dontDistribute super."hR"; - "hRESP" = dontDistribute super."hRESP"; - "hS3" = dontDistribute super."hS3"; - "hScraper" = dontDistribute super."hScraper"; - "hSimpleDB" = dontDistribute super."hSimpleDB"; - "hTalos" = dontDistribute super."hTalos"; - "hTensor" = dontDistribute super."hTensor"; - "hVOIDP" = dontDistribute super."hVOIDP"; - "hXmixer" = dontDistribute super."hXmixer"; - "haar" = dontDistribute super."haar"; - "hablog" = dontDistribute super."hablog"; - "hacanon-light" = dontDistribute super."hacanon-light"; - "hack" = dontDistribute super."hack"; - "hack-contrib" = dontDistribute super."hack-contrib"; - "hack-contrib-press" = dontDistribute super."hack-contrib-press"; - "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; - "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; - "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; - "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; - "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; - "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; - "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; - "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; - "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; - "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; - "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; - "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; - "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; - "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; - "hack2" = dontDistribute super."hack2"; - "hack2-contrib" = dontDistribute super."hack2-contrib"; - "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; - "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; - "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; - "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; - "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; - "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; - "hackage-diff" = dontDistribute super."hackage-diff"; - "hackage-plot" = dontDistribute super."hackage-plot"; - "hackage-processing" = dontDistribute super."hackage-processing"; - "hackage-proxy" = dontDistribute super."hackage-proxy"; - "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; - "hackage-security" = dontDistribute super."hackage-security"; - "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; - "hackage-server" = dontDistribute super."hackage-server"; - "hackage-sparks" = dontDistribute super."hackage-sparks"; - "hackage2hwn" = dontDistribute super."hackage2hwn"; - "hackage2twitter" = dontDistribute super."hackage2twitter"; - "hackager" = dontDistribute super."hackager"; - "hackernews" = dontDistribute super."hackernews"; - "hackertyper" = dontDistribute super."hackertyper"; - "hackport" = dontDistribute super."hackport"; - "hactor" = dontDistribute super."hactor"; - "hactors" = dontDistribute super."hactors"; - "haddock" = dontDistribute super."haddock"; - "haddock-api" = doDistribute super."haddock-api_2_16_1"; - "haddock-leksah" = dontDistribute super."haddock-leksah"; - "haddock-library" = doDistribute super."haddock-library_1_2_1"; - "haddock-test" = dontDistribute super."haddock-test"; - "haddocset" = doDistribute super."haddocset_0_4_1"; - "hadoop-formats" = dontDistribute super."hadoop-formats"; - "hadoop-rpc" = dontDistribute super."hadoop-rpc"; - "hadoop-tools" = dontDistribute super."hadoop-tools"; - "haeredes" = dontDistribute super."haeredes"; - "haggis" = dontDistribute super."haggis"; - "haha" = dontDistribute super."haha"; - "hahp" = dontDistribute super."hahp"; - "haiji" = dontDistribute super."haiji"; - "hailgun" = dontDistribute super."hailgun"; - "hailgun-send" = dontDistribute super."hailgun-send"; - "hails" = dontDistribute super."hails"; - "hails-bin" = dontDistribute super."hails-bin"; - "hairy" = dontDistribute super."hairy"; - "hakaru" = dontDistribute super."hakaru"; - "hake" = dontDistribute super."hake"; - "hakismet" = dontDistribute super."hakismet"; - "hako" = dontDistribute super."hako"; - "hakyll-R" = dontDistribute super."hakyll-R"; - "hakyll-agda" = dontDistribute super."hakyll-agda"; - "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; - "hakyll-contrib" = dontDistribute super."hakyll-contrib"; - "hakyll-contrib-csv" = dontDistribute super."hakyll-contrib-csv"; - "hakyll-contrib-elm" = dontDistribute super."hakyll-contrib-elm"; - "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; - "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; - "hakyll-convert" = dontDistribute super."hakyll-convert"; - "hakyll-elm" = dontDistribute super."hakyll-elm"; - "hakyll-filestore" = dontDistribute super."hakyll-filestore"; - "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; - "hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare"; - "halberd" = dontDistribute super."halberd"; - "halfs" = dontDistribute super."halfs"; - "halipeto" = dontDistribute super."halipeto"; - "halive" = dontDistribute super."halive"; - "halma" = dontDistribute super."halma"; - "haltavista" = dontDistribute super."haltavista"; - "hamid" = dontDistribute super."hamid"; - "hampp" = dontDistribute super."hampp"; - "hamtmap" = dontDistribute super."hamtmap"; - "hamusic" = dontDistribute super."hamusic"; - "handa-data" = dontDistribute super."handa-data"; - "handa-gdata" = dontDistribute super."handa-gdata"; - "handa-geodata" = dontDistribute super."handa-geodata"; - "handa-opengl" = dontDistribute super."handa-opengl"; - "handle-like" = dontDistribute super."handle-like"; - "handsy" = dontDistribute super."handsy"; - "hangman" = dontDistribute super."hangman"; - "hannahci" = dontDistribute super."hannahci"; - "hans" = dontDistribute super."hans"; - "hans-pcap" = dontDistribute super."hans-pcap"; - "hans-pfq" = dontDistribute super."hans-pfq"; - "haphviz" = dontDistribute super."haphviz"; - "happindicator" = dontDistribute super."happindicator"; - "happindicator3" = dontDistribute super."happindicator3"; - "happraise" = dontDistribute super."happraise"; - "happs-hsp" = dontDistribute super."happs-hsp"; - "happs-hsp-template" = dontDistribute super."happs-hsp-template"; - "happs-tutorial" = dontDistribute super."happs-tutorial"; - "happstack" = dontDistribute super."happstack"; - "happstack-auth" = dontDistribute super."happstack-auth"; - "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_3"; - "happstack-contrib" = dontDistribute super."happstack-contrib"; - "happstack-data" = dontDistribute super."happstack-data"; - "happstack-dlg" = dontDistribute super."happstack-dlg"; - "happstack-facebook" = dontDistribute super."happstack-facebook"; - "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; - "happstack-fay" = dontDistribute super."happstack-fay"; - "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; - "happstack-foundation" = dontDistribute super."happstack-foundation"; - "happstack-hamlet" = dontDistribute super."happstack-hamlet"; - "happstack-heist" = dontDistribute super."happstack-heist"; - "happstack-helpers" = dontDistribute super."happstack-helpers"; - "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; - "happstack-ixset" = dontDistribute super."happstack-ixset"; - "happstack-lite" = dontDistribute super."happstack-lite"; - "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; - "happstack-plugins" = dontDistribute super."happstack-plugins"; - "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; - "happstack-state" = dontDistribute super."happstack-state"; - "happstack-static-routing" = dontDistribute super."happstack-static-routing"; - "happstack-util" = dontDistribute super."happstack-util"; - "happstack-yui" = dontDistribute super."happstack-yui"; - "happy-meta" = dontDistribute super."happy-meta"; - "happybara" = dontDistribute super."happybara"; - "happybara-webkit" = dontDistribute super."happybara-webkit"; - "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; - "hapstone" = dontDistribute super."hapstone"; - "har" = dontDistribute super."har"; - "harchive" = dontDistribute super."harchive"; - "hardware-edsl" = dontDistribute super."hardware-edsl"; - "hark" = dontDistribute super."hark"; - "harmony" = dontDistribute super."harmony"; - "haroonga" = dontDistribute super."haroonga"; - "haroonga-httpd" = dontDistribute super."haroonga-httpd"; - "harpy" = dontDistribute super."harpy"; - "harvest-api" = dontDistribute super."harvest-api"; - "has" = dontDistribute super."has"; - "has-th" = dontDistribute super."has-th"; - "hascal" = dontDistribute super."hascal"; - "hascar" = dontDistribute super."hascar"; - "hascas" = dontDistribute super."hascas"; - "hascat" = dontDistribute super."hascat"; - "hascat-lib" = dontDistribute super."hascat-lib"; - "hascat-setup" = dontDistribute super."hascat-setup"; - "hascat-system" = dontDistribute super."hascat-system"; - "hash" = dontDistribute super."hash"; - "hashable-generics" = dontDistribute super."hashable-generics"; - "hashabler" = dontDistribute super."hashabler"; - "hashed-storage" = dontDistribute super."hashed-storage"; - "hashids" = dontDistribute super."hashids"; - "hashing" = dontDistribute super."hashing"; - "hashmap" = dontDistribute super."hashmap"; - "hashring" = dontDistribute super."hashring"; - "hashtables-plus" = dontDistribute super."hashtables-plus"; - "hasim" = dontDistribute super."hasim"; - "hask" = dontDistribute super."hask"; - "hask-home" = dontDistribute super."hask-home"; - "haskades" = dontDistribute super."haskades"; - "haskakafka" = dontDistribute super."haskakafka"; - "haskanoid" = dontDistribute super."haskanoid"; - "haskarrow" = dontDistribute super."haskarrow"; - "haskbot-core" = dontDistribute super."haskbot-core"; - "haskdeep" = dontDistribute super."haskdeep"; - "haskdogs" = dontDistribute super."haskdogs"; - "haskeem" = dontDistribute super."haskeem"; - "haskeline" = doDistribute super."haskeline_0_7_2_3"; - "haskeline-class" = dontDistribute super."haskeline-class"; - "haskell-aliyun" = dontDistribute super."haskell-aliyun"; - "haskell-awk" = dontDistribute super."haskell-awk"; - "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; - "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; - "haskell-cnc" = dontDistribute super."haskell-cnc"; - "haskell-coffee" = dontDistribute super."haskell-coffee"; - "haskell-compression" = dontDistribute super."haskell-compression"; - "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; - "haskell-docs" = dontDistribute super."haskell-docs"; - "haskell-eigen-util" = dontDistribute super."haskell-eigen-util"; - "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; - "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent"; - "haskell-formatter" = dontDistribute super."haskell-formatter"; - "haskell-ftp" = dontDistribute super."haskell-ftp"; - "haskell-generate" = dontDistribute super."haskell-generate"; - "haskell-gi" = doDistribute super."haskell-gi_0_17_4"; - "haskell-gi-base" = doDistribute super."haskell-gi-base_0_17"; - "haskell-google-trends" = dontDistribute super."haskell-google-trends"; - "haskell-igraph" = dontDistribute super."haskell-igraph"; - "haskell-import-graph" = dontDistribute super."haskell-import-graph"; - "haskell-in-space" = dontDistribute super."haskell-in-space"; - "haskell-kubernetes" = dontDistribute super."haskell-kubernetes"; - "haskell-lexer" = doDistribute super."haskell-lexer_1_0"; - "haskell-modbus" = dontDistribute super."haskell-modbus"; - "haskell-mpfr" = dontDistribute super."haskell-mpfr"; - "haskell-mpi" = dontDistribute super."haskell-mpi"; - "haskell-names" = dontDistribute super."haskell-names"; - "haskell-openflow" = dontDistribute super."haskell-openflow"; - "haskell-packages" = dontDistribute super."haskell-packages"; - "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; - "haskell-platform-test" = dontDistribute super."haskell-platform-test"; - "haskell-player" = dontDistribute super."haskell-player"; - "haskell-plot" = dontDistribute super."haskell-plot"; - "haskell-proxy-list" = dontDistribute super."haskell-proxy-list"; - "haskell-qrencode" = dontDistribute super."haskell-qrencode"; - "haskell-read-editor" = dontDistribute super."haskell-read-editor"; - "haskell-reflect" = dontDistribute super."haskell-reflect"; - "haskell-rules" = dontDistribute super."haskell-rules"; - "haskell-src-exts-prisms" = dontDistribute super."haskell-src-exts-prisms"; - "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; - "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple"; - "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; - "haskell-token-utils" = dontDistribute super."haskell-token-utils"; - "haskell-tools-ast" = dontDistribute super."haskell-tools-ast"; - "haskell-tools-ast-fromghc" = dontDistribute super."haskell-tools-ast-fromghc"; - "haskell-tools-ast-gen" = dontDistribute super."haskell-tools-ast-gen"; - "haskell-tools-ast-trf" = dontDistribute super."haskell-tools-ast-trf"; - "haskell-tools-prettyprint" = dontDistribute super."haskell-tools-prettyprint"; - "haskell-tools-refactor" = dontDistribute super."haskell-tools-refactor"; - "haskell-tor" = dontDistribute super."haskell-tor"; - "haskell-type-exts" = dontDistribute super."haskell-type-exts"; - "haskell-typescript" = dontDistribute super."haskell-typescript"; - "haskell-tyrant" = dontDistribute super."haskell-tyrant"; - "haskell-updater" = dontDistribute super."haskell-updater"; - "haskell-xmpp" = dontDistribute super."haskell-xmpp"; - "haskell2010" = dontDistribute super."haskell2010"; - "haskell98" = dontDistribute super."haskell98"; - "haskell98libraries" = dontDistribute super."haskell98libraries"; - "haskelldb" = dontDistribute super."haskelldb"; - "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; - "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; - "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; - "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; - "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; - "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; - "haskelldb-flat" = dontDistribute super."haskelldb-flat"; - "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; - "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; - "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; - "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; - "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; - "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; - "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; - "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; - "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; - "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; - "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; - "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; - "haskelldb-th" = dontDistribute super."haskelldb-th"; - "haskelldb-wx" = dontDistribute super."haskelldb-wx"; - "haskellscrabble" = dontDistribute super."haskellscrabble"; - "haskellscript" = dontDistribute super."haskellscript"; - "haskelm" = dontDistribute super."haskelm"; - "haskelzinc" = dontDistribute super."haskelzinc"; - "haskgame" = dontDistribute super."haskgame"; - "haskheap" = dontDistribute super."haskheap"; - "haskhol-core" = dontDistribute super."haskhol-core"; - "haskmon" = dontDistribute super."haskmon"; - "haskoin" = dontDistribute super."haskoin"; - "haskoin-core" = dontDistribute super."haskoin-core"; - "haskoin-crypto" = dontDistribute super."haskoin-crypto"; - "haskoin-node" = dontDistribute super."haskoin-node"; - "haskoin-protocol" = dontDistribute super."haskoin-protocol"; - "haskoin-script" = dontDistribute super."haskoin-script"; - "haskoin-util" = dontDistribute super."haskoin-util"; - "haskoin-wallet" = dontDistribute super."haskoin-wallet"; - "haskoon" = dontDistribute super."haskoon"; - "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; - "haskoon-salvia" = dontDistribute super."haskoon-salvia"; - "haskore" = dontDistribute super."haskore"; - "haskore-realtime" = dontDistribute super."haskore-realtime"; - "haskore-supercollider" = dontDistribute super."haskore-supercollider"; - "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; - "haskore-vintage" = dontDistribute super."haskore-vintage"; - "hasktags" = dontDistribute super."hasktags"; - "haslo" = dontDistribute super."haslo"; - "hasloGUI" = dontDistribute super."hasloGUI"; - "hasparql-client" = dontDistribute super."hasparql-client"; - "haspell" = dontDistribute super."haspell"; - "hasql" = doDistribute super."hasql_0_19_14"; - "hasql-backend" = dontDistribute super."hasql-backend"; - "hasql-class" = dontDistribute super."hasql-class"; - "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; - "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; - "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; - "hasql-pool" = dontDistribute super."hasql-pool"; - "hasql-postgres" = dontDistribute super."hasql-postgres"; - "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; - "hasql-th" = dontDistribute super."hasql-th"; - "hasql-transaction" = dontDistribute super."hasql-transaction"; - "hastache-aeson" = dontDistribute super."hastache-aeson"; - "haste" = dontDistribute super."haste"; - "haste-compiler" = dontDistribute super."haste-compiler"; - "haste-gapi" = dontDistribute super."haste-gapi"; - "haste-markup" = dontDistribute super."haste-markup"; - "haste-perch" = dontDistribute super."haste-perch"; - "hastily" = dontDistribute super."hastily"; - "hat" = dontDistribute super."hat"; - "hatex-guide" = dontDistribute super."hatex-guide"; - "hath" = dontDistribute super."hath"; - "hats" = dontDistribute super."hats"; - "hatt" = dontDistribute super."hatt"; - "haverer" = dontDistribute super."haverer"; - "hawitter" = dontDistribute super."hawitter"; - "haxl-facebook" = dontDistribute super."haxl-facebook"; - "haxparse" = dontDistribute super."haxparse"; - "haxr" = doDistribute super."haxr_3000_11_1_6"; - "haxr-th" = dontDistribute super."haxr-th"; - "haxy" = dontDistribute super."haxy"; - "hayland" = dontDistribute super."hayland"; - "hayoo-cli" = dontDistribute super."hayoo-cli"; - "hback" = dontDistribute super."hback"; - "hbb" = dontDistribute super."hbb"; - "hbcd" = dontDistribute super."hbcd"; - "hbeat" = dontDistribute super."hbeat"; - "hblas" = dontDistribute super."hblas"; - "hblock" = dontDistribute super."hblock"; - "hbro" = dontDistribute super."hbro"; - "hbro-contrib" = dontDistribute super."hbro-contrib"; - "hburg" = dontDistribute super."hburg"; - "hcc" = dontDistribute super."hcc"; - "hcg-minus" = dontDistribute super."hcg-minus"; - "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; - "hcheat" = dontDistribute super."hcheat"; - "hchesslib" = dontDistribute super."hchesslib"; - "hcltest" = dontDistribute super."hcltest"; - "hcoap" = dontDistribute super."hcoap"; - "hcron" = dontDistribute super."hcron"; - "hcube" = dontDistribute super."hcube"; - "hcwiid" = dontDistribute super."hcwiid"; - "hdaemonize" = doDistribute super."hdaemonize_0_5_0_2"; - "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; - "hdbc-aeson" = dontDistribute super."hdbc-aeson"; - "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; - "hdbc-tuple" = dontDistribute super."hdbc-tuple"; - "hdbi" = dontDistribute super."hdbi"; - "hdbi-conduit" = dontDistribute super."hdbi-conduit"; - "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; - "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; - "hdbi-tests" = dontDistribute super."hdbi-tests"; - "hdevtools" = doDistribute super."hdevtools_0_1_3_2"; - "hdf" = dontDistribute super."hdf"; - "hdigest" = dontDistribute super."hdigest"; - "hdirect" = dontDistribute super."hdirect"; - "hdis86" = dontDistribute super."hdis86"; - "hdiscount" = dontDistribute super."hdiscount"; - "hdm" = dontDistribute super."hdm"; - "hdo" = dontDistribute super."hdo"; - "hdph" = dontDistribute super."hdph"; - "hdph-closure" = dontDistribute super."hdph-closure"; - "hdr-histogram" = dontDistribute super."hdr-histogram"; - "headergen" = dontDistribute super."headergen"; - "heapsort" = dontDistribute super."heapsort"; - "hecc" = dontDistribute super."hecc"; - "heckle" = dontDistribute super."heckle"; - "hedis" = doDistribute super."hedis_0_6_10"; - "hedis-config" = dontDistribute super."hedis-config"; - "hedis-monadic" = dontDistribute super."hedis-monadic"; - "hedis-namespace" = dontDistribute super."hedis-namespace"; - "hedis-pile" = dontDistribute super."hedis-pile"; - "hedis-simple" = dontDistribute super."hedis-simple"; - "hedis-tags" = dontDistribute super."hedis-tags"; - "hedn" = dontDistribute super."hedn"; - "hein" = dontDistribute super."hein"; - "heist" = doDistribute super."heist_0_14_1_4"; - "heist-aeson" = dontDistribute super."heist-aeson"; - "heist-async" = dontDistribute super."heist-async"; - "helics" = dontDistribute super."helics"; - "helics-wai" = dontDistribute super."helics-wai"; - "helisp" = dontDistribute super."helisp"; - "helium" = dontDistribute super."helium"; - "helium-overture" = dontDistribute super."helium-overture"; - "helix" = dontDistribute super."helix"; - "hell" = dontDistribute super."hell"; - "hellage" = dontDistribute super."hellage"; - "hellnet" = dontDistribute super."hellnet"; - "hello" = dontDistribute super."hello"; - "helm" = dontDistribute super."helm"; - "help-esb" = dontDistribute super."help-esb"; - "hemkay" = dontDistribute super."hemkay"; - "hemkay-core" = dontDistribute super."hemkay-core"; - "hemokit" = dontDistribute super."hemokit"; - "hen" = dontDistribute super."hen"; - "henet" = dontDistribute super."henet"; - "hepevt" = dontDistribute super."hepevt"; - "her-lexer" = dontDistribute super."her-lexer"; - "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; - "herbalizer" = dontDistribute super."herbalizer"; - "heredocs" = dontDistribute super."heredocs"; - "herf-time" = dontDistribute super."herf-time"; - "hermit" = dontDistribute super."hermit"; - "hermit-syb" = dontDistribute super."hermit-syb"; - "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; - "heroku" = dontDistribute super."heroku"; - "heroku-persistent" = dontDistribute super."heroku-persistent"; - "herringbone" = dontDistribute super."herringbone"; - "herringbone-embed" = dontDistribute super."herringbone-embed"; - "herringbone-wai" = dontDistribute super."herringbone-wai"; - "hesh" = dontDistribute super."hesh"; - "hesql" = dontDistribute super."hesql"; - "hetero-dict" = dontDistribute super."hetero-dict"; - "hetero-map" = dontDistribute super."hetero-map"; - "hetris" = dontDistribute super."hetris"; - "heukarya" = dontDistribute super."heukarya"; - "hevolisa" = dontDistribute super."hevolisa"; - "hevolisa-dph" = dontDistribute super."hevolisa-dph"; - "hexdump" = dontDistribute super."hexdump"; - "hexif" = dontDistribute super."hexif"; - "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; - "hexpat-lens" = dontDistribute super."hexpat-lens"; - "hexpat-pickle" = dontDistribute super."hexpat-pickle"; - "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; - "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; - "hexpr" = dontDistribute super."hexpr"; - "hexquote" = dontDistribute super."hexquote"; - "hext" = dontDistribute super."hext"; - "heyefi" = dontDistribute super."heyefi"; - "hfann" = dontDistribute super."hfann"; - "hfd" = dontDistribute super."hfd"; - "hfiar" = dontDistribute super."hfiar"; - "hfmt" = dontDistribute super."hfmt"; - "hfoil" = dontDistribute super."hfoil"; - "hfov" = dontDistribute super."hfov"; - "hfractal" = dontDistribute super."hfractal"; - "hfusion" = dontDistribute super."hfusion"; - "hg-buildpackage" = dontDistribute super."hg-buildpackage"; - "hgal" = dontDistribute super."hgal"; - "hgalib" = dontDistribute super."hgalib"; - "hgdbmi" = dontDistribute super."hgdbmi"; - "hgearman" = dontDistribute super."hgearman"; - "hgen" = dontDistribute super."hgen"; - "hgeometric" = dontDistribute super."hgeometric"; - "hgeometry" = dontDistribute super."hgeometry"; - "hgeos" = dontDistribute super."hgeos"; - "hgithub" = dontDistribute super."hgithub"; - "hgl-example" = dontDistribute super."hgl-example"; - "hgmp" = dontDistribute super."hgmp"; - "hgom" = dontDistribute super."hgom"; - "hgopher" = dontDistribute super."hgopher"; - "hgrev" = dontDistribute super."hgrev"; - "hgrib" = dontDistribute super."hgrib"; - "hharp" = dontDistribute super."hharp"; - "hi" = dontDistribute super."hi"; - "hi3status" = dontDistribute super."hi3status"; - "hiccup" = dontDistribute super."hiccup"; - "hichi" = dontDistribute super."hichi"; - "hieraclus" = dontDistribute super."hieraclus"; - "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; - "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; - "hierarchy" = dontDistribute super."hierarchy"; - "hiernotify" = dontDistribute super."hiernotify"; - "highWaterMark" = dontDistribute super."highWaterMark"; - "higher-leveldb" = dontDistribute super."higher-leveldb"; - "higherorder" = dontDistribute super."higherorder"; - "highlight-versions" = dontDistribute super."highlight-versions"; - "highlighter" = dontDistribute super."highlighter"; - "highlighter2" = dontDistribute super."highlighter2"; - "hills" = dontDistribute super."hills"; - "himerge" = dontDistribute super."himerge"; - "himg" = dontDistribute super."himg"; - "himpy" = dontDistribute super."himpy"; - "hindley-milner" = dontDistribute super."hindley-milner"; - "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; - "hinduce-classifier" = dontDistribute super."hinduce-classifier"; - "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; - "hinduce-examples" = dontDistribute super."hinduce-examples"; - "hinduce-missingh" = dontDistribute super."hinduce-missingh"; - "hinotify-bytestring" = dontDistribute super."hinotify-bytestring"; - "hinquire" = dontDistribute super."hinquire"; - "hinstaller" = dontDistribute super."hinstaller"; - "hint" = doDistribute super."hint_0_5_2"; - "hint-server" = dontDistribute super."hint-server"; - "hinvaders" = dontDistribute super."hinvaders"; - "hinze-streams" = dontDistribute super."hinze-streams"; - "hip" = dontDistribute super."hip"; - "hipbot" = dontDistribute super."hipbot"; - "hipchat-hs" = dontDistribute super."hipchat-hs"; - "hipe" = dontDistribute super."hipe"; - "hips" = dontDistribute super."hips"; - "hircules" = dontDistribute super."hircules"; - "hirt" = dontDistribute super."hirt"; - "hissmetrics" = dontDistribute super."hissmetrics"; - "hist-pl" = dontDistribute super."hist-pl"; - "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; - "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; - "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; - "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; - "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; - "hist-pl-types" = dontDistribute super."hist-pl-types"; - "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; - "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; - "historian" = dontDistribute super."historian"; - "hit-graph" = dontDistribute super."hit-graph"; - "hjcase" = dontDistribute super."hjcase"; - "hjs" = dontDistribute super."hjs"; - "hjsmin" = doDistribute super."hjsmin_0_2_0_1"; - "hjson-query" = dontDistribute super."hjson-query"; - "hjsonpointer" = dontDistribute super."hjsonpointer"; - "hjsonschema" = dontDistribute super."hjsonschema"; - "hkdf" = dontDistribute super."hkdf"; - "hlatex" = dontDistribute super."hlatex"; - "hlbfgsb" = dontDistribute super."hlbfgsb"; - "hlcm" = dontDistribute super."hlcm"; - "hleap" = dontDistribute super."hleap"; - "hledger" = doDistribute super."hledger_0_27"; - "hledger-chart" = dontDistribute super."hledger-chart"; - "hledger-diff" = dontDistribute super."hledger-diff"; - "hledger-irr" = dontDistribute super."hledger-irr"; - "hledger-lib" = doDistribute super."hledger-lib_0_27"; - "hledger-ui" = doDistribute super."hledger-ui_0_27_4"; - "hledger-vty" = dontDistribute super."hledger-vty"; - "hlibBladeRF" = dontDistribute super."hlibBladeRF"; - "hlibev" = dontDistribute super."hlibev"; - "hlibfam" = dontDistribute super."hlibfam"; - "hlogger" = dontDistribute super."hlogger"; - "hlongurl" = dontDistribute super."hlongurl"; - "hls" = dontDistribute super."hls"; - "hlwm" = dontDistribute super."hlwm"; - "hly" = dontDistribute super."hly"; - "hmark" = dontDistribute super."hmark"; - "hmarkup" = dontDistribute super."hmarkup"; - "hmatrix-banded" = dontDistribute super."hmatrix-banded"; - "hmatrix-csv" = dontDistribute super."hmatrix-csv"; - "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; - "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; - "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; - "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; - "hmatrix-repa" = dontDistribute super."hmatrix-repa"; - "hmatrix-special" = dontDistribute super."hmatrix-special"; - "hmatrix-static" = dontDistribute super."hmatrix-static"; - "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; - "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; - "hmatrix-tests" = dontDistribute super."hmatrix-tests"; - "hmeap" = dontDistribute super."hmeap"; - "hmeap-utils" = dontDistribute super."hmeap-utils"; - "hmemdb" = dontDistribute super."hmemdb"; - "hmenu" = dontDistribute super."hmenu"; - "hmidi" = dontDistribute super."hmidi"; - "hmk" = dontDistribute super."hmk"; - "hmm" = dontDistribute super."hmm"; - "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; - "hmp3" = dontDistribute super."hmp3"; - "hmpfr" = dontDistribute super."hmpfr"; - "hmt-diagrams" = dontDistribute super."hmt-diagrams"; - "hmumps" = dontDistribute super."hmumps"; - "hnetcdf" = dontDistribute super."hnetcdf"; - "hnix" = dontDistribute super."hnix"; - "hnn" = dontDistribute super."hnn"; - "hnop" = dontDistribute super."hnop"; - "ho-rewriting" = dontDistribute super."ho-rewriting"; - "hoauth" = dontDistribute super."hoauth"; - "hob" = dontDistribute super."hob"; - "hobbes" = dontDistribute super."hobbes"; - "hobbits" = dontDistribute super."hobbits"; - "hocilib" = dontDistribute super."hocilib"; - "hoe" = dontDistribute super."hoe"; - "hofix-mtl" = dontDistribute super."hofix-mtl"; - "hog" = dontDistribute super."hog"; - "hogg" = dontDistribute super."hogg"; - "hogre" = dontDistribute super."hogre"; - "hogre-examples" = dontDistribute super."hogre-examples"; - "hois" = dontDistribute super."hois"; - "hoist-error" = dontDistribute super."hoist-error"; - "hold-em" = dontDistribute super."hold-em"; - "hole" = dontDistribute super."hole"; - "holey-format" = dontDistribute super."holey-format"; - "homeomorphic" = dontDistribute super."homeomorphic"; - "hommage" = dontDistribute super."hommage"; - "hommage-ds" = dontDistribute super."hommage-ds"; - "homoiconic" = dontDistribute super."homoiconic"; - "homplexity" = dontDistribute super."homplexity"; - "honi" = dontDistribute super."honi"; - "honk" = dontDistribute super."honk"; - "hoobuddy" = dontDistribute super."hoobuddy"; - "hood" = dontDistribute super."hood"; - "hood-off" = dontDistribute super."hood-off"; - "hood2" = dontDistribute super."hood2"; - "hoodie" = dontDistribute super."hoodie"; - "hoodle" = dontDistribute super."hoodle"; - "hoodle-builder" = dontDistribute super."hoodle-builder"; - "hoodle-core" = dontDistribute super."hoodle-core"; - "hoodle-extra" = dontDistribute super."hoodle-extra"; - "hoodle-parser" = dontDistribute super."hoodle-parser"; - "hoodle-publish" = dontDistribute super."hoodle-publish"; - "hoodle-render" = dontDistribute super."hoodle-render"; - "hoodle-types" = dontDistribute super."hoodle-types"; - "hoogle" = doDistribute super."hoogle_4_2_43"; - "hoogle-index" = dontDistribute super."hoogle-index"; - "hooks-dir" = dontDistribute super."hooks-dir"; - "hoovie" = dontDistribute super."hoovie"; - "hopencc" = dontDistribute super."hopencc"; - "hopencl" = dontDistribute super."hopencl"; - "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18"; - "hopfield" = dontDistribute super."hopfield"; - "hopfield-networks" = dontDistribute super."hopfield-networks"; - "hopfli" = dontDistribute super."hopfli"; - "hoppy-docs" = dontDistribute super."hoppy-docs"; - "hoppy-generator" = dontDistribute super."hoppy-generator"; - "hoppy-runtime" = dontDistribute super."hoppy-runtime"; - "hoppy-std" = dontDistribute super."hoppy-std"; - "hops" = dontDistribute super."hops"; - "hoq" = dontDistribute super."hoq"; - "horizon" = dontDistribute super."horizon"; - "hosc-json" = dontDistribute super."hosc-json"; - "hosc-utils" = dontDistribute super."hosc-utils"; - "hosts-server" = dontDistribute super."hosts-server"; - "hothasktags" = dontDistribute super."hothasktags"; - "hotswap" = dontDistribute super."hotswap"; - "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; - "houseman" = dontDistribute super."houseman"; - "hp2any-core" = dontDistribute super."hp2any-core"; - "hp2any-graph" = dontDistribute super."hp2any-graph"; - "hp2any-manager" = dontDistribute super."hp2any-manager"; - "hp2html" = dontDistribute super."hp2html"; - "hp2pretty" = dontDistribute super."hp2pretty"; - "hpack-convert" = dontDistribute super."hpack-convert"; - "hpaco" = dontDistribute super."hpaco"; - "hpaco-lib" = dontDistribute super."hpaco-lib"; - "hpage" = dontDistribute super."hpage"; - "hpapi" = dontDistribute super."hpapi"; - "hpaste" = dontDistribute super."hpaste"; - "hpasteit" = dontDistribute super."hpasteit"; - "hpath" = dontDistribute super."hpath"; - "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_4"; - "hpc-strobe" = dontDistribute super."hpc-strobe"; - "hpc-tracer" = dontDistribute super."hpc-tracer"; - "hpdft" = dontDistribute super."hpdft"; - "hpio" = dontDistribute super."hpio"; - "hplayground" = dontDistribute super."hplayground"; - "hplaylist" = dontDistribute super."hplaylist"; - "hpodder" = dontDistribute super."hpodder"; - "hpp" = dontDistribute super."hpp"; - "hpqtypes" = dontDistribute super."hpqtypes"; - "hpqtypes-extras" = dontDistribute super."hpqtypes-extras"; - "hprotoc" = doDistribute super."hprotoc_2_2_0"; - "hprotoc-fork" = dontDistribute super."hprotoc-fork"; - "hps" = dontDistribute super."hps"; - "hps-cairo" = dontDistribute super."hps-cairo"; - "hps-kmeans" = dontDistribute super."hps-kmeans"; - "hpuz" = dontDistribute super."hpuz"; - "hpygments" = dontDistribute super."hpygments"; - "hpylos" = dontDistribute super."hpylos"; - "hpyrg" = dontDistribute super."hpyrg"; - "hquantlib" = dontDistribute super."hquantlib"; - "hquery" = dontDistribute super."hquery"; - "hranker" = dontDistribute super."hranker"; - "hreader" = dontDistribute super."hreader"; - "hricket" = dontDistribute super."hricket"; - "hruby" = dontDistribute super."hruby"; - "hs-blake2" = dontDistribute super."hs-blake2"; - "hs-captcha" = dontDistribute super."hs-captcha"; - "hs-carbon" = dontDistribute super."hs-carbon"; - "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; - "hs-cdb" = dontDistribute super."hs-cdb"; - "hs-dotnet" = dontDistribute super."hs-dotnet"; - "hs-duktape" = dontDistribute super."hs-duktape"; - "hs-excelx" = dontDistribute super."hs-excelx"; - "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; - "hs-fltk" = dontDistribute super."hs-fltk"; - "hs-gchart" = dontDistribute super."hs-gchart"; - "hs-gen-iface" = dontDistribute super."hs-gen-iface"; - "hs-gizapp" = dontDistribute super."hs-gizapp"; - "hs-inspector" = dontDistribute super."hs-inspector"; - "hs-java" = dontDistribute super."hs-java"; - "hs-json-rpc" = dontDistribute super."hs-json-rpc"; - "hs-logo" = dontDistribute super."hs-logo"; - "hs-mesos" = dontDistribute super."hs-mesos"; - "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; - "hs-pgms" = dontDistribute super."hs-pgms"; - "hs-php-session" = dontDistribute super."hs-php-session"; - "hs-pkg-config" = dontDistribute super."hs-pkg-config"; - "hs-pkpass" = dontDistribute super."hs-pkpass"; - "hs-popen" = dontDistribute super."hs-popen"; - "hs-re" = dontDistribute super."hs-re"; - "hs-scrape" = dontDistribute super."hs-scrape"; - "hs-twitter" = dontDistribute super."hs-twitter"; - "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; - "hs-vcard" = dontDistribute super."hs-vcard"; - "hs-watchman" = dontDistribute super."hs-watchman"; - "hs2048" = dontDistribute super."hs2048"; - "hs2bf" = dontDistribute super."hs2bf"; - "hs2dot" = dontDistribute super."hs2dot"; - "hsConfigure" = dontDistribute super."hsConfigure"; - "hsSqlite3" = dontDistribute super."hsSqlite3"; - "hsXenCtrl" = dontDistribute super."hsXenCtrl"; - "hsay" = dontDistribute super."hsay"; - "hsbackup" = dontDistribute super."hsbackup"; - "hsbencher" = dontDistribute super."hsbencher"; - "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; - "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; - "hsc2hs" = dontDistribute super."hsc2hs"; - "hsc3" = dontDistribute super."hsc3"; - "hsc3-auditor" = dontDistribute super."hsc3-auditor"; - "hsc3-cairo" = dontDistribute super."hsc3-cairo"; - "hsc3-data" = dontDistribute super."hsc3-data"; - "hsc3-db" = dontDistribute super."hsc3-db"; - "hsc3-dot" = dontDistribute super."hsc3-dot"; - "hsc3-forth" = dontDistribute super."hsc3-forth"; - "hsc3-graphs" = dontDistribute super."hsc3-graphs"; - "hsc3-lang" = dontDistribute super."hsc3-lang"; - "hsc3-lisp" = dontDistribute super."hsc3-lisp"; - "hsc3-plot" = dontDistribute super."hsc3-plot"; - "hsc3-process" = dontDistribute super."hsc3-process"; - "hsc3-rec" = dontDistribute super."hsc3-rec"; - "hsc3-rw" = dontDistribute super."hsc3-rw"; - "hsc3-server" = dontDistribute super."hsc3-server"; - "hsc3-sf" = dontDistribute super."hsc3-sf"; - "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; - "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; - "hsc3-utils" = dontDistribute super."hsc3-utils"; - "hscaffold" = dontDistribute super."hscaffold"; - "hscamwire" = dontDistribute super."hscamwire"; - "hscassandra" = dontDistribute super."hscassandra"; - "hscd" = dontDistribute super."hscd"; - "hsclock" = dontDistribute super."hsclock"; - "hscope" = dontDistribute super."hscope"; - "hscrtmpl" = dontDistribute super."hscrtmpl"; - "hscuid" = dontDistribute super."hscuid"; - "hscurses" = dontDistribute super."hscurses"; - "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; - "hsdif" = dontDistribute super."hsdif"; - "hsdip" = dontDistribute super."hsdip"; - "hsdns" = dontDistribute super."hsdns"; - "hsdns-cache" = dontDistribute super."hsdns-cache"; - "hsemail-ns" = dontDistribute super."hsemail-ns"; - "hsenv" = dontDistribute super."hsenv"; - "hserv" = dontDistribute super."hserv"; - "hset" = dontDistribute super."hset"; - "hsfacter" = dontDistribute super."hsfacter"; - "hsfcsh" = dontDistribute super."hsfcsh"; - "hsfilt" = dontDistribute super."hsfilt"; - "hsgnutls" = dontDistribute super."hsgnutls"; - "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; - "hsgsom" = dontDistribute super."hsgsom"; - "hsgtd" = dontDistribute super."hsgtd"; - "hsharc" = dontDistribute super."hsharc"; - "hsilop" = dontDistribute super."hsilop"; - "hsimport" = dontDistribute super."hsimport"; - "hsini" = dontDistribute super."hsini"; - "hskeleton" = dontDistribute super."hskeleton"; - "hslackbuilder" = dontDistribute super."hslackbuilder"; - "hslibsvm" = dontDistribute super."hslibsvm"; - "hslinks" = dontDistribute super."hslinks"; - "hslogger-reader" = dontDistribute super."hslogger-reader"; - "hslogger-template" = dontDistribute super."hslogger-template"; - "hslogger4j" = dontDistribute super."hslogger4j"; - "hslogstash" = dontDistribute super."hslogstash"; - "hsmagick" = dontDistribute super."hsmagick"; - "hsmisc" = dontDistribute super."hsmisc"; - "hsmtpclient" = dontDistribute super."hsmtpclient"; - "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; - "hsnock" = dontDistribute super."hsnock"; - "hsnoise" = dontDistribute super."hsnoise"; - "hsns" = dontDistribute super."hsns"; - "hsnsq" = dontDistribute super."hsnsq"; - "hsntp" = dontDistribute super."hsntp"; - "hsoptions" = dontDistribute super."hsoptions"; - "hsp-cgi" = dontDistribute super."hsp-cgi"; - "hsparklines" = dontDistribute super."hsparklines"; - "hsparql" = dontDistribute super."hsparql"; - "hspear" = dontDistribute super."hspear"; - "hspec-checkers" = dontDistribute super."hspec-checkers"; - "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; - "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; - "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; - "hspec-experimental" = dontDistribute super."hspec-experimental"; - "hspec-golden-aeson" = dontDistribute super."hspec-golden-aeson"; - "hspec-hashable" = dontDistribute super."hspec-hashable"; - "hspec-laws" = dontDistribute super."hspec-laws"; - "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; - "hspec-monad-control" = dontDistribute super."hspec-monad-control"; - "hspec-server" = dontDistribute super."hspec-server"; - "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; - "hspec-slow" = dontDistribute super."hspec-slow"; - "hspec-snap" = doDistribute super."hspec-snap_0_4_0_1"; - "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; - "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; - "hspec-test-framework" = dontDistribute super."hspec-test-framework"; - "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; - "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; - "hspec-webdriver" = doDistribute super."hspec-webdriver_1_1_0"; - "hspec2" = dontDistribute super."hspec2"; - "hspecVariant" = dontDistribute super."hspecVariant"; - "hspr-sh" = dontDistribute super."hspr-sh"; - "hspread" = dontDistribute super."hspread"; - "hspresent" = dontDistribute super."hspresent"; - "hsprocess" = dontDistribute super."hsprocess"; - "hsql" = dontDistribute super."hsql"; - "hsql-mysql" = dontDistribute super."hsql-mysql"; - "hsql-odbc" = dontDistribute super."hsql-odbc"; - "hsql-postgresql" = dontDistribute super."hsql-postgresql"; - "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; - "hsqml" = dontDistribute super."hsqml"; - "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; - "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; - "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; - "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; - "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; - "hsqml-morris" = dontDistribute super."hsqml-morris"; - "hsreadability" = dontDistribute super."hsreadability"; - "hsrelp" = dontDistribute super."hsrelp"; - "hsseccomp" = dontDistribute super."hsseccomp"; - "hsshellscript" = dontDistribute super."hsshellscript"; - "hssourceinfo" = dontDistribute super."hssourceinfo"; - "hssqlppp" = dontDistribute super."hssqlppp"; - "hssqlppp-th" = dontDistribute super."hssqlppp-th"; - "hstats" = dontDistribute super."hstats"; - "hstest" = dontDistribute super."hstest"; - "hstidy" = dontDistribute super."hstidy"; - "hstorchat" = dontDistribute super."hstorchat"; - "hstradeking" = dontDistribute super."hstradeking"; - "hstyle" = dontDistribute super."hstyle"; - "hstzaar" = dontDistribute super."hstzaar"; - "hsubconvert" = dontDistribute super."hsubconvert"; - "hsverilog" = dontDistribute super."hsverilog"; - "hswip" = dontDistribute super."hswip"; - "hsx" = dontDistribute super."hsx"; - "hsx-xhtml" = dontDistribute super."hsx-xhtml"; - "hsyscall" = dontDistribute super."hsyscall"; - "hsyslog" = doDistribute super."hsyslog_2_0"; - "hsyslog-udp" = dontDistribute super."hsyslog-udp"; - "hszephyr" = dontDistribute super."hszephyr"; - "htags" = dontDistribute super."htags"; - "htar" = dontDistribute super."htar"; - "htestu" = dontDistribute super."htestu"; - "htiled" = dontDistribute super."htiled"; - "htime" = dontDistribute super."htime"; - "html-email-validate" = dontDistribute super."html-email-validate"; - "html-entities" = dontDistribute super."html-entities"; - "html-kure" = dontDistribute super."html-kure"; - "html-minimalist" = dontDistribute super."html-minimalist"; - "html-parse" = dontDistribute super."html-parse"; - "html-rules" = dontDistribute super."html-rules"; - "html-tokenizer" = dontDistribute super."html-tokenizer"; - "html-truncate" = dontDistribute super."html-truncate"; - "html2hamlet" = dontDistribute super."html2hamlet"; - "html5-entity" = dontDistribute super."html5-entity"; - "htodo" = dontDistribute super."htodo"; - "htrace" = dontDistribute super."htrace"; - "hts" = dontDistribute super."hts"; - "htsn" = dontDistribute super."htsn"; - "htsn-common" = dontDistribute super."htsn-common"; - "htsn-import" = dontDistribute super."htsn-import"; - "http-attoparsec" = dontDistribute super."http-attoparsec"; - "http-client" = doDistribute super."http-client_0_4_31"; - "http-client-auth" = dontDistribute super."http-client-auth"; - "http-client-conduit" = dontDistribute super."http-client-conduit"; - "http-client-lens" = dontDistribute super."http-client-lens"; - "http-client-multipart" = dontDistribute super."http-client-multipart"; - "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; - "http-client-session" = dontDistribute super."http-client-session"; - "http-client-streams" = dontDistribute super."http-client-streams"; - "http-conduit-browser" = dontDistribute super."http-conduit-browser"; - "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; - "http-dispatch" = dontDistribute super."http-dispatch"; - "http-encodings" = dontDistribute super."http-encodings"; - "http-enumerator" = dontDistribute super."http-enumerator"; - "http-kinder" = dontDistribute super."http-kinder"; - "http-kit" = dontDistribute super."http-kit"; - "http-link-header" = doDistribute super."http-link-header_1_0_1"; - "http-listen" = dontDistribute super."http-listen"; - "http-monad" = dontDistribute super."http-monad"; - "http-proxy" = dontDistribute super."http-proxy"; - "http-querystring" = dontDistribute super."http-querystring"; - "http-response-decoder" = dontDistribute super."http-response-decoder"; - "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3"; - "http-server" = dontDistribute super."http-server"; - "http-shed" = dontDistribute super."http-shed"; - "http-streams" = doDistribute super."http-streams_0_8_3_3"; - "http-test" = dontDistribute super."http-test"; - "http-trace" = dontDistribute super."http-trace"; - "http-wget" = dontDistribute super."http-wget"; - "http2" = doDistribute super."http2_1_6_1"; - "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; - "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; - "httpspec" = dontDistribute super."httpspec"; - "htune" = dontDistribute super."htune"; - "htzaar" = dontDistribute super."htzaar"; - "hub" = dontDistribute super."hub"; - "hubigraph" = dontDistribute super."hubigraph"; - "hubris" = dontDistribute super."hubris"; - "huckleberry" = dontDistribute super."huckleberry"; - "huffman" = dontDistribute super."huffman"; - "hugs2yc" = dontDistribute super."hugs2yc"; - "hulk" = dontDistribute super."hulk"; - "hums" = dontDistribute super."hums"; - "hunch" = dontDistribute super."hunch"; - "hunit-gui" = dontDistribute super."hunit-gui"; - "hunit-parsec" = dontDistribute super."hunit-parsec"; - "hunit-rematch" = dontDistribute super."hunit-rematch"; - "hunp" = dontDistribute super."hunp"; - "hunt-searchengine" = dontDistribute super."hunt-searchengine"; - "hunt-server" = dontDistribute super."hunt-server"; - "hunt-server-cli" = dontDistribute super."hunt-server-cli"; - "hurdle" = dontDistribute super."hurdle"; - "husk-scheme" = dontDistribute super."husk-scheme"; - "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; - "husky" = dontDistribute super."husky"; - "hutton" = dontDistribute super."hutton"; - "huttons-razor" = dontDistribute super."huttons-razor"; - "huzzy" = dontDistribute super."huzzy"; - "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; - "hw-diagnostics" = doDistribute super."hw-diagnostics_0_0_0_2"; - "hw-json" = doDistribute super."hw-json_0_0_0_2"; - "hw-mquery" = dontDistribute super."hw-mquery"; - "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; - "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; - "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; - "hws" = dontDistribute super."hws"; - "hwsl2" = dontDistribute super."hwsl2"; - "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; - "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; - "hx" = dontDistribute super."hx"; - "hxmppc" = dontDistribute super."hxmppc"; - "hxournal" = dontDistribute super."hxournal"; - "hxt-binary" = dontDistribute super."hxt-binary"; - "hxt-cache" = dontDistribute super."hxt-cache"; - "hxt-css" = doDistribute super."hxt-css_0_1_0_2"; - "hxt-extras" = dontDistribute super."hxt-extras"; - "hxt-filter" = dontDistribute super."hxt-filter"; - "hxt-xpath" = dontDistribute super."hxt-xpath"; - "hxt-xslt" = dontDistribute super."hxt-xslt"; - "hxthelper" = dontDistribute super."hxthelper"; - "hxweb" = dontDistribute super."hxweb"; - "hyahtzee" = dontDistribute super."hyahtzee"; - "hyakko" = dontDistribute super."hyakko"; - "hybrid" = dontDistribute super."hybrid"; - "hydra-hs" = dontDistribute super."hydra-hs"; - "hydra-print" = dontDistribute super."hydra-print"; - "hydrogen" = dontDistribute super."hydrogen"; - "hydrogen-cli" = dontDistribute super."hydrogen-cli"; - "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; - "hydrogen-data" = dontDistribute super."hydrogen-data"; - "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; - "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; - "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; - "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; - "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; - "hydrogen-util" = dontDistribute super."hydrogen-util"; - "hydrogen-version" = dontDistribute super."hydrogen-version"; - "hyena" = dontDistribute super."hyena"; - "hylide" = dontDistribute super."hylide"; - "hylogen" = dontDistribute super."hylogen"; - "hylolib" = dontDistribute super."hylolib"; - "hylotab" = dontDistribute super."hylotab"; - "hyloutils" = dontDistribute super."hyloutils"; - "hyperdrive" = dontDistribute super."hyperdrive"; - "hyperfunctions" = dontDistribute super."hyperfunctions"; - "hyperloglogplus" = dontDistribute super."hyperloglogplus"; - "hyperpublic" = dontDistribute super."hyperpublic"; - "hyphenate" = dontDistribute super."hyphenate"; - "hypher" = dontDistribute super."hypher"; - "hzaif" = dontDistribute super."hzaif"; - "hzk" = dontDistribute super."hzk"; - "i18n" = dontDistribute super."i18n"; - "iCalendar" = dontDistribute super."iCalendar"; - "iException" = dontDistribute super."iException"; - "iap-verifier" = dontDistribute super."iap-verifier"; - "ib-api" = dontDistribute super."ib-api"; - "iban" = dontDistribute super."iban"; - "ibus-hs" = dontDistribute super."ibus-hs"; - "ideas" = dontDistribute super."ideas"; - "ideas-math" = dontDistribute super."ideas-math"; - "idempotent" = dontDistribute super."idempotent"; - "identicon" = dontDistribute super."identicon"; - "identifiers" = dontDistribute super."identifiers"; - "idiii" = dontDistribute super."idiii"; - "idna" = dontDistribute super."idna"; - "idna2008" = dontDistribute super."idna2008"; - "idringen" = dontDistribute super."idringen"; - "idris" = doDistribute super."idris_0_11_2"; - "ieee" = dontDistribute super."ieee"; - "ieee-utils" = dontDistribute super."ieee-utils"; - "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; - "ieee754-parser" = dontDistribute super."ieee754-parser"; - "ifcxt" = dontDistribute super."ifcxt"; - "iff" = dontDistribute super."iff"; - "ifscs" = dontDistribute super."ifscs"; - "ig" = doDistribute super."ig_0_7"; - "ige-mac-integration" = dontDistribute super."ige-mac-integration"; - "igraph" = dontDistribute super."igraph"; - "igrf" = dontDistribute super."igrf"; - "ihaskell-display" = dontDistribute super."ihaskell-display"; - "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; - "ihaskell-plot" = dontDistribute super."ihaskell-plot"; - "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; - "ihttp" = dontDistribute super."ihttp"; - "ilist" = dontDistribute super."ilist"; - "illuminate" = dontDistribute super."illuminate"; - "image-type" = dontDistribute super."image-type"; - "imagefilters" = dontDistribute super."imagefilters"; - "imagemagick" = dontDistribute super."imagemagick"; - "imagepaste" = dontDistribute super."imagepaste"; - "imap" = dontDistribute super."imap"; - "imapget" = dontDistribute super."imapget"; - "imbib" = dontDistribute super."imbib"; - "imgurder" = dontDistribute super."imgurder"; - "imm" = dontDistribute super."imm"; - "imparse" = dontDistribute super."imparse"; - "imperative-edsl" = dontDistribute super."imperative-edsl"; - "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; - "implicit" = dontDistribute super."implicit"; - "implicit-logging" = dontDistribute super."implicit-logging"; - "implicit-params" = dontDistribute super."implicit-params"; - "imports" = dontDistribute super."imports"; - "impossible" = dontDistribute super."impossible"; - "improve" = dontDistribute super."improve"; - "impure-containers" = dontDistribute super."impure-containers"; - "inc-ref" = dontDistribute super."inc-ref"; - "inch" = dontDistribute super."inch"; - "inchworm" = dontDistribute super."inchworm"; - "incremental-computing" = dontDistribute super."incremental-computing"; - "incremental-maps" = dontDistribute super."incremental-maps"; - "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; - "increments" = dontDistribute super."increments"; - "indentation" = dontDistribute super."indentation"; - "indentation-core" = dontDistribute super."indentation-core"; - "indentation-parsec" = dontDistribute super."indentation-parsec"; - "indentation-trifecta" = dontDistribute super."indentation-trifecta"; - "indentparser" = dontDistribute super."indentparser"; - "index-core" = dontDistribute super."index-core"; - "indexed" = dontDistribute super."indexed"; - "indexed-do-notation" = dontDistribute super."indexed-do-notation"; - "indexed-extras" = dontDistribute super."indexed-extras"; - "indexed-free" = dontDistribute super."indexed-free"; - "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; - "indices" = dontDistribute super."indices"; - "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; - "inf-interval" = dontDistribute super."inf-interval"; - "infer-upstream" = dontDistribute super."infer-upstream"; - "infernu" = dontDistribute super."infernu"; - "infinite-search" = dontDistribute super."infinite-search"; - "infinity" = dontDistribute super."infinity"; - "infix" = dontDistribute super."infix"; - "inflist" = dontDistribute super."inflist"; - "influxdb" = dontDistribute super."influxdb"; - "informative" = dontDistribute super."informative"; - "ini-qq" = dontDistribute super."ini-qq"; - "inilist" = dontDistribute super."inilist"; - "inject" = dontDistribute super."inject"; - "inject-function" = dontDistribute super."inject-function"; - "inline-c" = doDistribute super."inline-c_0_5_5_5"; - "inline-c-win32" = dontDistribute super."inline-c-win32"; - "inline-java" = dontDistribute super."inline-java"; - "inline-r" = doDistribute super."inline-r_0_8_0_1"; - "inquire" = dontDistribute super."inquire"; - "inserts" = dontDistribute super."inserts"; - "inspection-proxy" = dontDistribute super."inspection-proxy"; - "instance-control" = dontDistribute super."instance-control"; - "instant-aeson" = dontDistribute super."instant-aeson"; - "instant-bytes" = dontDistribute super."instant-bytes"; - "instant-deepseq" = dontDistribute super."instant-deepseq"; - "instant-generics" = dontDistribute super."instant-generics"; - "instant-hashable" = dontDistribute super."instant-hashable"; - "instant-zipper" = dontDistribute super."instant-zipper"; - "instinct" = dontDistribute super."instinct"; - "instrument-chord" = dontDistribute super."instrument-chord"; - "int-cast" = dontDistribute super."int-cast"; - "integer-pure" = dontDistribute super."integer-pure"; - "integer-simple" = dontDistribute super."integer-simple"; - "intel-aes" = dontDistribute super."intel-aes"; - "interchangeable" = dontDistribute super."interchangeable"; - "interleavableGen" = dontDistribute super."interleavableGen"; - "interleavableIO" = dontDistribute super."interleavableIO"; - "interleave" = dontDistribute super."interleave"; - "interlude" = dontDistribute super."interlude"; - "interlude-l" = dontDistribute super."interlude-l"; - "intern" = dontDistribute super."intern"; - "internetmarke" = dontDistribute super."internetmarke"; - "intero" = dontDistribute super."intero"; - "interpol" = dontDistribute super."interpol"; - "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; - "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; - "interpolation" = dontDistribute super."interpolation"; - "interruptible" = dontDistribute super."interruptible"; - "interspersed" = dontDistribute super."interspersed"; - "interval" = dontDistribute super."interval"; - "intricacy" = dontDistribute super."intricacy"; - "intset" = dontDistribute super."intset"; - "invariant" = doDistribute super."invariant_0_3_1"; - "invertible" = dontDistribute super."invertible"; - "invertible-syntax" = dontDistribute super."invertible-syntax"; - "io-capture" = dontDistribute super."io-capture"; - "io-reactive" = dontDistribute super."io-reactive"; - "io-streams-haproxy" = dontDistribute super."io-streams-haproxy"; - "io-streams-http" = dontDistribute super."io-streams-http"; - "io-throttle" = dontDistribute super."io-throttle"; - "ioctl" = dontDistribute super."ioctl"; - "ioref-stable" = dontDistribute super."ioref-stable"; - "iothread" = dontDistribute super."iothread"; - "iotransaction" = dontDistribute super."iotransaction"; - "ip" = dontDistribute super."ip"; - "ip-quoter" = dontDistribute super."ip-quoter"; - "ipatch" = dontDistribute super."ipatch"; - "ipc" = dontDistribute super."ipc"; - "ipcvar" = dontDistribute super."ipcvar"; - "ipopt-hs" = dontDistribute super."ipopt-hs"; - "ipprint" = dontDistribute super."ipprint"; - "iptables-helpers" = dontDistribute super."iptables-helpers"; - "iptadmin" = dontDistribute super."iptadmin"; - "irc-bytestring" = dontDistribute super."irc-bytestring"; - "irc-client" = doDistribute super."irc-client_0_3_0_0"; - "irc-colors" = dontDistribute super."irc-colors"; - "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0"; - "irc-core" = dontDistribute super."irc-core"; - "irc-dcc" = doDistribute super."irc-dcc_1_2_1"; - "irc-fun-bot" = dontDistribute super."irc-fun-bot"; - "irc-fun-client" = dontDistribute super."irc-fun-client"; - "irc-fun-color" = dontDistribute super."irc-fun-color"; - "irc-fun-messages" = dontDistribute super."irc-fun-messages"; - "irc-fun-types" = dontDistribute super."irc-fun-types"; - "ircbot" = dontDistribute super."ircbot"; - "ircbouncer" = dontDistribute super."ircbouncer"; - "ireal" = dontDistribute super."ireal"; - "iridium" = dontDistribute super."iridium"; - "iron-mq" = dontDistribute super."iron-mq"; - "ironforge" = dontDistribute super."ironforge"; - "is" = dontDistribute super."is"; - "isdicom" = dontDistribute super."isdicom"; - "isevaluated" = dontDistribute super."isevaluated"; - "isiz" = dontDistribute super."isiz"; - "ismtp" = dontDistribute super."ismtp"; - "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; - "isobmff-builder" = dontDistribute super."isobmff-builder"; - "isohunt" = dontDistribute super."isohunt"; - "isotope" = dontDistribute super."isotope"; - "ispositive" = dontDistribute super."ispositive"; - "itanium-abi" = dontDistribute super."itanium-abi"; - "iter-stats" = dontDistribute super."iter-stats"; - "iterIO" = dontDistribute super."iterIO"; - "iteratee" = dontDistribute super."iteratee"; - "iteratee-compress" = dontDistribute super."iteratee-compress"; - "iteratee-mtl" = dontDistribute super."iteratee-mtl"; - "iteratee-parsec" = dontDistribute super."iteratee-parsec"; - "iteratee-stm" = dontDistribute super."iteratee-stm"; - "iterio-server" = dontDistribute super."iterio-server"; - "ivar-simple" = dontDistribute super."ivar-simple"; - "ivor" = dontDistribute super."ivor"; - "ivory" = dontDistribute super."ivory"; - "ivory-artifact" = dontDistribute super."ivory-artifact"; - "ivory-backend-c" = dontDistribute super."ivory-backend-c"; - "ivory-bitdata" = dontDistribute super."ivory-bitdata"; - "ivory-eval" = dontDistribute super."ivory-eval"; - "ivory-examples" = dontDistribute super."ivory-examples"; - "ivory-hw" = dontDistribute super."ivory-hw"; - "ivory-opts" = dontDistribute super."ivory-opts"; - "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; - "ivory-serialize" = dontDistribute super."ivory-serialize"; - "ivory-stdlib" = dontDistribute super."ivory-stdlib"; - "ivy-web" = dontDistribute super."ivy-web"; - "ixdopp" = dontDistribute super."ixdopp"; - "ixmonad" = dontDistribute super."ixmonad"; - "iyql" = dontDistribute super."iyql"; - "j2hs" = dontDistribute super."j2hs"; - "ja-base-extra" = dontDistribute super."ja-base-extra"; - "jack" = dontDistribute super."jack"; - "jack-bindings" = dontDistribute super."jack-bindings"; - "jackminimix" = dontDistribute super."jackminimix"; - "jacobi-roots" = dontDistribute super."jacobi-roots"; - "jail" = dontDistribute super."jail"; - "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; - "jalaali" = dontDistribute super."jalaali"; - "jalla" = dontDistribute super."jalla"; - "jammittools" = dontDistribute super."jammittools"; - "jarfind" = dontDistribute super."jarfind"; - "java-bridge" = dontDistribute super."java-bridge"; - "java-bridge-extras" = dontDistribute super."java-bridge-extras"; - "java-character" = dontDistribute super."java-character"; - "java-poker" = dontDistribute super."java-poker"; - "java-reflect" = dontDistribute super."java-reflect"; - "javaclass" = dontDistribute super."javaclass"; - "javasf" = dontDistribute super."javasf"; - "javav" = dontDistribute super."javav"; - "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; - "jdi" = dontDistribute super."jdi"; - "jespresso" = dontDistribute super."jespresso"; - "jobqueue" = dontDistribute super."jobqueue"; - "join" = dontDistribute super."join"; - "joinlist" = dontDistribute super."joinlist"; - "jonathanscard" = dontDistribute super."jonathanscard"; - "jort" = dontDistribute super."jort"; - "jpeg" = dontDistribute super."jpeg"; - "js-good-parts" = dontDistribute super."js-good-parts"; - "js-jquery" = doDistribute super."js-jquery_1_12_4"; - "jsaddle" = doDistribute super."jsaddle_0_3_0_3"; - "jsaddle-dom" = dontDistribute super."jsaddle-dom"; - "jsaddle-hello" = dontDistribute super."jsaddle-hello"; - "jsc" = dontDistribute super."jsc"; - "jsmw" = dontDistribute super."jsmw"; - "json-api" = dontDistribute super."json-api"; - "json-assertions" = dontDistribute super."json-assertions"; - "json-ast" = dontDistribute super."json-ast"; - "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder"; - "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; - "json-b" = dontDistribute super."json-b"; - "json-encoder" = dontDistribute super."json-encoder"; - "json-enumerator" = dontDistribute super."json-enumerator"; - "json-extra" = dontDistribute super."json-extra"; - "json-fu" = dontDistribute super."json-fu"; - "json-incremental-decoder" = dontDistribute super."json-incremental-decoder"; - "json-litobj" = dontDistribute super."json-litobj"; - "json-pointer" = dontDistribute super."json-pointer"; - "json-pointer-aeson" = dontDistribute super."json-pointer-aeson"; - "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; - "json-python" = dontDistribute super."json-python"; - "json-qq" = dontDistribute super."json-qq"; - "json-rpc" = dontDistribute super."json-rpc"; - "json-rpc-client" = dontDistribute super."json-rpc-client"; - "json-rpc-generic" = dontDistribute super."json-rpc-generic"; - "json-rpc-server" = dontDistribute super."json-rpc-server"; - "json-sop" = dontDistribute super."json-sop"; - "json-state" = dontDistribute super."json-state"; - "json-stream" = dontDistribute super."json-stream"; - "json-togo" = dontDistribute super."json-togo"; - "json-tools" = dontDistribute super."json-tools"; - "json-types" = dontDistribute super."json-types"; - "json2" = dontDistribute super."json2"; - "json2-hdbc" = dontDistribute super."json2-hdbc"; - "json2-types" = dontDistribute super."json2-types"; - "json2yaml" = dontDistribute super."json2yaml"; - "jsonresume" = dontDistribute super."jsonresume"; - "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; - "jsonschema-gen" = dontDistribute super."jsonschema-gen"; - "jsonsql" = dontDistribute super."jsonsql"; - "jsontsv" = dontDistribute super."jsontsv"; - "jspath" = dontDistribute super."jspath"; - "juandelacosa" = dontDistribute super."juandelacosa"; - "judy" = dontDistribute super."judy"; - "jukebox" = dontDistribute super."jukebox"; - "jump" = dontDistribute super."jump"; - "jumpthefive" = dontDistribute super."jumpthefive"; - "jupyter" = dontDistribute super."jupyter"; - "jvm-parser" = dontDistribute super."jvm-parser"; - "kademlia" = dontDistribute super."kademlia"; - "kafka-client" = dontDistribute super."kafka-client"; - "kaleidoscope" = dontDistribute super."kaleidoscope"; - "kan-extensions" = doDistribute super."kan-extensions_4_2_3"; - "kangaroo" = dontDistribute super."kangaroo"; - "kansas-lava" = dontDistribute super."kansas-lava"; - "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; - "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; - "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; - "karakuri" = dontDistribute super."karakuri"; - "karver" = dontDistribute super."karver"; - "katip" = doDistribute super."katip_0_2_0_0"; - "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_1_0"; - "katt" = dontDistribute super."katt"; - "kawaii" = dontDistribute super."kawaii"; - "kawhi" = dontDistribute super."kawhi"; - "kazura-queue" = dontDistribute super."kazura-queue"; - "kbq-gu" = dontDistribute super."kbq-gu"; - "kd-tree" = dontDistribute super."kd-tree"; - "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; - "keenser" = dontDistribute super."keenser"; - "keera-callbacks" = dontDistribute super."keera-callbacks"; - "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; - "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; - "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; - "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; - "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; - "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; - "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; - "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; - "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; - "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; - "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; - "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; - "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; - "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; - "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; - "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; - "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; - "keera-posture" = dontDistribute super."keera-posture"; - "keiretsu" = dontDistribute super."keiretsu"; - "keter" = doDistribute super."keter_1_4_3_1"; - "kevin" = dontDistribute super."kevin"; - "keycode" = doDistribute super."keycode_0_2"; - "keyed" = dontDistribute super."keyed"; - "keyring" = dontDistribute super."keyring"; - "keysafe" = dontDistribute super."keysafe"; - "keystore" = dontDistribute super."keystore"; - "keyvaluehash" = dontDistribute super."keyvaluehash"; - "keyword-args" = dontDistribute super."keyword-args"; - "khph" = dontDistribute super."khph"; - "kibro" = dontDistribute super."kibro"; - "kicad-data" = dontDistribute super."kicad-data"; - "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; - "kickchan" = dontDistribute super."kickchan"; - "kif-parser" = dontDistribute super."kif-parser"; - "kinds" = dontDistribute super."kinds"; - "kit" = dontDistribute super."kit"; - "kmeans-par" = dontDistribute super."kmeans-par"; - "kmeans-vector" = dontDistribute super."kmeans-vector"; - "knead" = dontDistribute super."knead"; - "knead-arithmetic" = dontDistribute super."knead-arithmetic"; - "knots" = dontDistribute super."knots"; - "koellner-phonetic" = dontDistribute super."koellner-phonetic"; - "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; - "korfu" = dontDistribute super."korfu"; - "kqueue" = dontDistribute super."kqueue"; - "krpc" = dontDistribute super."krpc"; - "ks-test" = dontDistribute super."ks-test"; - "ktx" = dontDistribute super."ktx"; - "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; - "kyotocabinet" = dontDistribute super."kyotocabinet"; - "l-bfgs-b" = dontDistribute super."l-bfgs-b"; - "labeled-graph" = dontDistribute super."labeled-graph"; - "labeled-tree" = dontDistribute super."labeled-tree"; - "labels" = dontDistribute super."labels"; - "laborantin-hs" = dontDistribute super."laborantin-hs"; - "labyrinth" = dontDistribute super."labyrinth"; - "labyrinth-server" = dontDistribute super."labyrinth-server"; - "lagrangian" = dontDistribute super."lagrangian"; - "laika" = dontDistribute super."laika"; - "lambda-ast" = dontDistribute super."lambda-ast"; - "lambda-bridge" = dontDistribute super."lambda-bridge"; - "lambda-canvas" = dontDistribute super."lambda-canvas"; - "lambda-devs" = dontDistribute super."lambda-devs"; - "lambda-options" = dontDistribute super."lambda-options"; - "lambda-placeholders" = dontDistribute super."lambda-placeholders"; - "lambda-toolbox" = dontDistribute super."lambda-toolbox"; - "lambda2js" = dontDistribute super."lambda2js"; - "lambdaBase" = dontDistribute super."lambdaBase"; - "lambdaFeed" = dontDistribute super."lambdaFeed"; - "lambdaLit" = dontDistribute super."lambdaLit"; - "lambdabot" = dontDistribute super."lambdabot"; - "lambdabot-core" = dontDistribute super."lambdabot-core"; - "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; - "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; - "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; - "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; - "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; - "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; - "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; - "lambdabot-utils" = dontDistribute super."lambdabot-utils"; - "lambdacat" = dontDistribute super."lambdacat"; - "lambdacms-core" = dontDistribute super."lambdacms-core"; - "lambdacms-media" = dontDistribute super."lambdacms-media"; - "lambdacube" = dontDistribute super."lambdacube"; - "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; - "lambdacube-core" = dontDistribute super."lambdacube-core"; - "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; - "lambdacube-engine" = dontDistribute super."lambdacube-engine"; - "lambdacube-examples" = dontDistribute super."lambdacube-examples"; - "lambdacube-samples" = dontDistribute super."lambdacube-samples"; - "lambdatex" = dontDistribute super."lambdatex"; - "lambdatwit" = dontDistribute super."lambdatwit"; - "lambdaya-bus" = dontDistribute super."lambdaya-bus"; - "lambdiff" = dontDistribute super."lambdiff"; - "lame-tester" = dontDistribute super."lame-tester"; - "language-asn1" = dontDistribute super."language-asn1"; - "language-bash" = dontDistribute super."language-bash"; - "language-boogie" = dontDistribute super."language-boogie"; - "language-c-comments" = dontDistribute super."language-c-comments"; - "language-c-inline" = dontDistribute super."language-c-inline"; - "language-c-quote" = doDistribute super."language-c-quote_0_11_6_2"; - "language-cil" = dontDistribute super."language-cil"; - "language-conf" = dontDistribute super."language-conf"; - "language-css" = dontDistribute super."language-css"; - "language-dart" = dontDistribute super."language-dart"; - "language-dockerfile" = dontDistribute super."language-dockerfile"; - "language-dot" = dontDistribute super."language-dot"; - "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; - "language-eiffel" = dontDistribute super."language-eiffel"; - "language-fortran" = dontDistribute super."language-fortran"; - "language-gcl" = dontDistribute super."language-gcl"; - "language-go" = dontDistribute super."language-go"; - "language-guess" = dontDistribute super."language-guess"; - "language-hcl" = dontDistribute super."language-hcl"; - "language-java-classfile" = dontDistribute super."language-java-classfile"; - "language-kort" = dontDistribute super."language-kort"; - "language-lua" = dontDistribute super."language-lua"; - "language-lua-qq" = dontDistribute super."language-lua-qq"; - "language-mixal" = dontDistribute super."language-mixal"; - "language-objc" = dontDistribute super."language-objc"; - "language-openscad" = dontDistribute super."language-openscad"; - "language-pig" = dontDistribute super."language-pig"; - "language-puppet" = dontDistribute super."language-puppet"; - "language-python" = dontDistribute super."language-python"; - "language-python-colour" = dontDistribute super."language-python-colour"; - "language-python-test" = dontDistribute super."language-python-test"; - "language-qux" = dontDistribute super."language-qux"; - "language-sh" = dontDistribute super."language-sh"; - "language-slice" = dontDistribute super."language-slice"; - "language-spelling" = dontDistribute super."language-spelling"; - "language-sqlite" = dontDistribute super."language-sqlite"; - "language-thrift" = doDistribute super."language-thrift_0_8_0_1"; - "language-typescript" = dontDistribute super."language-typescript"; - "language-vhdl" = dontDistribute super."language-vhdl"; - "language-webidl" = dontDistribute super."language-webidl"; - "large-hashable" = dontDistribute super."large-hashable"; - "lat" = dontDistribute super."lat"; - "latest-npm-version" = dontDistribute super."latest-npm-version"; - "latex" = dontDistribute super."latex"; - "launchpad-control" = dontDistribute super."launchpad-control"; - "lax" = dontDistribute super."lax"; - "layers" = dontDistribute super."layers"; - "layers-game" = dontDistribute super."layers-game"; - "layout" = dontDistribute super."layout"; - "layout-bootstrap" = dontDistribute super."layout-bootstrap"; - "lazy-io" = dontDistribute super."lazy-io"; - "lazy-search" = dontDistribute super."lazy-search"; - "lazyarray" = dontDistribute super."lazyarray"; - "lazyio" = dontDistribute super."lazyio"; - "lazysmallcheck" = dontDistribute super."lazysmallcheck"; - "lazysplines" = dontDistribute super."lazysplines"; - "lbfgs" = dontDistribute super."lbfgs"; - "lcs" = dontDistribute super."lcs"; - "ld-intervals" = dontDistribute super."ld-intervals"; - "lda" = dontDistribute super."lda"; - "ldap-client" = dontDistribute super."ldap-client"; - "ldif" = dontDistribute super."ldif"; - "leaf" = dontDistribute super."leaf"; - "leaky" = dontDistribute super."leaky"; - "leancheck" = dontDistribute super."leancheck"; - "leankit-api" = dontDistribute super."leankit-api"; - "leapseconds-announced" = dontDistribute super."leapseconds-announced"; - "learn" = dontDistribute super."learn"; - "learn-physics" = dontDistribute super."learn-physics"; - "learn-physics-examples" = dontDistribute super."learn-physics-examples"; - "learning-hmm" = dontDistribute super."learning-hmm"; - "leetify" = dontDistribute super."leetify"; - "legion" = dontDistribute super."legion"; - "leksah" = dontDistribute super."leksah"; - "lendingclub" = dontDistribute super."lendingclub"; - "lens" = doDistribute super."lens_4_13"; - "lens-family-th" = doDistribute super."lens-family-th_0_4_1_0"; - "lens-prelude" = dontDistribute super."lens-prelude"; - "lens-properties" = dontDistribute super."lens-properties"; - "lens-sop" = dontDistribute super."lens-sop"; - "lens-text-encoding" = dontDistribute super."lens-text-encoding"; - "lens-time" = dontDistribute super."lens-time"; - "lens-tutorial" = dontDistribute super."lens-tutorial"; - "lens-utils" = dontDistribute super."lens-utils"; - "lenses" = dontDistribute super."lenses"; - "lensref" = dontDistribute super."lensref"; - "lentil" = doDistribute super."lentil_0_1_12_0"; - "lenz" = dontDistribute super."lenz"; - "lenz-template" = dontDistribute super."lenz-template"; - "level-monad" = dontDistribute super."level-monad"; - "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; - "levmar" = dontDistribute super."levmar"; - "levmar-chart" = dontDistribute super."levmar-chart"; - "lfst" = dontDistribute super."lfst"; - "lgtk" = dontDistribute super."lgtk"; - "lha" = dontDistribute super."lha"; - "lhae" = dontDistribute super."lhae"; - "lhc" = dontDistribute super."lhc"; - "lhe" = dontDistribute super."lhe"; - "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; - "lhs2html" = dontDistribute super."lhs2html"; - "lhslatex" = dontDistribute super."lhslatex"; - "libGenI" = dontDistribute super."libGenI"; - "libarchive-conduit" = dontDistribute super."libarchive-conduit"; - "libconfig" = dontDistribute super."libconfig"; - "libcspm" = dontDistribute super."libcspm"; - "libexpect" = dontDistribute super."libexpect"; - "libffi" = dontDistribute super."libffi"; - "libgraph" = dontDistribute super."libgraph"; - "libhbb" = dontDistribute super."libhbb"; - "libjenkins" = dontDistribute super."libjenkins"; - "liblastfm" = dontDistribute super."liblastfm"; - "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; - "libltdl" = dontDistribute super."libltdl"; - "libmpd" = dontDistribute super."libmpd"; - "libnotify" = doDistribute super."libnotify_0_1_1_0"; - "libnvvm" = dontDistribute super."libnvvm"; - "liboleg" = dontDistribute super."liboleg"; - "libpafe" = dontDistribute super."libpafe"; - "libpq" = dontDistribute super."libpq"; - "librandomorg" = dontDistribute super."librandomorg"; - "libravatar" = dontDistribute super."libravatar"; - "libroman" = dontDistribute super."libroman"; - "libssh2" = dontDistribute super."libssh2"; - "libssh2-conduit" = dontDistribute super."libssh2-conduit"; - "libstackexchange" = dontDistribute super."libstackexchange"; - "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; - "libtagc" = dontDistribute super."libtagc"; - "libvirt-hs" = dontDistribute super."libvirt-hs"; - "libvorbis" = dontDistribute super."libvorbis"; - "libxls" = dontDistribute super."libxls"; - "libxml" = dontDistribute super."libxml"; - "libxml-enumerator" = dontDistribute super."libxml-enumerator"; - "libxslt" = dontDistribute super."libxslt"; - "libzfs" = dontDistribute super."libzfs"; - "licensor" = dontDistribute super."licensor"; - "life" = dontDistribute super."life"; - "lifted-protolude" = dontDistribute super."lifted-protolude"; - "lifted-threads" = dontDistribute super."lifted-threads"; - "lifter" = dontDistribute super."lifter"; - "ligature" = dontDistribute super."ligature"; - "ligd" = dontDistribute super."ligd"; - "lighttpd-conf" = dontDistribute super."lighttpd-conf"; - "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; - "lilypond" = dontDistribute super."lilypond"; - "limp" = dontDistribute super."limp"; - "limp-cbc" = dontDistribute super."limp-cbc"; - "lin-alg" = dontDistribute super."lin-alg"; - "linda" = dontDistribute super."linda"; - "lindenmayer" = dontDistribute super."lindenmayer"; - "line-break" = dontDistribute super."line-break"; - "line2pdf" = dontDistribute super."line2pdf"; - "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; - "linear-circuit" = dontDistribute super."linear-circuit"; - "linear-grammar" = dontDistribute super."linear-grammar"; - "linear-maps" = dontDistribute super."linear-maps"; - "linear-opengl" = dontDistribute super."linear-opengl"; - "linear-vect" = dontDistribute super."linear-vect"; - "linearEqSolver" = dontDistribute super."linearEqSolver"; - "linearscan" = dontDistribute super."linearscan"; - "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; - "linebreak" = dontDistribute super."linebreak"; - "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; - "link-relations" = dontDistribute super."link-relations"; - "linkchk" = dontDistribute super."linkchk"; - "linkcore" = dontDistribute super."linkcore"; - "linkedhashmap" = dontDistribute super."linkedhashmap"; - "linklater" = dontDistribute super."linklater"; - "linode" = dontDistribute super."linode"; - "linode-v4" = dontDistribute super."linode-v4"; - "linux-blkid" = dontDistribute super."linux-blkid"; - "linux-cgroup" = dontDistribute super."linux-cgroup"; - "linux-evdev" = dontDistribute super."linux-evdev"; - "linux-inotify" = dontDistribute super."linux-inotify"; - "linux-kmod" = dontDistribute super."linux-kmod"; - "linux-mount" = dontDistribute super."linux-mount"; - "linux-perf" = dontDistribute super."linux-perf"; - "linux-ptrace" = dontDistribute super."linux-ptrace"; - "linux-xattr" = dontDistribute super."linux-xattr"; - "linx-gateway" = dontDistribute super."linx-gateway"; - "lio" = dontDistribute super."lio"; - "lio-eci11" = dontDistribute super."lio-eci11"; - "lio-fs" = dontDistribute super."lio-fs"; - "lio-simple" = dontDistribute super."lio-simple"; - "lipsum-gen" = dontDistribute super."lipsum-gen"; - "liquid" = dontDistribute super."liquid"; - "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; - "liquidhaskell" = dontDistribute super."liquidhaskell"; - "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal"; - "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo"; - "lispparser" = dontDistribute super."lispparser"; - "list-extras" = dontDistribute super."list-extras"; - "list-grouping" = dontDistribute super."list-grouping"; - "list-mux" = dontDistribute super."list-mux"; - "list-remote-forwards" = dontDistribute super."list-remote-forwards"; - "list-t" = doDistribute super."list-t_0_4_7"; - "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; - "list-t-html-parser" = dontDistribute super."list-t-html-parser"; - "list-t-http-client" = dontDistribute super."list-t-http-client"; - "list-t-libcurl" = dontDistribute super."list-t-libcurl"; - "list-t-text" = dontDistribute super."list-t-text"; - "list-transformer" = dontDistribute super."list-transformer"; - "list-tries" = dontDistribute super."list-tries"; - "list-zip-def" = dontDistribute super."list-zip-def"; - "listlike-instances" = dontDistribute super."listlike-instances"; - "lists" = dontDistribute super."lists"; - "listsafe" = dontDistribute super."listsafe"; - "lit" = dontDistribute super."lit"; - "literals" = dontDistribute super."literals"; - "live-sequencer" = dontDistribute super."live-sequencer"; - "ll-picosat" = dontDistribute super."ll-picosat"; - "llrbtree" = dontDistribute super."llrbtree"; - "llsd" = dontDistribute super."llsd"; - "llvm" = dontDistribute super."llvm"; - "llvm-analysis" = dontDistribute super."llvm-analysis"; - "llvm-base" = dontDistribute super."llvm-base"; - "llvm-base-types" = dontDistribute super."llvm-base-types"; - "llvm-base-util" = dontDistribute super."llvm-base-util"; - "llvm-data-interop" = dontDistribute super."llvm-data-interop"; - "llvm-extra" = dontDistribute super."llvm-extra"; - "llvm-ffi" = dontDistribute super."llvm-ffi"; - "llvm-ffi-tools" = dontDistribute super."llvm-ffi-tools"; - "llvm-general" = dontDistribute super."llvm-general"; - "llvm-general-pure" = dontDistribute super."llvm-general-pure"; - "llvm-general-quote" = dontDistribute super."llvm-general-quote"; - "llvm-ht" = dontDistribute super."llvm-ht"; - "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; - "llvm-pretty" = dontDistribute super."llvm-pretty"; - "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; - "llvm-tf" = dontDistribute super."llvm-tf"; - "llvm-tools" = dontDistribute super."llvm-tools"; - "lmdb" = dontDistribute super."lmdb"; - "lmonad" = dontDistribute super."lmonad"; - "lmonad-yesod" = dontDistribute super."lmonad-yesod"; - "loadavg" = dontDistribute super."loadavg"; - "local-address" = dontDistribute super."local-address"; - "local-search" = dontDistribute super."local-search"; - "located" = dontDistribute super."located"; - "located-base" = dontDistribute super."located-base"; - "located-monad-logger" = dontDistribute super."located-monad-logger"; - "locators" = dontDistribute super."locators"; - "loch" = dontDistribute super."loch"; - "lock-file" = dontDistribute super."lock-file"; - "locked-poll" = dontDistribute super."locked-poll"; - "lockfree-queue" = dontDistribute super."lockfree-queue"; - "log" = dontDistribute super."log"; - "log-effect" = dontDistribute super."log-effect"; - "log2json" = dontDistribute super."log2json"; - "logentries" = dontDistribute super."logentries"; - "logger" = dontDistribute super."logger"; - "logging" = dontDistribute super."logging"; - "logging-effect" = dontDistribute super."logging-effect"; - "logging-facade-journald" = dontDistribute super."logging-facade-journald"; - "logic-TPTP" = dontDistribute super."logic-TPTP"; - "logic-classes" = dontDistribute super."logic-classes"; - "logicst" = dontDistribute super."logicst"; - "logict-state" = dontDistribute super."logict-state"; - "logplex-parse" = dontDistribute super."logplex-parse"; - "logsink" = dontDistribute super."logsink"; - "lojban" = dontDistribute super."lojban"; - "lojbanParser" = dontDistribute super."lojbanParser"; - "lojbanXiragan" = dontDistribute super."lojbanXiragan"; - "lojysamban" = dontDistribute super."lojysamban"; - "lol" = dontDistribute super."lol"; - "lol-apps" = dontDistribute super."lol-apps"; - "lol-calculus" = dontDistribute super."lol-calculus"; - "lol-typing" = dontDistribute super."lol-typing"; - "loli" = dontDistribute super."loli"; - "lookup-tables" = dontDistribute super."lookup-tables"; - "loop-effin" = dontDistribute super."loop-effin"; - "loop-while" = dontDistribute super."loop-while"; - "loops" = dontDistribute super."loops"; - "loopy" = dontDistribute super."loopy"; - "lord" = dontDistribute super."lord"; - "lorem" = dontDistribute super."lorem"; - "loris" = dontDistribute super."loris"; - "loshadka" = dontDistribute super."loshadka"; - "lostcities" = dontDistribute super."lostcities"; - "lowgl" = dontDistribute super."lowgl"; - "lp-diagrams" = dontDistribute super."lp-diagrams"; - "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; - "lrucaching" = dontDistribute super."lrucaching"; - "ls-usb" = dontDistribute super."ls-usb"; - "lscabal" = dontDistribute super."lscabal"; - "lss" = dontDistribute super."lss"; - "lsystem" = dontDistribute super."lsystem"; - "ltext" = doDistribute super."ltext_0_0_2_1"; - "ltiv1p1" = dontDistribute super."ltiv1p1"; - "ltl" = dontDistribute super."ltl"; - "lua-bc" = dontDistribute super."lua-bc"; - "lua-bytecode" = dontDistribute super."lua-bytecode"; - "luachunk" = dontDistribute super."luachunk"; - "luautils" = dontDistribute super."luautils"; - "lub" = dontDistribute super."lub"; - "lucid" = doDistribute super."lucid_2_9_5"; - "lucid-foundation" = dontDistribute super."lucid-foundation"; - "lucid-svg" = doDistribute super."lucid-svg_0_6_0_1"; - "lucienne" = dontDistribute super."lucienne"; - "luhn" = dontDistribute super."luhn"; - "lui" = dontDistribute super."lui"; - "luis-client" = dontDistribute super."luis-client"; - "luka" = dontDistribute super."luka"; - "luminance" = doDistribute super."luminance_0_11_0_2"; - "lushtags" = dontDistribute super."lushtags"; - "luthor" = dontDistribute super."luthor"; - "lvish" = dontDistribute super."lvish"; - "lvmlib" = dontDistribute super."lvmlib"; - "lvmrun" = dontDistribute super."lvmrun"; - "lxc" = dontDistribute super."lxc"; - "lye" = dontDistribute super."lye"; - "lz4" = dontDistribute super."lz4"; - "lzma" = dontDistribute super."lzma"; - "lzma-clib" = dontDistribute super."lzma-clib"; - "lzma-enumerator" = dontDistribute super."lzma-enumerator"; - "lzma-streams" = dontDistribute super."lzma-streams"; - "maam" = dontDistribute super."maam"; - "mac" = dontDistribute super."mac"; - "macbeth-lib" = dontDistribute super."macbeth-lib"; - "maccatcher" = dontDistribute super."maccatcher"; - "machinecell" = dontDistribute super."machinecell"; - "machines" = doDistribute super."machines_0_5_1"; - "machines-zlib" = dontDistribute super."machines-zlib"; - "macho" = dontDistribute super."macho"; - "maclight" = dontDistribute super."maclight"; - "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; - "mage" = dontDistribute super."mage"; - "magico" = dontDistribute super."magico"; - "magma" = dontDistribute super."magma"; - "mahoro" = dontDistribute super."mahoro"; - "maid" = dontDistribute super."maid"; - "mailbox-count" = dontDistribute super."mailbox-count"; - "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; - "mailgun" = dontDistribute super."mailgun"; - "majordomo" = dontDistribute super."majordomo"; - "majority" = dontDistribute super."majority"; - "make-hard-links" = dontDistribute super."make-hard-links"; - "make-package" = dontDistribute super."make-package"; - "makedo" = dontDistribute super."makedo"; - "makefile" = dontDistribute super."makefile"; - "manatee" = dontDistribute super."manatee"; - "manatee-all" = dontDistribute super."manatee-all"; - "manatee-anything" = dontDistribute super."manatee-anything"; - "manatee-browser" = dontDistribute super."manatee-browser"; - "manatee-core" = dontDistribute super."manatee-core"; - "manatee-curl" = dontDistribute super."manatee-curl"; - "manatee-editor" = dontDistribute super."manatee-editor"; - "manatee-filemanager" = dontDistribute super."manatee-filemanager"; - "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; - "manatee-ircclient" = dontDistribute super."manatee-ircclient"; - "manatee-mplayer" = dontDistribute super."manatee-mplayer"; - "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; - "manatee-processmanager" = dontDistribute super."manatee-processmanager"; - "manatee-reader" = dontDistribute super."manatee-reader"; - "manatee-template" = dontDistribute super."manatee-template"; - "manatee-terminal" = dontDistribute super."manatee-terminal"; - "manatee-welcome" = dontDistribute super."manatee-welcome"; - "mancala" = dontDistribute super."mancala"; - "mandrill" = doDistribute super."mandrill_0_5_2_2"; - "mandulia" = dontDistribute super."mandulia"; - "mangopay" = dontDistribute super."mangopay"; - "manifold-random" = dontDistribute super."manifold-random"; - "manifolds" = dontDistribute super."manifolds"; - "map-exts" = dontDistribute super."map-exts"; - "map-syntax" = doDistribute super."map-syntax_0_2"; - "mappy" = dontDistribute super."mappy"; - "marionetta" = dontDistribute super."marionetta"; - "markdown-kate" = dontDistribute super."markdown-kate"; - "markdown-pap" = dontDistribute super."markdown-pap"; - "markdown2svg" = dontDistribute super."markdown2svg"; - "marked-pretty" = dontDistribute super."marked-pretty"; - "markov" = dontDistribute super."markov"; - "markov-chain" = dontDistribute super."markov-chain"; - "markov-processes" = dontDistribute super."markov-processes"; - "markup-preview" = dontDistribute super."markup-preview"; - "marmalade-upload" = dontDistribute super."marmalade-upload"; - "marquise" = dontDistribute super."marquise"; - "mars" = dontDistribute super."mars"; - "marxup" = dontDistribute super."marxup"; - "masakazu-bot" = dontDistribute super."masakazu-bot"; - "mastermind" = dontDistribute super."mastermind"; - "matcher" = dontDistribute super."matcher"; - "matchers" = dontDistribute super."matchers"; - "math-functions" = doDistribute super."math-functions_0_1_7_0"; - "mathblog" = dontDistribute super."mathblog"; - "mathgenealogy" = dontDistribute super."mathgenealogy"; - "mathista" = dontDistribute super."mathista"; - "mathlink" = dontDistribute super."mathlink"; - "matlab" = dontDistribute super."matlab"; - "matrix-market" = dontDistribute super."matrix-market"; - "matrix-market-pure" = dontDistribute super."matrix-market-pure"; - "matsuri" = dontDistribute super."matsuri"; - "maude" = dontDistribute super."maude"; - "maxent" = dontDistribute super."maxent"; - "maxsharing" = dontDistribute super."maxsharing"; - "maybe-justify" = dontDistribute super."maybe-justify"; - "maybench" = dontDistribute super."maybench"; - "mbox-tools" = dontDistribute super."mbox-tools"; - "mcm" = dontDistribute super."mcm"; - "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; - "mcmc-samplers" = dontDistribute super."mcmc-samplers"; - "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; - "mcpi" = dontDistribute super."mcpi"; - "mdapi" = dontDistribute super."mdapi"; - "mdcat" = dontDistribute super."mdcat"; - "mdo" = dontDistribute super."mdo"; - "mdp" = dontDistribute super."mdp"; - "means" = dontDistribute super."means"; - "mecab" = dontDistribute super."mecab"; - "mech" = dontDistribute super."mech"; - "mecha" = dontDistribute super."mecha"; - "mechs" = dontDistribute super."mechs"; - "mediawiki" = dontDistribute super."mediawiki"; - "mediawiki2latex" = dontDistribute super."mediawiki2latex"; - "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; - "meep" = dontDistribute super."meep"; - "mega-sdist" = dontDistribute super."mega-sdist"; - "megaparsec" = doDistribute super."megaparsec_4_4_0"; - "meldable-heap" = dontDistribute super."meldable-heap"; - "mellon-core" = dontDistribute super."mellon-core"; - "mellon-gpio" = dontDistribute super."mellon-gpio"; - "mellon-web" = dontDistribute super."mellon-web"; - "melody" = dontDistribute super."melody"; - "memcache" = dontDistribute super."memcache"; - "memcache-conduit" = dontDistribute super."memcache-conduit"; - "memcache-haskell" = dontDistribute super."memcache-haskell"; - "memcached" = dontDistribute super."memcached"; - "memexml" = dontDistribute super."memexml"; - "memo-ptr" = dontDistribute super."memo-ptr"; - "memo-sqlite" = dontDistribute super."memo-sqlite"; - "memoize" = doDistribute super."memoize_0_7"; - "memorypool" = dontDistribute super."memorypool"; - "memscript" = dontDistribute super."memscript"; - "merge-bash-history" = dontDistribute super."merge-bash-history"; - "mersenne-random" = dontDistribute super."mersenne-random"; - "messagepack" = doDistribute super."messagepack_0_5_1"; - "messente" = dontDistribute super."messente"; - "meta-misc" = dontDistribute super."meta-misc"; - "meta-par" = dontDistribute super."meta-par"; - "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; - "metadata" = dontDistribute super."metadata"; - "metamorphic" = dontDistribute super."metamorphic"; - "metaplug" = dontDistribute super."metaplug"; - "metric" = dontDistribute super."metric"; - "metricsd-client" = dontDistribute super."metricsd-client"; - "metronome" = dontDistribute super."metronome"; - "mezzolens" = dontDistribute super."mezzolens"; - "mfsolve" = dontDistribute super."mfsolve"; - "mgeneric" = dontDistribute super."mgeneric"; - "mi" = dontDistribute super."mi"; - "microbench" = dontDistribute super."microbench"; - "microformats2-types" = dontDistribute super."microformats2-types"; - "microlens" = doDistribute super."microlens_0_4_5_0"; - "microlens-aeson" = doDistribute super."microlens-aeson_2_1_1"; - "microlens-each" = dontDistribute super."microlens-each"; - "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; - "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0"; - "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; - "microlens-th" = doDistribute super."microlens-th_0_4_0_0"; - "micrologger" = dontDistribute super."micrologger"; - "microspec" = dontDistribute super."microspec"; - "microtimer" = dontDistribute super."microtimer"; - "mida" = dontDistribute super."mida"; - "midi" = dontDistribute super."midi"; - "midi-alsa" = dontDistribute super."midi-alsa"; - "midi-music-box" = dontDistribute super."midi-music-box"; - "midi-util" = dontDistribute super."midi-util"; - "midi-utils" = dontDistribute super."midi-utils"; - "midimory" = dontDistribute super."midimory"; - "midisurface" = dontDistribute super."midisurface"; - "mighttpd" = dontDistribute super."mighttpd"; - "mighttpd2" = dontDistribute super."mighttpd2"; - "mikmod" = dontDistribute super."mikmod"; - "miku" = dontDistribute super."miku"; - "milena" = dontDistribute super."milena"; - "mime" = dontDistribute super."mime"; - "mime-directory" = dontDistribute super."mime-directory"; - "mime-string" = dontDistribute super."mime-string"; - "minecraft-data" = dontDistribute super."minecraft-data"; - "mines" = dontDistribute super."mines"; - "minesweeper" = dontDistribute super."minesweeper"; - "miniball" = dontDistribute super."miniball"; - "miniforth" = dontDistribute super."miniforth"; - "minilens" = dontDistribute super."minilens"; - "minimal-configuration" = dontDistribute super."minimal-configuration"; - "minimorph" = dontDistribute super."minimorph"; - "minimung" = dontDistribute super."minimung"; - "minions" = dontDistribute super."minions"; - "minioperational" = dontDistribute super."minioperational"; - "miniplex" = dontDistribute super."miniplex"; - "minirotate" = dontDistribute super."minirotate"; - "minisat" = dontDistribute super."minisat"; - "ministg" = dontDistribute super."ministg"; - "miniutter" = dontDistribute super."miniutter"; - "minlen" = dontDistribute super."minlen"; - "minst-idx" = dontDistribute super."minst-idx"; - "mios" = dontDistribute super."mios"; - "mirror-tweet" = dontDistribute super."mirror-tweet"; - "missing-py2" = dontDistribute super."missing-py2"; - "mix-arrows" = dontDistribute super."mix-arrows"; - "mixed-strategies" = dontDistribute super."mixed-strategies"; - "mkbndl" = dontDistribute super."mkbndl"; - "mkcabal" = dontDistribute super."mkcabal"; - "ml-w" = dontDistribute super."ml-w"; - "mlist" = dontDistribute super."mlist"; - "mmtl" = dontDistribute super."mmtl"; - "mmtl-base" = dontDistribute super."mmtl-base"; - "mnist-idx" = dontDistribute super."mnist-idx"; - "moan" = dontDistribute super."moan"; - "modbus-tcp" = dontDistribute super."modbus-tcp"; - "modelicaparser" = dontDistribute super."modelicaparser"; - "modsplit" = dontDistribute super."modsplit"; - "modular-arithmetic" = dontDistribute super."modular-arithmetic"; - "modular-prelude" = dontDistribute super."modular-prelude"; - "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; - "module-management" = dontDistribute super."module-management"; - "modulespection" = dontDistribute super."modulespection"; - "modulo" = dontDistribute super."modulo"; - "moe" = dontDistribute super."moe"; - "mohws" = dontDistribute super."mohws"; - "mollie-api-haskell" = dontDistribute super."mollie-api-haskell"; - "monad-abort-fd" = dontDistribute super."monad-abort-fd"; - "monad-atom" = dontDistribute super."monad-atom"; - "monad-atom-simple" = dontDistribute super."monad-atom-simple"; - "monad-bool" = dontDistribute super."monad-bool"; - "monad-classes" = dontDistribute super."monad-classes"; - "monad-codec" = dontDistribute super."monad-codec"; - "monad-connect" = dontDistribute super."monad-connect"; - "monad-dijkstra" = dontDistribute super."monad-dijkstra"; - "monad-exception" = dontDistribute super."monad-exception"; - "monad-fork" = dontDistribute super."monad-fork"; - "monad-gen" = dontDistribute super."monad-gen"; - "monad-hash" = dontDistribute super."monad-hash"; - "monad-interleave" = dontDistribute super."monad-interleave"; - "monad-levels" = dontDistribute super."monad-levels"; - "monad-lgbt" = dontDistribute super."monad-lgbt"; - "monad-log" = dontDistribute super."monad-log"; - "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; - "monad-loops-stm" = dontDistribute super."monad-loops-stm"; - "monad-lrs" = dontDistribute super."monad-lrs"; - "monad-memo" = dontDistribute super."monad-memo"; - "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; - "monad-open" = dontDistribute super."monad-open"; - "monad-ox" = dontDistribute super."monad-ox"; - "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; - "monad-param" = dontDistribute super."monad-param"; - "monad-ran" = dontDistribute super."monad-ran"; - "monad-resumption" = dontDistribute super."monad-resumption"; - "monad-state" = dontDistribute super."monad-state"; - "monad-statevar" = dontDistribute super."monad-statevar"; - "monad-ste" = dontDistribute super."monad-ste"; - "monad-stlike-io" = dontDistribute super."monad-stlike-io"; - "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; - "monad-stm" = dontDistribute super."monad-stm"; - "monad-supply" = dontDistribute super."monad-supply"; - "monad-task" = dontDistribute super."monad-task"; - "monad-timing" = dontDistribute super."monad-timing"; - "monad-tx" = dontDistribute super."monad-tx"; - "monad-unify" = dontDistribute super."monad-unify"; - "monad-wrap" = dontDistribute super."monad-wrap"; - "monadIO" = dontDistribute super."monadIO"; - "monadLib-compose" = dontDistribute super."monadLib-compose"; - "monadacme" = dontDistribute super."monadacme"; - "monadbi" = dontDistribute super."monadbi"; - "monadfibre" = dontDistribute super."monadfibre"; - "monadiccp" = dontDistribute super."monadiccp"; - "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; - "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; - "monadlist" = dontDistribute super."monadlist"; - "monadloc-pp" = dontDistribute super."monadloc-pp"; - "monads-fd" = dontDistribute super."monads-fd"; - "monadtransform" = dontDistribute super."monadtransform"; - "monarch" = dontDistribute super."monarch"; - "mondo" = dontDistribute super."mondo"; - "mongoDB" = doDistribute super."mongoDB_2_0_10"; - "mongodb-queue" = dontDistribute super."mongodb-queue"; - "mongrel2-handler" = dontDistribute super."mongrel2-handler"; - "monitor" = dontDistribute super."monitor"; - "monky" = dontDistribute super."monky"; - "mono-foldable" = dontDistribute super."mono-foldable"; - "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; - "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; - "monoid-absorbing" = dontDistribute super."monoid-absorbing"; - "monoid-owns" = dontDistribute super."monoid-owns"; - "monoid-record" = dontDistribute super."monoid-record"; - "monoid-statistics" = dontDistribute super."monoid-statistics"; - "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_2"; - "monoid-transformer" = dontDistribute super."monoid-transformer"; - "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_5"; - "monoidplus" = dontDistribute super."monoidplus"; - "monoids" = dontDistribute super."monoids"; - "monomorphic" = dontDistribute super."monomorphic"; - "montage" = dontDistribute super."montage"; - "montage-client" = dontDistribute super."montage-client"; - "monte-carlo" = dontDistribute super."monte-carlo"; - "monzo" = dontDistribute super."monzo"; - "moo" = dontDistribute super."moo"; - "moonshine" = dontDistribute super."moonshine"; - "morfette" = dontDistribute super."morfette"; - "morfeusz" = dontDistribute super."morfeusz"; - "morph" = dontDistribute super."morph"; - "morte" = doDistribute super."morte_1_6_1"; - "mosaico-lib" = dontDistribute super."mosaico-lib"; - "mount" = dontDistribute super."mount"; - "mp" = dontDistribute super."mp"; - "mp3decoder" = dontDistribute super."mp3decoder"; - "mpdmate" = dontDistribute super."mpdmate"; - "mpppc" = dontDistribute super."mpppc"; - "mpretty" = dontDistribute super."mpretty"; - "mpris" = dontDistribute super."mpris"; - "mprover" = dontDistribute super."mprover"; - "mps" = dontDistribute super."mps"; - "mpvguihs" = dontDistribute super."mpvguihs"; - "mqtt-hs" = dontDistribute super."mqtt-hs"; - "mrm" = dontDistribute super."mrm"; - "ms" = dontDistribute super."ms"; - "msgpack" = dontDistribute super."msgpack"; - "msgpack-aeson" = dontDistribute super."msgpack-aeson"; - "msgpack-idl" = dontDistribute super."msgpack-idl"; - "msgpack-rpc" = dontDistribute super."msgpack-rpc"; - "msh" = dontDistribute super."msh"; - "msu" = dontDistribute super."msu"; - "mtgoxapi" = dontDistribute super."mtgoxapi"; - "mtl-c" = dontDistribute super."mtl-c"; - "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; - "mtl-extras" = dontDistribute super."mtl-extras"; - "mtl-tf" = dontDistribute super."mtl-tf"; - "mtl-unleashed" = dontDistribute super."mtl-unleashed"; - "mtlparse" = dontDistribute super."mtlparse"; - "mtlx" = dontDistribute super."mtlx"; - "mtp" = dontDistribute super."mtp"; - "mtree" = dontDistribute super."mtree"; - "mucipher" = dontDistribute super."mucipher"; - "mudbath" = dontDistribute super."mudbath"; - "muesli" = dontDistribute super."muesli"; - "mueval" = dontDistribute super."mueval"; - "mulang" = dontDistribute super."mulang"; - "multext-east-msd" = dontDistribute super."multext-east-msd"; - "multi-cabal" = dontDistribute super."multi-cabal"; - "multiaddr" = dontDistribute super."multiaddr"; - "multifocal" = dontDistribute super."multifocal"; - "multihash" = dontDistribute super."multihash"; - "multipart-names" = dontDistribute super."multipart-names"; - "multipass" = dontDistribute super."multipass"; - "multiplate-simplified" = dontDistribute super."multiplate-simplified"; - "multiplicity" = dontDistribute super."multiplicity"; - "multirec" = dontDistribute super."multirec"; - "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; - "multirec-binary" = dontDistribute super."multirec-binary"; - "multisetrewrite" = dontDistribute super."multisetrewrite"; - "multistate" = dontDistribute super."multistate"; - "muon" = dontDistribute super."muon"; - "murder" = dontDistribute super."murder"; - "murmur" = dontDistribute super."murmur"; - "murmur3" = dontDistribute super."murmur3"; - "murmurhash3" = dontDistribute super."murmurhash3"; - "music-articulation" = dontDistribute super."music-articulation"; - "music-diatonic" = dontDistribute super."music-diatonic"; - "music-dynamics" = dontDistribute super."music-dynamics"; - "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; - "music-graphics" = dontDistribute super."music-graphics"; - "music-parts" = dontDistribute super."music-parts"; - "music-pitch" = dontDistribute super."music-pitch"; - "music-pitch-literal" = dontDistribute super."music-pitch-literal"; - "music-preludes" = dontDistribute super."music-preludes"; - "music-score" = dontDistribute super."music-score"; - "music-sibelius" = dontDistribute super."music-sibelius"; - "music-suite" = dontDistribute super."music-suite"; - "music-util" = dontDistribute super."music-util"; - "musicbrainz-email" = dontDistribute super."musicbrainz-email"; - "musicxml" = dontDistribute super."musicxml"; - "musicxml2" = dontDistribute super."musicxml2"; - "mustache" = doDistribute super."mustache_1_0_2"; - "mustache-haskell" = dontDistribute super."mustache-haskell"; - "mustache2hs" = dontDistribute super."mustache2hs"; - "mutable-iter" = dontDistribute super."mutable-iter"; - "mute-unmute" = dontDistribute super."mute-unmute"; - "mvc" = dontDistribute super."mvc"; - "mvc-updates" = dontDistribute super."mvc-updates"; - "mvclient" = dontDistribute super."mvclient"; - "mwc-random-monad" = dontDistribute super."mwc-random-monad"; - "myTestlll" = dontDistribute super."myTestlll"; - "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; - "myo" = dontDistribute super."myo"; - "mysnapsession" = dontDistribute super."mysnapsession"; - "mysnapsession-example" = dontDistribute super."mysnapsession-example"; - "mysql-effect" = dontDistribute super."mysql-effect"; - "mysql-haskell" = dontDistribute super."mysql-haskell"; - "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; - "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; - "mystem" = dontDistribute super."mystem"; - "mywatch" = dontDistribute super."mywatch"; - "mzv" = dontDistribute super."mzv"; - "n-m" = dontDistribute super."n-m"; - "nagios-perfdata" = dontDistribute super."nagios-perfdata"; - "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; - "named-formlet" = dontDistribute super."named-formlet"; - "named-lock" = dontDistribute super."named-lock"; - "named-records" = dontDistribute super."named-records"; - "namelist" = dontDistribute super."namelist"; - "names" = dontDistribute super."names"; - "namespace" = dontDistribute super."namespace"; - "nano-cryptr" = dontDistribute super."nano-cryptr"; - "nano-hmac" = dontDistribute super."nano-hmac"; - "nano-md5" = dontDistribute super."nano-md5"; - "nanoAgda" = dontDistribute super."nanoAgda"; - "nanocurses" = dontDistribute super."nanocurses"; - "nanomsg" = dontDistribute super."nanomsg"; - "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; - "nanoparsec" = dontDistribute super."nanoparsec"; - "nanovg" = dontDistribute super."nanovg"; - "nanq" = dontDistribute super."nanq"; - "narc" = dontDistribute super."narc"; - "nat" = dontDistribute super."nat"; - "native" = dontDistribute super."native"; - "nats-queue" = dontDistribute super."nats-queue"; - "natural-number" = dontDistribute super."natural-number"; - "natural-numbers" = dontDistribute super."natural-numbers"; - "naturalcomp" = dontDistribute super."naturalcomp"; - "naturals" = dontDistribute super."naturals"; - "naver-translate" = dontDistribute super."naver-translate"; - "nbt" = dontDistribute super."nbt"; - "nc-indicators" = dontDistribute super."nc-indicators"; - "ncurses" = dontDistribute super."ncurses"; - "neat" = dontDistribute super."neat"; - "needle" = dontDistribute super."needle"; - "neet" = dontDistribute super."neet"; - "nehe-tuts" = dontDistribute super."nehe-tuts"; - "neil" = dontDistribute super."neil"; - "neither" = dontDistribute super."neither"; - "nemesis" = dontDistribute super."nemesis"; - "nemesis-titan" = dontDistribute super."nemesis-titan"; - "nerf" = dontDistribute super."nerf"; - "nero" = dontDistribute super."nero"; - "nero-wai" = dontDistribute super."nero-wai"; - "nero-warp" = dontDistribute super."nero-warp"; - "nested-routes" = doDistribute super."nested-routes_7_0_0"; - "nested-sequence" = dontDistribute super."nested-sequence"; - "nested-sets" = dontDistribute super."nested-sets"; - "nestedmap" = dontDistribute super."nestedmap"; - "net-concurrent" = dontDistribute super."net-concurrent"; - "netclock" = dontDistribute super."netclock"; - "netcore" = dontDistribute super."netcore"; - "netlines" = dontDistribute super."netlines"; - "netlink" = dontDistribute super."netlink"; - "netlist" = dontDistribute super."netlist"; - "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; - "netpbm" = dontDistribute super."netpbm"; - "netrc" = dontDistribute super."netrc"; - "netspec" = dontDistribute super."netspec"; - "netstring-enumerator" = dontDistribute super."netstring-enumerator"; - "nettle-frp" = dontDistribute super."nettle-frp"; - "nettle-netkit" = dontDistribute super."nettle-netkit"; - "nettle-openflow" = dontDistribute super."nettle-openflow"; - "netwire" = dontDistribute super."netwire"; - "netwire-input" = dontDistribute super."netwire-input"; - "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; - "network" = doDistribute super."network_2_6_2_1"; - "network-address" = dontDistribute super."network-address"; - "network-api-support" = dontDistribute super."network-api-support"; - "network-bitcoin" = dontDistribute super."network-bitcoin"; - "network-builder" = dontDistribute super."network-builder"; - "network-bytestring" = dontDistribute super."network-bytestring"; - "network-conduit" = dontDistribute super."network-conduit"; - "network-connection" = dontDistribute super."network-connection"; - "network-data" = dontDistribute super."network-data"; - "network-dbus" = dontDistribute super."network-dbus"; - "network-dns" = dontDistribute super."network-dns"; - "network-enumerator" = dontDistribute super."network-enumerator"; - "network-fancy" = dontDistribute super."network-fancy"; - "network-hans" = dontDistribute super."network-hans"; - "network-interfacerequest" = dontDistribute super."network-interfacerequest"; - "network-ip" = dontDistribute super."network-ip"; - "network-metrics" = dontDistribute super."network-metrics"; - "network-minihttp" = dontDistribute super."network-minihttp"; - "network-msg" = dontDistribute super."network-msg"; - "network-msgpack-rpc" = dontDistribute super."network-msgpack-rpc"; - "network-netpacket" = dontDistribute super."network-netpacket"; - "network-pgi" = dontDistribute super."network-pgi"; - "network-rpca" = dontDistribute super."network-rpca"; - "network-server" = dontDistribute super."network-server"; - "network-service" = dontDistribute super."network-service"; - "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; - "network-simple-tls" = dontDistribute super."network-simple-tls"; - "network-socket-options" = dontDistribute super."network-socket-options"; - "network-stream" = dontDistribute super."network-stream"; - "network-topic-models" = dontDistribute super."network-topic-models"; - "network-transport-amqp" = dontDistribute super."network-transport-amqp"; - "network-uri-flag" = dontDistribute super."network-uri-flag"; - "network-uri-static" = dontDistribute super."network-uri-static"; - "network-wai-router" = dontDistribute super."network-wai-router"; - "network-websocket" = dontDistribute super."network-websocket"; - "networked-game" = dontDistribute super."networked-game"; - "neural" = dontDistribute super."neural"; - "newports" = dontDistribute super."newports"; - "newsynth" = dontDistribute super."newsynth"; - "newt" = dontDistribute super."newt"; - "newtype-deriving" = dontDistribute super."newtype-deriving"; - "newtype-th" = dontDistribute super."newtype-th"; - "newtyper" = dontDistribute super."newtyper"; - "nextstep-plist" = dontDistribute super."nextstep-plist"; - "nf" = dontDistribute super."nf"; - "ngrams-loader" = dontDistribute super."ngrams-loader"; - "ngx-export" = dontDistribute super."ngx-export"; - "niagra" = dontDistribute super."niagra"; - "nibblestring" = dontDistribute super."nibblestring"; - "nicify" = dontDistribute super."nicify"; - "nicovideo-translator" = dontDistribute super."nicovideo-translator"; - "nikepub" = dontDistribute super."nikepub"; - "nimber" = dontDistribute super."nimber"; - "nist-beacon" = dontDistribute super."nist-beacon"; - "nitro" = dontDistribute super."nitro"; - "nix-eval" = dontDistribute super."nix-eval"; - "nixfromnpm" = dontDistribute super."nixfromnpm"; - "nixos-types" = dontDistribute super."nixos-types"; - "nkjp" = dontDistribute super."nkjp"; - "nlp-scores" = dontDistribute super."nlp-scores"; - "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; - "nm" = dontDistribute super."nm"; - "nme" = dontDistribute super."nme"; - "nntp" = dontDistribute super."nntp"; - "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; - "no-role-annots" = dontDistribute super."no-role-annots"; - "nofib-analyse" = dontDistribute super."nofib-analyse"; - "nofib-analyze" = dontDistribute super."nofib-analyze"; - "noise" = dontDistribute super."noise"; - "non-empty" = dontDistribute super."non-empty"; - "non-empty-sequence" = dontDistribute super."non-empty-sequence"; - "non-negative" = dontDistribute super."non-negative"; - "nondeterminism" = dontDistribute super."nondeterminism"; - "nonempty-alternative" = dontDistribute super."nonempty-alternative"; - "nonfree" = dontDistribute super."nonfree"; - "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; - "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; - "noodle" = dontDistribute super."noodle"; - "normaldistribution" = dontDistribute super."normaldistribution"; - "normalization-insensitive" = dontDistribute super."normalization-insensitive"; - "not-gloss" = dontDistribute super."not-gloss"; - "not-gloss-examples" = dontDistribute super."not-gloss-examples"; - "not-in-base" = dontDistribute super."not-in-base"; - "notcpp" = dontDistribute super."notcpp"; - "notmuch-haskell" = dontDistribute super."notmuch-haskell"; - "notmuch-web" = dontDistribute super."notmuch-web"; - "notzero" = dontDistribute super."notzero"; - "np-extras" = dontDistribute super."np-extras"; - "np-linear" = dontDistribute super."np-linear"; - "nptools" = dontDistribute super."nptools"; - "nth-prime" = dontDistribute super."nth-prime"; - "ntha" = dontDistribute super."ntha"; - "nthable" = dontDistribute super."nthable"; - "ntp-control" = dontDistribute super."ntp-control"; - "null-canvas" = dontDistribute super."null-canvas"; - "nullary" = dontDistribute super."nullary"; - "nullpipe" = dontDistribute super."nullpipe"; - "number" = dontDistribute super."number"; - "number-length" = dontDistribute super."number-length"; - "numbering" = dontDistribute super."numbering"; - "numerals" = dontDistribute super."numerals"; - "numerals-base" = dontDistribute super."numerals-base"; - "numeric-limits" = dontDistribute super."numeric-limits"; - "numeric-prelude" = dontDistribute super."numeric-prelude"; - "numeric-qq" = dontDistribute super."numeric-qq"; - "numeric-quest" = dontDistribute super."numeric-quest"; - "numeric-ranges" = dontDistribute super."numeric-ranges"; - "numeric-tools" = dontDistribute super."numeric-tools"; - "numericpeano" = dontDistribute super."numericpeano"; - "nums" = dontDistribute super."nums"; - "numtype" = dontDistribute super."numtype"; - "numtype-tf" = dontDistribute super."numtype-tf"; - "nurbs" = dontDistribute super."nurbs"; - "nvim-hs" = dontDistribute super."nvim-hs"; - "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; - "nyan" = dontDistribute super."nyan"; - "nylas" = dontDistribute super."nylas"; - "nymphaea" = dontDistribute super."nymphaea"; - "oanda-rest-api" = dontDistribute super."oanda-rest-api"; - "oauthenticated" = dontDistribute super."oauthenticated"; - "obdd" = dontDistribute super."obdd"; - "oberon0" = dontDistribute super."oberon0"; - "obj" = dontDistribute super."obj"; - "objectid" = dontDistribute super."objectid"; - "observable-sharing" = dontDistribute super."observable-sharing"; - "octane" = doDistribute super."octane_0_4_24"; - "octohat" = dontDistribute super."octohat"; - "octopus" = dontDistribute super."octopus"; - "oculus" = dontDistribute super."oculus"; - "oden-go-packages" = dontDistribute super."oden-go-packages"; - "oeis" = dontDistribute super."oeis"; - "off-simple" = dontDistribute super."off-simple"; - "ogmarkup" = dontDistribute super."ogmarkup"; - "ohloh-hs" = dontDistribute super."ohloh-hs"; - "oi" = dontDistribute super."oi"; - "oidc-client" = dontDistribute super."oidc-client"; - "ois-input-manager" = dontDistribute super."ois-input-manager"; - "old-version" = dontDistribute super."old-version"; - "olwrapper" = dontDistribute super."olwrapper"; - "omaketex" = dontDistribute super."omaketex"; - "ombra" = dontDistribute super."ombra"; - "omega" = dontDistribute super."omega"; - "omnicodec" = dontDistribute super."omnicodec"; - "on-a-horse" = dontDistribute super."on-a-horse"; - "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; - "once" = doDistribute super."once_0_1_0_0"; - "one-liner" = dontDistribute super."one-liner"; - "one-time-password" = dontDistribute super."one-time-password"; - "oneOfN" = dontDistribute super."oneOfN"; - "oneormore" = dontDistribute super."oneormore"; - "only" = dontDistribute super."only"; - "onu-course" = dontDistribute super."onu-course"; - "opaleye" = doDistribute super."opaleye_0_4_2_0"; - "opaleye-classy" = dontDistribute super."opaleye-classy"; - "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; - "open-haddock" = dontDistribute super."open-haddock"; - "open-pandoc" = dontDistribute super."open-pandoc"; - "open-signals" = dontDistribute super."open-signals"; - "open-symbology" = dontDistribute super."open-symbology"; - "open-typerep" = dontDistribute super."open-typerep"; - "open-union" = dontDistribute super."open-union"; - "open-witness" = dontDistribute super."open-witness"; - "opencog-atomspace" = dontDistribute super."opencog-atomspace"; - "opencv-raw" = dontDistribute super."opencv-raw"; - "opendatatable" = dontDistribute super."opendatatable"; - "openexchangerates" = dontDistribute super."openexchangerates"; - "openflow" = dontDistribute super."openflow"; - "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; - "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; - "opengles" = dontDistribute super."opengles"; - "openid" = dontDistribute super."openid"; - "openpgp" = dontDistribute super."openpgp"; - "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; - "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; - "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; - "openssh-github-keys" = dontDistribute super."openssh-github-keys"; - "openssl-createkey" = dontDistribute super."openssl-createkey"; - "opentheory" = dontDistribute super."opentheory"; - "opentheory-bits" = dontDistribute super."opentheory-bits"; - "opentheory-byte" = dontDistribute super."opentheory-byte"; - "opentheory-char" = dontDistribute super."opentheory-char"; - "opentheory-divides" = dontDistribute super."opentheory-divides"; - "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; - "opentheory-parser" = dontDistribute super."opentheory-parser"; - "opentheory-prime" = dontDistribute super."opentheory-prime"; - "opentheory-primitive" = dontDistribute super."opentheory-primitive"; - "opentheory-probability" = dontDistribute super."opentheory-probability"; - "opentheory-stream" = dontDistribute super."opentheory-stream"; - "opentheory-unicode" = dontDistribute super."opentheory-unicode"; - "operational" = doDistribute super."operational_0_2_3_2"; - "operational-alacarte" = dontDistribute super."operational-alacarte"; - "operational-extra" = dontDistribute super."operational-extra"; - "opml" = dontDistribute super."opml"; - "opn" = dontDistribute super."opn"; - "optimal-blocks" = dontDistribute super."optimal-blocks"; - "optimization" = dontDistribute super."optimization"; - "optimusprime" = dontDistribute super."optimusprime"; - "option" = dontDistribute super."option"; - "optional" = dontDistribute super."optional"; - "options-time" = dontDistribute super."options-time"; - "optparse-declarative" = dontDistribute super."optparse-declarative"; - "optparse-text" = dontDistribute super."optparse-text"; - "orc" = dontDistribute super."orc"; - "orchestrate" = dontDistribute super."orchestrate"; - "orchid" = dontDistribute super."orchid"; - "orchid-demo" = dontDistribute super."orchid-demo"; - "ord-adhoc" = dontDistribute super."ord-adhoc"; - "order-maintenance" = dontDistribute super."order-maintenance"; - "order-statistic-tree" = dontDistribute super."order-statistic-tree"; - "order-statistics" = dontDistribute super."order-statistics"; - "ordered" = dontDistribute super."ordered"; - "orders" = dontDistribute super."orders"; - "ordrea" = dontDistribute super."ordrea"; - "organize-imports" = dontDistribute super."organize-imports"; - "orgmode" = dontDistribute super."orgmode"; - "orgmode-parse" = dontDistribute super."orgmode-parse"; - "origami" = dontDistribute super."origami"; - "os-release" = dontDistribute super."os-release"; - "osc" = dontDistribute super."osc"; - "oscpacking" = dontDistribute super."oscpacking"; - "osm-conduit" = dontDistribute super."osm-conduit"; - "osm-download" = dontDistribute super."osm-download"; - "oso2pdf" = dontDistribute super."oso2pdf"; - "osx-ar" = dontDistribute super."osx-ar"; - "ot" = dontDistribute super."ot"; - "ottparse-pretty" = dontDistribute super."ottparse-pretty"; - "overloaded-records" = dontDistribute super."overloaded-records"; - "overture" = dontDistribute super."overture"; - "pack" = dontDistribute super."pack"; - "package-o-tron" = dontDistribute super."package-o-tron"; - "package-vt" = dontDistribute super."package-vt"; - "packed-dawg" = dontDistribute super."packed-dawg"; - "packedstring" = dontDistribute super."packedstring"; - "packer" = dontDistribute super."packer"; - "packman" = dontDistribute super."packman"; - "packunused" = dontDistribute super."packunused"; - "pacman-memcache" = dontDistribute super."pacman-memcache"; - "padKONTROL" = dontDistribute super."padKONTROL"; - "pagarme" = dontDistribute super."pagarme"; - "pagination" = dontDistribute super."pagination"; - "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; - "palette" = doDistribute super."palette_0_1_0_3"; - "palindromes" = dontDistribute super."palindromes"; - "pam" = dontDistribute super."pam"; - "panda" = dontDistribute super."panda"; - "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9_1_1"; - "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; - "pandoc-crossref" = dontDistribute super."pandoc-crossref"; - "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; - "pandoc-include" = dontDistribute super."pandoc-include"; - "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; - "pandoc-lens" = dontDistribute super."pandoc-lens"; - "pandoc-placetable" = dontDistribute super."pandoc-placetable"; - "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; - "pandoc-types" = doDistribute super."pandoc-types_1_16_1"; - "pandoc-unlit" = dontDistribute super."pandoc-unlit"; - "pango" = doDistribute super."pango_0_13_1_1"; - "papa" = dontDistribute super."papa"; - "papa-lens" = dontDistribute super."papa-lens"; - "papa-prelude" = dontDistribute super."papa-prelude"; - "papa-prelude-core" = dontDistribute super."papa-prelude-core"; - "papa-prelude-lens" = dontDistribute super."papa-prelude-lens"; - "papa-prelude-semigroupoids" = dontDistribute super."papa-prelude-semigroupoids"; - "papa-prelude-semigroups" = dontDistribute super."papa-prelude-semigroups"; - "papillon" = dontDistribute super."papillon"; - "pappy" = dontDistribute super."pappy"; - "paprika" = dontDistribute super."paprika"; - "para" = dontDistribute super."para"; - "paragon" = dontDistribute super."paragon"; - "parallel-tasks" = dontDistribute super."parallel-tasks"; - "parallel-tree-search" = dontDistribute super."parallel-tree-search"; - "parameterized-data" = dontDistribute super."parameterized-data"; - "paranoia" = dontDistribute super."paranoia"; - "parco" = dontDistribute super."parco"; - "parco-attoparsec" = dontDistribute super."parco-attoparsec"; - "parco-parsec" = dontDistribute super."parco-parsec"; - "parcom-lib" = dontDistribute super."parcom-lib"; - "parconc-examples" = dontDistribute super."parconc-examples"; - "parport" = dontDistribute super."parport"; - "parse-dimacs" = dontDistribute super."parse-dimacs"; - "parse-help" = dontDistribute super."parse-help"; - "parsec-extra" = dontDistribute super."parsec-extra"; - "parsec-numbers" = dontDistribute super."parsec-numbers"; - "parsec-parsers" = dontDistribute super."parsec-parsers"; - "parsec-permutation" = dontDistribute super."parsec-permutation"; - "parsec-pratt" = dontDistribute super."parsec-pratt"; - "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; - "parsec-trace" = dontDistribute super."parsec-trace"; - "parsec-utils" = dontDistribute super."parsec-utils"; - "parsec1" = dontDistribute super."parsec1"; - "parsec2" = dontDistribute super."parsec2"; - "parsec3" = dontDistribute super."parsec3"; - "parsec3-numbers" = dontDistribute super."parsec3-numbers"; - "parsedate" = dontDistribute super."parsedate"; - "parseerror-eq" = dontDistribute super."parseerror-eq"; - "parsek" = dontDistribute super."parsek"; - "parsely" = dontDistribute super."parsely"; - "parser-helper" = dontDistribute super."parser-helper"; - "parser241" = dontDistribute super."parser241"; - "parsergen" = dontDistribute super."parsergen"; - "parsestar" = dontDistribute super."parsestar"; - "parsimony" = dontDistribute super."parsimony"; - "partage" = dontDistribute super."partage"; - "partial" = dontDistribute super."partial"; - "partial-lens" = dontDistribute super."partial-lens"; - "partial-uri" = dontDistribute super."partial-uri"; - "partly" = dontDistribute super."partly"; - "passage" = dontDistribute super."passage"; - "passwords" = dontDistribute super."passwords"; - "pasta" = dontDistribute super."pasta"; - "pastis" = dontDistribute super."pastis"; - "pasty" = dontDistribute super."pasty"; - "patch-combinators" = dontDistribute super."patch-combinators"; - "patch-image" = dontDistribute super."patch-image"; - "path" = doDistribute super."path_0_5_8"; - "path-io" = doDistribute super."path-io_1_1_0"; - "pathfinding" = dontDistribute super."pathfinding"; - "pathfindingcore" = dontDistribute super."pathfindingcore"; - "pathtype" = dontDistribute super."pathtype"; - "patronscraper" = dontDistribute super."patronscraper"; - "patterns" = dontDistribute super."patterns"; - "paymill" = dontDistribute super."paymill"; - "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; - "paypal-api" = dontDistribute super."paypal-api"; - "pb" = dontDistribute super."pb"; - "pbc4hs" = dontDistribute super."pbc4hs"; - "pbkdf" = dontDistribute super."pbkdf"; - "pcap-conduit" = dontDistribute super."pcap-conduit"; - "pcap-enumerator" = dontDistribute super."pcap-enumerator"; - "pcd-loader" = dontDistribute super."pcd-loader"; - "pcf" = dontDistribute super."pcf"; - "pcg-random" = dontDistribute super."pcg-random"; - "pcre-less" = dontDistribute super."pcre-less"; - "pcre-light-extra" = dontDistribute super."pcre-light-extra"; - "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; - "pdf2line" = dontDistribute super."pdf2line"; - "pdfsplit" = dontDistribute super."pdfsplit"; - "pdynload" = dontDistribute super."pdynload"; - "peakachu" = dontDistribute super."peakachu"; - "peano" = dontDistribute super."peano"; - "peano-inf" = dontDistribute super."peano-inf"; - "pec" = dontDistribute super."pec"; - "pecoff" = dontDistribute super."pecoff"; - "peg" = dontDistribute super."peg"; - "peggy" = dontDistribute super."peggy"; - "pell" = dontDistribute super."pell"; - "penn-treebank" = dontDistribute super."penn-treebank"; - "penny" = dontDistribute super."penny"; - "penny-bin" = dontDistribute super."penny-bin"; - "penny-lib" = dontDistribute super."penny-lib"; - "peparser" = dontDistribute super."peparser"; - "perceptron" = dontDistribute super."perceptron"; - "perdure" = dontDistribute super."perdure"; - "perfecthash" = dontDistribute super."perfecthash"; - "period" = dontDistribute super."period"; - "periodic" = dontDistribute super."periodic"; - "perm" = dontDistribute super."perm"; - "permute" = dontDistribute super."permute"; - "persist2er" = dontDistribute super."persist2er"; - "persistent" = doDistribute super."persistent_2_2_4_1"; - "persistent-audit" = dontDistribute super."persistent-audit"; - "persistent-cereal" = dontDistribute super."persistent-cereal"; - "persistent-database-url" = dontDistribute super."persistent-database-url"; - "persistent-equivalence" = dontDistribute super."persistent-equivalence"; - "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; - "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; - "persistent-iproute" = dontDistribute super."persistent-iproute"; - "persistent-map" = dontDistribute super."persistent-map"; - "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_4"; - "persistent-mysql" = doDistribute super."persistent-mysql_2_3_0_2"; - "persistent-odbc" = dontDistribute super."persistent-odbc"; - "persistent-parser" = dontDistribute super."persistent-parser"; - "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_2"; - "persistent-protobuf" = dontDistribute super."persistent-protobuf"; - "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; - "persistent-redis" = dontDistribute super."persistent-redis"; - "persistent-sqlite" = doDistribute super."persistent-sqlite_2_2_1"; - "persistent-template" = doDistribute super."persistent-template_2_1_8_1"; - "persistent-vector" = dontDistribute super."persistent-vector"; - "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; - "persona" = dontDistribute super."persona"; - "persona-idp" = dontDistribute super."persona-idp"; - "pesca" = dontDistribute super."pesca"; - "peyotls" = dontDistribute super."peyotls"; - "peyotls-codec" = dontDistribute super."peyotls-codec"; - "pez" = dontDistribute super."pez"; - "pg-harness" = dontDistribute super."pg-harness"; - "pg-harness-client" = dontDistribute super."pg-harness-client"; - "pg-harness-server" = dontDistribute super."pg-harness-server"; - "pg-store" = dontDistribute super."pg-store"; - "pgdl" = dontDistribute super."pgdl"; - "pgm" = dontDistribute super."pgm"; - "pgsql-simple" = dontDistribute super."pgsql-simple"; - "pgstream" = dontDistribute super."pgstream"; - "phasechange" = dontDistribute super."phasechange"; - "phash" = dontDistribute super."phash"; - "phizzle" = dontDistribute super."phizzle"; - "phoityne" = dontDistribute super."phoityne"; - "phoityne-vscode" = dontDistribute super."phoityne-vscode"; - "phone-metadata" = dontDistribute super."phone-metadata"; - "phone-numbers" = dontDistribute super."phone-numbers"; - "phone-push" = dontDistribute super."phone-push"; - "phonetic-code" = dontDistribute super."phonetic-code"; - "phooey" = dontDistribute super."phooey"; - "photoname" = dontDistribute super."photoname"; - "phraskell" = dontDistribute super."phraskell"; - "phybin" = dontDistribute super."phybin"; - "pi-calculus" = dontDistribute super."pi-calculus"; - "pi-forall" = dontDistribute super."pi-forall"; - "pia-forward" = dontDistribute super."pia-forward"; - "pianola" = dontDistribute super."pianola"; - "picologic" = dontDistribute super."picologic"; - "picosat" = dontDistribute super."picosat"; - "piet" = dontDistribute super."piet"; - "piki" = dontDistribute super."piki"; - "pinboard" = dontDistribute super."pinboard"; - "pinch" = doDistribute super."pinch_0_2_0_2"; - "pinchot" = doDistribute super."pinchot_0_18_2_0"; - "pipe-enumerator" = dontDistribute super."pipe-enumerator"; - "pipeclip" = dontDistribute super."pipeclip"; - "pipes-async" = dontDistribute super."pipes-async"; - "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; - "pipes-bzip" = dontDistribute super."pipes-bzip"; - "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1"; - "pipes-cellular" = dontDistribute super."pipes-cellular"; - "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; - "pipes-cereal" = dontDistribute super."pipes-cereal"; - "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; - "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; - "pipes-conduit" = dontDistribute super."pipes-conduit"; - "pipes-core" = dontDistribute super."pipes-core"; - "pipes-courier" = dontDistribute super."pipes-courier"; - "pipes-errors" = dontDistribute super."pipes-errors"; - "pipes-extra" = dontDistribute super."pipes-extra"; - "pipes-files" = dontDistribute super."pipes-files"; - "pipes-http" = doDistribute super."pipes-http_1_0_3"; - "pipes-interleave" = dontDistribute super."pipes-interleave"; - "pipes-io" = dontDistribute super."pipes-io"; - "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; - "pipes-lzma" = dontDistribute super."pipes-lzma"; - "pipes-network-tls" = dontDistribute super."pipes-network-tls"; - "pipes-p2p" = dontDistribute super."pipes-p2p"; - "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; - "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; - "pipes-protolude" = dontDistribute super."pipes-protolude"; - "pipes-random" = dontDistribute super."pipes-random"; - "pipes-rt" = dontDistribute super."pipes-rt"; - "pipes-s3" = dontDistribute super."pipes-s3"; - "pipes-shell" = dontDistribute super."pipes-shell"; - "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; - "pipes-vector" = dontDistribute super."pipes-vector"; - "pipes-websockets" = dontDistribute super."pipes-websockets"; - "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; - "pipes-zlib" = dontDistribute super."pipes-zlib"; - "pisigma" = dontDistribute super."pisigma"; - "pit" = dontDistribute super."pit"; - "pitchtrack" = dontDistribute super."pitchtrack"; - "pivotal-tracker" = dontDistribute super."pivotal-tracker"; - "pixelated-avatar-generator" = dontDistribute super."pixelated-avatar-generator"; - "pkcs1" = dontDistribute super."pkcs1"; - "pkcs7" = dontDistribute super."pkcs7"; - "pkggraph" = dontDistribute super."pkggraph"; - "pktree" = dontDistribute super."pktree"; - "plailude" = dontDistribute super."plailude"; - "planar-graph" = dontDistribute super."planar-graph"; - "plat" = dontDistribute super."plat"; - "playlists" = dontDistribute super."playlists"; - "plist" = dontDistribute super."plist"; - "plist-buddy" = dontDistribute super."plist-buddy"; - "plivo" = dontDistribute super."plivo"; - "plot-lab" = dontDistribute super."plot-lab"; - "plotfont" = dontDistribute super."plotfont"; - "plotserver-api" = dontDistribute super."plotserver-api"; - "plugins" = dontDistribute super."plugins"; - "plugins-auto" = dontDistribute super."plugins-auto"; - "plugins-multistage" = dontDistribute super."plugins-multistage"; - "plumbers" = dontDistribute super."plumbers"; - "ply-loader" = dontDistribute super."ply-loader"; - "png-file" = dontDistribute super."png-file"; - "pngload" = dontDistribute super."pngload"; - "pngload-fixed" = dontDistribute super."pngload-fixed"; - "pnm" = dontDistribute super."pnm"; - "pocket-dns" = dontDistribute super."pocket-dns"; - "pointed" = doDistribute super."pointed_4_2_0_2"; - "pointedalternative" = dontDistribute super."pointedalternative"; - "pointfree" = dontDistribute super."pointfree"; - "pointless-haskell" = dontDistribute super."pointless-haskell"; - "pointless-lenses" = dontDistribute super."pointless-lenses"; - "pointless-rewrite" = dontDistribute super."pointless-rewrite"; - "pokemon-go-protobuf-types" = dontDistribute super."pokemon-go-protobuf-types"; - "poker-eval" = dontDistribute super."poker-eval"; - "pokitdok" = dontDistribute super."pokitdok"; - "polar" = dontDistribute super."polar"; - "polar-configfile" = dontDistribute super."polar-configfile"; - "polar-shader" = dontDistribute super."polar-shader"; - "polh-lexicon" = dontDistribute super."polh-lexicon"; - "polimorf" = dontDistribute super."polimorf"; - "poll" = dontDistribute super."poll"; - "poly-control" = dontDistribute super."poly-control"; - "polyToMonoid" = dontDistribute super."polyToMonoid"; - "polymap" = dontDistribute super."polymap"; - "polynom" = dontDistribute super."polynom"; - "polynomial" = dontDistribute super."polynomial"; - "polyseq" = dontDistribute super."polyseq"; - "polysoup" = dontDistribute super."polysoup"; - "polytypeable" = dontDistribute super."polytypeable"; - "polytypeable-utils" = dontDistribute super."polytypeable-utils"; - "pomodoro" = dontDistribute super."pomodoro"; - "ponder" = dontDistribute super."ponder"; - "pong-server" = dontDistribute super."pong-server"; - "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; - "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; - "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; - "pony" = dontDistribute super."pony"; - "pool" = dontDistribute super."pool"; - "pool-conduit" = dontDistribute super."pool-conduit"; - "pooled-io" = dontDistribute super."pooled-io"; - "pop3-client" = dontDistribute super."pop3-client"; - "popenhs" = dontDistribute super."popenhs"; - "poppler" = dontDistribute super."poppler"; - "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; - "portable-lines" = dontDistribute super."portable-lines"; - "portaudio" = dontDistribute super."portaudio"; - "porte" = dontDistribute super."porte"; - "porter" = dontDistribute super."porter"; - "ports" = dontDistribute super."ports"; - "ports-tools" = dontDistribute super."ports-tools"; - "positive" = dontDistribute super."positive"; - "posix-acl" = dontDistribute super."posix-acl"; - "posix-error-codes" = dontDistribute super."posix-error-codes"; - "posix-escape" = dontDistribute super."posix-escape"; - "posix-filelock" = dontDistribute super."posix-filelock"; - "posix-paths" = dontDistribute super."posix-paths"; - "posix-pty" = dontDistribute super."posix-pty"; - "posix-timer" = dontDistribute super."posix-timer"; - "posix-waitpid" = dontDistribute super."posix-waitpid"; - "possible" = dontDistribute super."possible"; - "postcodes" = dontDistribute super."postcodes"; - "postgres-tmp" = dontDistribute super."postgres-tmp"; - "postgresql-binary" = doDistribute super."postgresql-binary_0_9_0_1"; - "postgresql-config" = dontDistribute super."postgresql-config"; - "postgresql-connector" = dontDistribute super."postgresql-connector"; - "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; - "postgresql-cube" = dontDistribute super."postgresql-cube"; - "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; - "postgresql-libpq" = doDistribute super."postgresql-libpq_0_9_1_1"; - "postgresql-query" = dontDistribute super."postgresql-query"; - "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind"; - "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; - "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; - "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; - "postgresql-typed" = dontDistribute super."postgresql-typed"; - "postgrest" = dontDistribute super."postgrest"; - "postgrest-ws" = dontDistribute super."postgrest-ws"; - "postie" = dontDistribute super."postie"; - "postmark" = dontDistribute super."postmark"; - "postmaster" = dontDistribute super."postmaster"; - "potato-tool" = dontDistribute super."potato-tool"; - "potrace" = dontDistribute super."potrace"; - "potrace-diagrams" = dontDistribute super."potrace-diagrams"; - "powermate" = dontDistribute super."powermate"; - "powerpc" = dontDistribute super."powerpc"; - "ppm" = dontDistribute super."ppm"; - "pqc" = dontDistribute super."pqc"; - "pqueue" = dontDistribute super."pqueue"; - "pqueue-mtl" = dontDistribute super."pqueue-mtl"; - "practice-room" = dontDistribute super."practice-room"; - "precis" = dontDistribute super."precis"; - "predicates" = dontDistribute super."predicates"; - "predictive" = dontDistribute super."predictive"; - "prednote-test" = dontDistribute super."prednote-test"; - "prefork" = dontDistribute super."prefork"; - "pregame" = dontDistribute super."pregame"; - "preliminaries" = dontDistribute super."preliminaries"; - "prelude-compat" = dontDistribute super."prelude-compat"; - "prelude-edsl" = dontDistribute super."prelude-edsl"; - "prelude-generalize" = dontDistribute super."prelude-generalize"; - "prelude-plus" = dontDistribute super."prelude-plus"; - "prelude-prime" = dontDistribute super."prelude-prime"; - "prelude2010" = dontDistribute super."prelude2010"; - "preprocess-haskell" = dontDistribute super."preprocess-haskell"; - "preprocessor" = dontDistribute super."preprocessor"; - "present" = dontDistribute super."present"; - "press" = dontDistribute super."press"; - "presto-hdbc" = dontDistribute super."presto-hdbc"; - "prettify" = dontDistribute super."prettify"; - "pretty-compact" = dontDistribute super."pretty-compact"; - "pretty-error" = dontDistribute super."pretty-error"; - "pretty-ncols" = dontDistribute super."pretty-ncols"; - "pretty-sop" = dontDistribute super."pretty-sop"; - "pretty-tree" = dontDistribute super."pretty-tree"; - "pretty-types" = dontDistribute super."pretty-types"; - "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; - "prim-spoon" = dontDistribute super."prim-spoon"; - "prim-uniq" = dontDistribute super."prim-uniq"; - "primitive-simd" = dontDistribute super."primitive-simd"; - "primula-board" = dontDistribute super."primula-board"; - "primula-bot" = dontDistribute super."primula-bot"; - "pringletons" = dontDistribute super."pringletons"; - "print-debugger" = dontDistribute super."print-debugger"; - "printf-mauke" = dontDistribute super."printf-mauke"; - "printf-safe" = dontDistribute super."printf-safe"; - "printxosd" = dontDistribute super."printxosd"; - "priority-queue" = dontDistribute super."priority-queue"; - "priority-sync" = dontDistribute super."priority-sync"; - "privileged-concurrency" = dontDistribute super."privileged-concurrency"; - "prizm" = dontDistribute super."prizm"; - "probability" = dontDistribute super."probability"; - "probable" = dontDistribute super."probable"; - "proc" = dontDistribute super."proc"; - "proc-net" = dontDistribute super."proc-net"; - "process-conduit" = dontDistribute super."process-conduit"; - "process-extras" = doDistribute super."process-extras_0_3_3_8"; - "process-iterio" = dontDistribute super."process-iterio"; - "process-leksah" = dontDistribute super."process-leksah"; - "process-listlike" = dontDistribute super."process-listlike"; - "process-progress" = dontDistribute super."process-progress"; - "process-qq" = dontDistribute super."process-qq"; - "processing" = dontDistribute super."processing"; - "processing-for-haskell" = dontDistribute super."processing-for-haskell"; - "processor-creative-kit" = dontDistribute super."processor-creative-kit"; - "procrastinating-structure" = dontDistribute super."procrastinating-structure"; - "procrastinating-variable" = dontDistribute super."procrastinating-variable"; - "procstat" = dontDistribute super."procstat"; - "proctest" = dontDistribute super."proctest"; - "prof2dot" = dontDistribute super."prof2dot"; - "prof2pretty" = dontDistribute super."prof2pretty"; - "progress" = dontDistribute super."progress"; - "progressbar" = dontDistribute super."progressbar"; - "progression" = dontDistribute super."progression"; - "progressive" = dontDistribute super."progressive"; - "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; - "projection" = dontDistribute super."projection"; - "prolog" = dontDistribute super."prolog"; - "prolog-graph" = dontDistribute super."prolog-graph"; - "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; - "prologue" = dontDistribute super."prologue"; - "prometheus" = dontDistribute super."prometheus"; - "promise" = dontDistribute super."promise"; - "promises" = dontDistribute super."promises"; - "propane" = dontDistribute super."propane"; - "propellor" = dontDistribute super."propellor"; - "properties" = dontDistribute super."properties"; - "property-list" = dontDistribute super."property-list"; - "proplang" = dontDistribute super."proplang"; - "props" = dontDistribute super."props"; - "prosper" = dontDistribute super."prosper"; - "proteaaudio" = dontDistribute super."proteaaudio"; - "proto-lens" = dontDistribute super."proto-lens"; - "proto-lens-arbitrary" = dontDistribute super."proto-lens-arbitrary"; - "proto-lens-combinators" = dontDistribute super."proto-lens-combinators"; - "proto-lens-optparse" = dontDistribute super."proto-lens-optparse"; - "proto-lens-protoc" = dontDistribute super."proto-lens-protoc"; - "protobuf-native" = dontDistribute super."protobuf-native"; - "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0"; - "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0"; - "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; - "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; - "protolude" = doDistribute super."protolude_0_1_6"; - "proton-haskell" = dontDistribute super."proton-haskell"; - "prototype" = dontDistribute super."prototype"; - "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; - "proxy-kindness" = dontDistribute super."proxy-kindness"; - "psc-ide" = dontDistribute super."psc-ide"; - "pseudo-boolean" = dontDistribute super."pseudo-boolean"; - "pseudo-trie" = dontDistribute super."pseudo-trie"; - "pseudomacros" = dontDistribute super."pseudomacros"; - "psqueues" = doDistribute super."psqueues_0_2_2_1"; - "pstemmer" = dontDistribute super."pstemmer"; - "pub" = dontDistribute super."pub"; - "publicsuffix" = doDistribute super."publicsuffix_0_20160522"; - "publicsuffixlist" = dontDistribute super."publicsuffixlist"; - "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; - "pubnub" = dontDistribute super."pubnub"; - "pubsub" = dontDistribute super."pubsub"; - "puffytools" = dontDistribute super."puffytools"; - "pugixml" = dontDistribute super."pugixml"; - "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; - "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; - "pugs-compat" = dontDistribute super."pugs-compat"; - "pugs-hsregex" = dontDistribute super."pugs-hsregex"; - "pulse" = dontDistribute super."pulse"; - "pulse-simple" = dontDistribute super."pulse-simple"; - "pulseaudio" = dontDistribute super."pulseaudio"; - "punkt" = dontDistribute super."punkt"; - "punycode" = dontDistribute super."punycode"; - "puppetresources" = dontDistribute super."puppetresources"; - "pure-fft" = dontDistribute super."pure-fft"; - "pure-priority-queue" = dontDistribute super."pure-priority-queue"; - "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; - "pure-zlib" = dontDistribute super."pure-zlib"; - "purescript" = doDistribute super."purescript_0_8_5_0"; - "purescript-bridge" = dontDistribute super."purescript-bridge"; - "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; - "pursuit-client" = dontDistribute super."pursuit-client"; - "push-notify" = dontDistribute super."push-notify"; - "push-notify-ccs" = dontDistribute super."push-notify-ccs"; - "push-notify-general" = dontDistribute super."push-notify-general"; - "pusher-haskell" = dontDistribute super."pusher-haskell"; - "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_2"; - "pusher-ws" = dontDistribute super."pusher-ws"; - "pushme" = dontDistribute super."pushme"; - "putlenses" = dontDistribute super."putlenses"; - "puzzle-draw" = dontDistribute super."puzzle-draw"; - "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; - "pvd" = dontDistribute super."pvd"; - "pwstore-cli" = dontDistribute super."pwstore-cli"; - "pxsl-tools" = dontDistribute super."pxsl-tools"; - "pyffi" = dontDistribute super."pyffi"; - "pyfi" = dontDistribute super."pyfi"; - "python-pickle" = dontDistribute super."python-pickle"; - "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; - "qd" = dontDistribute super."qd"; - "qd-vec" = dontDistribute super."qd-vec"; - "qed" = dontDistribute super."qed"; - "qhull-simple" = dontDistribute super."qhull-simple"; - "qrcode" = dontDistribute super."qrcode"; - "qt" = dontDistribute super."qt"; - "qtah-cpp-qt5" = dontDistribute super."qtah-cpp-qt5"; - "qtah-examples" = dontDistribute super."qtah-examples"; - "qtah-generator" = dontDistribute super."qtah-generator"; - "qtah-qt5" = dontDistribute super."qtah-qt5"; - "quack" = dontDistribute super."quack"; - "quadratic-irrational" = dontDistribute super."quadratic-irrational"; - "quantfin" = dontDistribute super."quantfin"; - "quantities" = dontDistribute super."quantities"; - "quantum-arrow" = dontDistribute super."quantum-arrow"; - "quantum-random" = dontDistribute super."quantum-random"; - "qudb" = dontDistribute super."qudb"; - "quenya-verb" = dontDistribute super."quenya-verb"; - "querystring-pickle" = dontDistribute super."querystring-pickle"; - "queue" = dontDistribute super."queue"; - "queuelike" = dontDistribute super."queuelike"; - "quick-generator" = dontDistribute super."quick-generator"; - "quick-schema" = dontDistribute super."quick-schema"; - "quickbooks" = dontDistribute super."quickbooks"; - "quickcheck-arbitrary-adt" = dontDistribute super."quickcheck-arbitrary-adt"; - "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; - "quickcheck-poly" = dontDistribute super."quickcheck-poly"; - "quickcheck-properties" = dontDistribute super."quickcheck-properties"; - "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; - "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; - "quickcheck-regex" = dontDistribute super."quickcheck-regex"; - "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; - "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; - "quickcheck-script" = dontDistribute super."quickcheck-script"; - "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; - "quicklz" = dontDistribute super."quicklz"; - "quickpull" = dontDistribute super."quickpull"; - "quickset" = dontDistribute super."quickset"; - "quickspec" = dontDistribute super."quickspec"; - "quickterm" = dontDistribute super."quickterm"; - "quicktest" = dontDistribute super."quicktest"; - "quickwebapp" = dontDistribute super."quickwebapp"; - "quipper" = dontDistribute super."quipper"; - "quiver" = dontDistribute super."quiver"; - "quiver-binary" = dontDistribute super."quiver-binary"; - "quiver-bytestring" = dontDistribute super."quiver-bytestring"; - "quiver-cell" = dontDistribute super."quiver-cell"; - "quiver-csv" = dontDistribute super."quiver-csv"; - "quiver-enumerator" = dontDistribute super."quiver-enumerator"; - "quiver-groups" = dontDistribute super."quiver-groups"; - "quiver-http" = dontDistribute super."quiver-http"; - "quiver-instances" = dontDistribute super."quiver-instances"; - "quiver-interleave" = dontDistribute super."quiver-interleave"; - "quiver-sort" = dontDistribute super."quiver-sort"; - "quoridor-hs" = dontDistribute super."quoridor-hs"; - "qux" = dontDistribute super."qux"; - "raaz" = dontDistribute super."raaz"; - "rabocsv2qif" = dontDistribute super."rabocsv2qif"; - "rad" = dontDistribute super."rad"; - "radian" = dontDistribute super."radian"; - "radium" = dontDistribute super."radium"; - "radium-formula-parser" = dontDistribute super."radium-formula-parser"; - "radix" = dontDistribute super."radix"; - "rados-haskell" = dontDistribute super."rados-haskell"; - "raft" = dontDistribute super."raft"; - "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; - "rainbow-tests" = dontDistribute super."rainbow-tests"; - "rake" = dontDistribute super."rake"; - "rakhana" = dontDistribute super."rakhana"; - "ralist" = dontDistribute super."ralist"; - "rallod" = dontDistribute super."rallod"; - "raml" = dontDistribute super."raml"; - "rand-vars" = dontDistribute super."rand-vars"; - "randfile" = dontDistribute super."randfile"; - "random-access-list" = dontDistribute super."random-access-list"; - "random-derive" = dontDistribute super."random-derive"; - "random-eff" = dontDistribute super."random-eff"; - "random-effin" = dontDistribute super."random-effin"; - "random-extras" = dontDistribute super."random-extras"; - "random-fu-multivariate" = dontDistribute super."random-fu-multivariate"; - "random-hypergeometric" = dontDistribute super."random-hypergeometric"; - "random-stream" = dontDistribute super."random-stream"; - "random-strings" = dontDistribute super."random-strings"; - "random-variates" = dontDistribute super."random-variates"; - "randomgen" = dontDistribute super."randomgen"; - "randproc" = dontDistribute super."randproc"; - "randsolid" = dontDistribute super."randsolid"; - "range-space" = dontDistribute super."range-space"; - "rangemin" = dontDistribute super."rangemin"; - "ranges" = dontDistribute super."ranges"; - "rapid" = dontDistribute super."rapid"; - "rascal" = dontDistribute super."rascal"; - "rate-limit" = dontDistribute super."rate-limit"; - "ratel" = doDistribute super."ratel_0_1_3"; - "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; - "ratio-int" = dontDistribute super."ratio-int"; - "raven-haskell" = dontDistribute super."raven-haskell"; - "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; - "raw-feldspar" = dontDistribute super."raw-feldspar"; - "rawr" = dontDistribute super."rawr"; - "rawstring-qm" = dontDistribute super."rawstring-qm"; - "razom-text-util" = dontDistribute super."razom-text-util"; - "rbr" = dontDistribute super."rbr"; - "rclient" = dontDistribute super."rclient"; - "rcu" = dontDistribute super."rcu"; - "rdf" = dontDistribute super."rdf"; - "rdf4h" = dontDistribute super."rdf4h"; - "rdioh" = dontDistribute super."rdioh"; - "rdtsc" = dontDistribute super."rdtsc"; - "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; - "re2" = dontDistribute super."re2"; - "react-flux" = dontDistribute super."react-flux"; - "react-flux-servant" = dontDistribute super."react-flux-servant"; - "react-haskell" = dontDistribute super."react-haskell"; - "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server"; - "reaction-logic" = dontDistribute super."reaction-logic"; - "reactive" = dontDistribute super."reactive"; - "reactive-bacon" = dontDistribute super."reactive-bacon"; - "reactive-balsa" = dontDistribute super."reactive-balsa"; - "reactive-banana" = dontDistribute super."reactive-banana"; - "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; - "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; - "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; - "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; - "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; - "reactive-glut" = dontDistribute super."reactive-glut"; - "reactive-haskell" = dontDistribute super."reactive-haskell"; - "reactive-io" = dontDistribute super."reactive-io"; - "reactive-thread" = dontDistribute super."reactive-thread"; - "reactivity" = dontDistribute super."reactivity"; - "reactor" = dontDistribute super."reactor"; - "read-bounded" = dontDistribute super."read-bounded"; - "read-env-var" = doDistribute super."read-env-var_0_1_0_0"; - "readline-statevar" = dontDistribute super."readline-statevar"; - "readpyc" = dontDistribute super."readpyc"; - "readshp" = dontDistribute super."readshp"; - "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; - "reasonable-lens" = dontDistribute super."reasonable-lens"; - "reasonable-operational" = dontDistribute super."reasonable-operational"; - "rebase" = dontDistribute super."rebase"; - "recaptcha" = dontDistribute super."recaptcha"; - "record" = dontDistribute super."record"; - "record-aeson" = dontDistribute super."record-aeson"; - "record-gl" = dontDistribute super."record-gl"; - "record-preprocessor" = dontDistribute super."record-preprocessor"; - "record-syntax" = dontDistribute super."record-syntax"; - "records" = dontDistribute super."records"; - "records-th" = dontDistribute super."records-th"; - "recursive-line-count" = dontDistribute super."recursive-line-count"; - "redHandlers" = dontDistribute super."redHandlers"; - "reddit" = dontDistribute super."reddit"; - "redis" = dontDistribute super."redis"; - "redis-hs" = dontDistribute super."redis-hs"; - "redis-job-queue" = dontDistribute super."redis-job-queue"; - "redis-simple" = dontDistribute super."redis-simple"; - "redo" = dontDistribute super."redo"; - "reenact" = dontDistribute super."reenact"; - "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; - "ref" = dontDistribute super."ref"; - "ref-mtl" = dontDistribute super."ref-mtl"; - "ref-tf" = dontDistribute super."ref-tf"; - "refcount" = dontDistribute super."refcount"; - "reference" = dontDistribute super."reference"; - "references" = dontDistribute super."references"; - "refh" = dontDistribute super."refh"; - "refined" = dontDistribute super."refined"; - "reflection-extras" = dontDistribute super."reflection-extras"; - "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; - "reflex" = dontDistribute super."reflex"; - "reflex-animation" = dontDistribute super."reflex-animation"; - "reflex-dom" = dontDistribute super."reflex-dom"; - "reflex-dom-colonnade" = dontDistribute super."reflex-dom-colonnade"; - "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; - "reflex-dom-helpers" = dontDistribute super."reflex-dom-helpers"; - "reflex-gloss" = dontDistribute super."reflex-gloss"; - "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; - "reflex-jsx" = dontDistribute super."reflex-jsx"; - "reflex-orphans" = dontDistribute super."reflex-orphans"; - "reflex-transformers" = dontDistribute super."reflex-transformers"; - "regex-deriv" = dontDistribute super."regex-deriv"; - "regex-dfa" = dontDistribute super."regex-dfa"; - "regex-easy" = dontDistribute super."regex-easy"; - "regex-genex" = dontDistribute super."regex-genex"; - "regex-parsec" = dontDistribute super."regex-parsec"; - "regex-pderiv" = dontDistribute super."regex-pderiv"; - "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; - "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; - "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; - "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; - "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; - "regex-tre" = dontDistribute super."regex-tre"; - "regex-type" = dontDistribute super."regex-type"; - "regex-xmlschema" = dontDistribute super."regex-xmlschema"; - "regexchar" = dontDistribute super."regexchar"; - "regexdot" = dontDistribute super."regexdot"; - "regexp-tries" = dontDistribute super."regexp-tries"; - "regexpr" = dontDistribute super."regexpr"; - "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; - "regexqq" = dontDistribute super."regexqq"; - "regional-pointers" = dontDistribute super."regional-pointers"; - "regions" = dontDistribute super."regions"; - "regions-monadsfd" = dontDistribute super."regions-monadsfd"; - "regions-monadstf" = dontDistribute super."regions-monadstf"; - "regions-mtl" = dontDistribute super."regions-mtl"; - "register-machine-typelevel" = dontDistribute super."register-machine-typelevel"; - "regress" = dontDistribute super."regress"; - "regular" = dontDistribute super."regular"; - "regular-extras" = dontDistribute super."regular-extras"; - "regular-web" = dontDistribute super."regular-web"; - "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; - "reheat" = dontDistribute super."reheat"; - "rehoo" = dontDistribute super."rehoo"; - "rei" = dontDistribute super."rei"; - "reified-records" = dontDistribute super."reified-records"; - "reify" = dontDistribute super."reify"; - "relacion" = dontDistribute super."relacion"; - "relation" = dontDistribute super."relation"; - "relational-postgresql8" = dontDistribute super."relational-postgresql8"; - "relational-query" = doDistribute super."relational-query_0_8_3_0"; - "relational-record" = doDistribute super."relational-record_0_1_5_0"; - "relational-record-examples" = dontDistribute super."relational-record-examples"; - "relative-date" = dontDistribute super."relative-date"; - "relit" = dontDistribute super."relit"; - "reload" = dontDistribute super."reload"; - "rematch-text" = dontDistribute super."rematch-text"; - "remote" = dontDistribute super."remote"; - "remote-debugger" = dontDistribute super."remote-debugger"; - "remote-json" = dontDistribute super."remote-json"; - "remote-json-client" = dontDistribute super."remote-json-client"; - "remote-json-server" = dontDistribute super."remote-json-server"; - "remote-monad" = dontDistribute super."remote-monad"; - "remotion" = dontDistribute super."remotion"; - "renderable" = dontDistribute super."renderable"; - "reord" = dontDistribute super."reord"; - "reorderable" = dontDistribute super."reorderable"; - "repa-array" = dontDistribute super."repa-array"; - "repa-bytestring" = dontDistribute super."repa-bytestring"; - "repa-convert" = dontDistribute super."repa-convert"; - "repa-eval" = dontDistribute super."repa-eval"; - "repa-examples" = dontDistribute super."repa-examples"; - "repa-fftw" = dontDistribute super."repa-fftw"; - "repa-flow" = dontDistribute super."repa-flow"; - "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; - "repa-plugin" = dontDistribute super."repa-plugin"; - "repa-scalar" = dontDistribute super."repa-scalar"; - "repa-series" = dontDistribute super."repa-series"; - "repa-sndfile" = dontDistribute super."repa-sndfile"; - "repa-stream" = dontDistribute super."repa-stream"; - "repa-v4l2" = dontDistribute super."repa-v4l2"; - "repl" = dontDistribute super."repl"; - "repl-toolkit" = dontDistribute super."repl-toolkit"; - "replicant" = dontDistribute super."replicant"; - "repline" = dontDistribute super."repline"; - "repo-based-blog" = dontDistribute super."repo-based-blog"; - "repr" = dontDistribute super."repr"; - "repr-tree-syb" = dontDistribute super."repr-tree-syb"; - "representable-functors" = dontDistribute super."representable-functors"; - "representable-profunctors" = dontDistribute super."representable-profunctors"; - "representable-tries" = dontDistribute super."representable-tries"; - "reqcatcher" = dontDistribute super."reqcatcher"; - "request-monad" = dontDistribute super."request-monad"; - "reroute" = doDistribute super."reroute_0_3_1_0"; - "reserve" = dontDistribute super."reserve"; - "resistor-cube" = dontDistribute super."resistor-cube"; - "resource-effect" = dontDistribute super."resource-effect"; - "resource-embed" = dontDistribute super."resource-embed"; - "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; - "resource-pool-monad" = dontDistribute super."resource-pool-monad"; - "resource-simple" = dontDistribute super."resource-simple"; - "resourcet" = doDistribute super."resourcet_1_1_7_4"; - "respond" = dontDistribute super."respond"; - "rest-example" = dontDistribute super."rest-example"; - "restful-snap" = dontDistribute super."restful-snap"; - "restricted-workers" = dontDistribute super."restricted-workers"; - "restyle" = dontDistribute super."restyle"; - "result" = dontDistribute super."result"; - "resumable-exceptions" = dontDistribute super."resumable-exceptions"; - "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; - "rethinkdb-model" = dontDistribute super."rethinkdb-model"; - "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; - "retryer" = dontDistribute super."retryer"; - "revdectime" = dontDistribute super."revdectime"; - "reverse-apply" = dontDistribute super."reverse-apply"; - "reverse-arguments" = dontDistribute super."reverse-arguments"; - "reverse-geocoding" = dontDistribute super."reverse-geocoding"; - "reversi" = dontDistribute super."reversi"; - "rewrite" = dontDistribute super."rewrite"; - "rewriting" = dontDistribute super."rewriting"; - "rex" = dontDistribute super."rex"; - "rezoom" = dontDistribute super."rezoom"; - "rfc3339" = dontDistribute super."rfc3339"; - "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; - "riak" = doDistribute super."riak_1_0_1_1"; - "riak-protobuf" = doDistribute super."riak-protobuf_0_21_0_0"; - "richreports" = dontDistribute super."richreports"; - "riemann" = dontDistribute super."riemann"; - "riff" = dontDistribute super."riff"; - "ring-buffer" = dontDistribute super."ring-buffer"; - "riot" = dontDistribute super."riot"; - "ripple" = dontDistribute super."ripple"; - "ripple-federation" = dontDistribute super."ripple-federation"; - "risc386" = dontDistribute super."risc386"; - "rison" = dontDistribute super."rison"; - "rivers" = dontDistribute super."rivers"; - "rivet" = dontDistribute super."rivet"; - "rivet-adaptor-postgresql" = dontDistribute super."rivet-adaptor-postgresql"; - "rivet-autoimporter" = dontDistribute super."rivet-autoimporter"; - "rivet-core" = dontDistribute super."rivet-core"; - "rivet-migration" = dontDistribute super."rivet-migration"; - "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; - "rlglue" = dontDistribute super."rlglue"; - "rlist" = dontDistribute super."rlist"; - "rlwe-challenges" = dontDistribute super."rlwe-challenges"; - "rmonad" = dontDistribute super."rmonad"; - "rncryptor" = dontDistribute super."rncryptor"; - "robin" = dontDistribute super."robin"; - "robot" = dontDistribute super."robot"; - "robots-txt" = dontDistribute super."robots-txt"; - "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; - "roguestar" = dontDistribute super."roguestar"; - "roguestar-engine" = dontDistribute super."roguestar-engine"; - "roguestar-gl" = dontDistribute super."roguestar-gl"; - "roguestar-glut" = dontDistribute super."roguestar-glut"; - "rollbar" = dontDistribute super."rollbar"; - "roller" = dontDistribute super."roller"; - "rolling-queue" = dontDistribute super."rolling-queue"; - "roman-numerals" = dontDistribute super."roman-numerals"; - "romkan" = dontDistribute super."romkan"; - "roots" = dontDistribute super."roots"; - "rope" = dontDistribute super."rope"; - "rosa" = dontDistribute super."rosa"; - "rose-trie" = dontDistribute super."rose-trie"; - "roshask" = dontDistribute super."roshask"; - "rosso" = dontDistribute super."rosso"; - "rot13" = dontDistribute super."rot13"; - "roundRobin" = dontDistribute super."roundRobin"; - "rounding" = dontDistribute super."rounding"; - "roundtrip" = dontDistribute super."roundtrip"; - "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; - "roundtrip-string" = dontDistribute super."roundtrip-string"; - "roundtrip-xml" = dontDistribute super."roundtrip-xml"; - "route-generator" = dontDistribute super."route-generator"; - "route-planning" = dontDistribute super."route-planning"; - "rowrecord" = dontDistribute super."rowrecord"; - "rpc" = dontDistribute super."rpc"; - "rpc-framework" = dontDistribute super."rpc-framework"; - "rpf" = dontDistribute super."rpf"; - "rpm" = dontDistribute super."rpm"; - "rsagl" = dontDistribute super."rsagl"; - "rsagl-frp" = dontDistribute super."rsagl-frp"; - "rsagl-math" = dontDistribute super."rsagl-math"; - "rspp" = dontDistribute super."rspp"; - "rss" = dontDistribute super."rss"; - "rss2irc" = dontDistribute super."rss2irc"; - "rtcm" = dontDistribute super."rtcm"; - "rtld" = dontDistribute super."rtld"; - "rtlsdr" = dontDistribute super."rtlsdr"; - "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; - "rtorrent-state" = dontDistribute super."rtorrent-state"; - "rts-loader" = dontDistribute super."rts-loader"; - "rubberband" = dontDistribute super."rubberband"; - "ruby-marshal" = dontDistribute super."ruby-marshal"; - "ruby-qq" = dontDistribute super."ruby-qq"; - "ruff" = dontDistribute super."ruff"; - "ruin" = dontDistribute super."ruin"; - "ruler" = dontDistribute super."ruler"; - "ruler-core" = dontDistribute super."ruler-core"; - "rungekutta" = dontDistribute super."rungekutta"; - "runghc" = dontDistribute super."runghc"; - "rwlock" = dontDistribute super."rwlock"; - "rws" = dontDistribute super."rws"; - "s-cargot" = dontDistribute super."s-cargot"; - "safe-access" = dontDistribute super."safe-access"; - "safe-exceptions" = dontDistribute super."safe-exceptions"; - "safe-failure" = dontDistribute super."safe-failure"; - "safe-failure-cme" = dontDistribute super."safe-failure-cme"; - "safe-freeze" = dontDistribute super."safe-freeze"; - "safe-globals" = dontDistribute super."safe-globals"; - "safe-lazy-io" = dontDistribute super."safe-lazy-io"; - "safe-length" = dontDistribute super."safe-length"; - "safe-plugins" = dontDistribute super."safe-plugins"; - "safe-printf" = dontDistribute super."safe-printf"; - "safeint" = dontDistribute super."safeint"; - "safepath" = dontDistribute super."safepath"; - "safer-file-handles" = dontDistribute super."safer-file-handles"; - "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; - "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; - "saferoute" = dontDistribute super."saferoute"; - "sai-shape-syb" = dontDistribute super."sai-shape-syb"; - "saltine" = dontDistribute super."saltine"; - "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; - "salvia" = dontDistribute super."salvia"; - "salvia-demo" = dontDistribute super."salvia-demo"; - "salvia-extras" = dontDistribute super."salvia-extras"; - "salvia-protocol" = dontDistribute super."salvia-protocol"; - "salvia-sessions" = dontDistribute super."salvia-sessions"; - "salvia-websocket" = dontDistribute super."salvia-websocket"; - "sample-frame" = dontDistribute super."sample-frame"; - "sample-frame-np" = dontDistribute super."sample-frame-np"; - "samtools" = dontDistribute super."samtools"; - "samtools-conduit" = dontDistribute super."samtools-conduit"; - "samtools-enumerator" = dontDistribute super."samtools-enumerator"; - "samtools-iteratee" = dontDistribute super."samtools-iteratee"; - "sandi" = doDistribute super."sandi_0_3_6"; - "sandlib" = dontDistribute super."sandlib"; - "sarasvati" = dontDistribute super."sarasvati"; - "sarsi" = dontDistribute super."sarsi"; - "sasl" = dontDistribute super."sasl"; - "sat" = dontDistribute super."sat"; - "sat-micro-hs" = dontDistribute super."sat-micro-hs"; - "satchmo" = dontDistribute super."satchmo"; - "satchmo-backends" = dontDistribute super."satchmo-backends"; - "satchmo-examples" = dontDistribute super."satchmo-examples"; - "satchmo-funsat" = dontDistribute super."satchmo-funsat"; - "satchmo-minisat" = dontDistribute super."satchmo-minisat"; - "satchmo-toysat" = dontDistribute super."satchmo-toysat"; - "sbp" = dontDistribute super."sbp"; - "sbp2udp" = dontDistribute super."sbp2udp"; - "sbv" = doDistribute super."sbv_5_11"; - "sbvPlugin" = dontDistribute super."sbvPlugin"; - "sc3-rdu" = dontDistribute super."sc3-rdu"; - "scalable-server" = dontDistribute super."scalable-server"; - "scaleimage" = dontDistribute super."scaleimage"; - "scalp-webhooks" = dontDistribute super."scalp-webhooks"; - "scan" = dontDistribute super."scan"; - "scan-vector-machine" = dontDistribute super."scan-vector-machine"; - "scanner-attoparsec" = dontDistribute super."scanner-attoparsec"; - "scat" = dontDistribute super."scat"; - "scc" = dontDistribute super."scc"; - "scenegraph" = dontDistribute super."scenegraph"; - "scgi" = dontDistribute super."scgi"; - "schedevr" = dontDistribute super."schedevr"; - "schedule-planner" = dontDistribute super."schedule-planner"; - "schedyield" = dontDistribute super."schedyield"; - "scholdoc" = dontDistribute super."scholdoc"; - "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; - "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; - "scholdoc-types" = dontDistribute super."scholdoc-types"; - "schonfinkeling" = dontDistribute super."schonfinkeling"; - "sci-ratio" = dontDistribute super."sci-ratio"; - "science-constants" = dontDistribute super."science-constants"; - "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; - "scion" = dontDistribute super."scion"; - "scion-browser" = dontDistribute super."scion-browser"; - "scons2dot" = dontDistribute super."scons2dot"; - "scope" = dontDistribute super."scope"; - "scope-cairo" = dontDistribute super."scope-cairo"; - "scottish" = dontDistribute super."scottish"; - "scotty-binding-play" = dontDistribute super."scotty-binding-play"; - "scotty-blaze" = dontDistribute super."scotty-blaze"; - "scotty-cookie" = dontDistribute super."scotty-cookie"; - "scotty-fay" = dontDistribute super."scotty-fay"; - "scotty-hastache" = dontDistribute super."scotty-hastache"; - "scotty-params-parser" = dontDistribute super."scotty-params-parser"; - "scotty-resource" = dontDistribute super."scotty-resource"; - "scotty-rest" = dontDistribute super."scotty-rest"; - "scotty-session" = dontDistribute super."scotty-session"; - "scotty-tls" = dontDistribute super."scotty-tls"; - "scotty-view" = dontDistribute super."scotty-view"; - "scp-streams" = dontDistribute super."scp-streams"; - "scrabble-bot" = dontDistribute super."scrabble-bot"; - "scrape-changes" = dontDistribute super."scrape-changes"; - "scrobble" = dontDistribute super."scrobble"; - "scroll" = dontDistribute super."scroll"; - "scrz" = dontDistribute super."scrz"; - "scyther-proof" = dontDistribute super."scyther-proof"; - "sde-solver" = dontDistribute super."sde-solver"; - "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; - "sdl2" = doDistribute super."sdl2_2_1_2_1"; - "sdl2-cairo" = dontDistribute super."sdl2-cairo"; - "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; - "sdl2-compositor" = dontDistribute super."sdl2-compositor"; - "sdl2-image" = dontDistribute super."sdl2-image"; - "sdl2-ttf" = dontDistribute super."sdl2-ttf"; - "sdnv" = dontDistribute super."sdnv"; - "sdr" = dontDistribute super."sdr"; - "seacat" = dontDistribute super."seacat"; - "seal-module" = dontDistribute super."seal-module"; - "search" = dontDistribute super."search"; - "sec" = dontDistribute super."sec"; - "secd" = dontDistribute super."secd"; - "secdh" = dontDistribute super."secdh"; - "seclib" = dontDistribute super."seclib"; - "second-transfer" = dontDistribute super."second-transfer"; - "secp256k1" = dontDistribute super."secp256k1"; - "secret-santa" = dontDistribute super."secret-santa"; - "secret-sharing" = dontDistribute super."secret-sharing"; - "secrm" = dontDistribute super."secrm"; - "secure-sockets" = dontDistribute super."secure-sockets"; - "sednaDBXML" = dontDistribute super."sednaDBXML"; - "select" = dontDistribute super."select"; - "selectors" = dontDistribute super."selectors"; - "selenium" = dontDistribute super."selenium"; - "selenium-server" = dontDistribute super."selenium-server"; - "selfrestart" = dontDistribute super."selfrestart"; - "selinux" = dontDistribute super."selinux"; - "semaphore-plus" = dontDistribute super."semaphore-plus"; - "semi-iso" = dontDistribute super."semi-iso"; - "semibounded-lattices" = dontDistribute super."semibounded-lattices"; - "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; - "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; - "semigroups" = doDistribute super."semigroups_0_18_1"; - "semigroups-actions" = dontDistribute super."semigroups-actions"; - "semiring" = dontDistribute super."semiring"; - "semver-range" = dontDistribute super."semver-range"; - "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; - "sensei" = dontDistribute super."sensei"; - "sensenet" = dontDistribute super."sensenet"; - "sentence-jp" = dontDistribute super."sentence-jp"; - "sentry" = dontDistribute super."sentry"; - "senza" = dontDistribute super."senza"; - "separated" = dontDistribute super."separated"; - "seqaid" = dontDistribute super."seqaid"; - "seqid" = dontDistribute super."seqid"; - "seqid-streams" = dontDistribute super."seqid-streams"; - "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; - "sequence" = dontDistribute super."sequence"; - "sequent-core" = dontDistribute super."sequent-core"; - "sequential-index" = dontDistribute super."sequential-index"; - "sequor" = dontDistribute super."sequor"; - "serial" = dontDistribute super."serial"; - "serial-test-generators" = dontDistribute super."serial-test-generators"; - "serpentine" = dontDistribute super."serpentine"; - "serv" = dontDistribute super."serv"; - "serv-wai" = dontDistribute super."serv-wai"; - "servant-aeson-specs" = dontDistribute super."servant-aeson-specs"; - "servant-auth-cookie" = dontDistribute super."servant-auth-cookie"; - "servant-auth-hmac" = dontDistribute super."servant-auth-hmac"; - "servant-auth-token" = dontDistribute super."servant-auth-token"; - "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; - "servant-cassava" = doDistribute super."servant-cassava_0_7_1"; - "servant-csharp" = dontDistribute super."servant-csharp"; - "servant-ede" = dontDistribute super."servant-ede"; - "servant-elm" = dontDistribute super."servant-elm"; - "servant-examples" = dontDistribute super."servant-examples"; - "servant-github" = dontDistribute super."servant-github"; - "servant-haxl-client" = dontDistribute super."servant-haxl-client"; - "servant-jquery" = dontDistribute super."servant-jquery"; - "servant-matrix-param" = dontDistribute super."servant-matrix-param"; - "servant-pandoc" = dontDistribute super."servant-pandoc"; - "servant-pool" = dontDistribute super."servant-pool"; - "servant-postgresql" = dontDistribute super."servant-postgresql"; - "servant-purescript" = dontDistribute super."servant-purescript"; - "servant-quickcheck" = dontDistribute super."servant-quickcheck"; - "servant-response" = dontDistribute super."servant-response"; - "servant-router" = dontDistribute super."servant-router"; - "servant-scotty" = dontDistribute super."servant-scotty"; - "servant-smsc-ru" = dontDistribute super."servant-smsc-ru"; - "servant-subscriber" = dontDistribute super."servant-subscriber"; - "servant-swagger" = doDistribute super."servant-swagger_1_0_3"; - "servant-swagger-ui" = dontDistribute super."servant-swagger-ui"; - "server-generic" = dontDistribute super."server-generic"; - "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; - "sessions" = dontDistribute super."sessions"; - "set-cover" = dontDistribute super."set-cover"; - "set-with" = dontDistribute super."set-with"; - "setdown" = dontDistribute super."setdown"; - "setgame" = dontDistribute super."setgame"; - "setops" = dontDistribute super."setops"; - "setters" = dontDistribute super."setters"; - "settings" = dontDistribute super."settings"; - "sexp" = dontDistribute super."sexp"; - "sexp-grammar" = dontDistribute super."sexp-grammar"; - "sexp-show" = dontDistribute super."sexp-show"; - "sexpr" = dontDistribute super."sexpr"; - "sext" = dontDistribute super."sext"; - "sfml-audio" = dontDistribute super."sfml-audio"; - "sfmt" = dontDistribute super."sfmt"; - "sfnt2woff" = dontDistribute super."sfnt2woff"; - "sgd" = dontDistribute super."sgd"; - "sgf" = dontDistribute super."sgf"; - "sgrep" = dontDistribute super."sgrep"; - "sha-streams" = dontDistribute super."sha-streams"; - "shadower" = dontDistribute super."shadower"; - "shadowsocks" = dontDistribute super."shadowsocks"; - "shady-gen" = dontDistribute super."shady-gen"; - "shady-graphics" = dontDistribute super."shady-graphics"; - "shake-cabal-build" = dontDistribute super."shake-cabal-build"; - "shake-extras" = dontDistribute super."shake-extras"; - "shake-language-c" = doDistribute super."shake-language-c_0_9_1"; - "shake-minify" = dontDistribute super."shake-minify"; - "shake-pack" = dontDistribute super."shake-pack"; - "shake-persist" = dontDistribute super."shake-persist"; - "shaker" = dontDistribute super."shaker"; - "shakespeare" = doDistribute super."shakespeare_2_0_9"; - "shakespeare-babel" = dontDistribute super."shakespeare-babel"; - "shakespeare-css" = dontDistribute super."shakespeare-css"; - "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; - "shakespeare-js" = dontDistribute super."shakespeare-js"; - "shakespeare-sass" = dontDistribute super."shakespeare-sass"; - "shakespeare-text" = dontDistribute super."shakespeare-text"; - "shana" = dontDistribute super."shana"; - "shapefile" = dontDistribute super."shapefile"; - "shapely-data" = dontDistribute super."shapely-data"; - "sharc-timbre" = dontDistribute super."sharc-timbre"; - "shared-buffer" = dontDistribute super."shared-buffer"; - "shared-fields" = dontDistribute super."shared-fields"; - "shared-memory" = dontDistribute super."shared-memory"; - "sharedio" = dontDistribute super."sharedio"; - "she" = dontDistribute super."she"; - "shelduck" = dontDistribute super."shelduck"; - "shell-escape" = dontDistribute super."shell-escape"; - "shell-monad" = dontDistribute super."shell-monad"; - "shell-pipe" = dontDistribute super."shell-pipe"; - "shellish" = dontDistribute super."shellish"; - "shellmate" = dontDistribute super."shellmate"; - "shellmate-extras" = dontDistribute super."shellmate-extras"; - "shelly-extra" = dontDistribute super."shelly-extra"; - "shine" = dontDistribute super."shine"; - "shine-varying" = dontDistribute super."shine-varying"; - "shivers-cfg" = dontDistribute super."shivers-cfg"; - "shoap" = dontDistribute super."shoap"; - "shortcircuit" = dontDistribute super."shortcircuit"; - "shorten-strings" = dontDistribute super."shorten-strings"; - "show" = dontDistribute super."show"; - "show-type" = dontDistribute super."show-type"; - "showdown" = dontDistribute super."showdown"; - "shpider" = dontDistribute super."shpider"; - "shplit" = dontDistribute super."shplit"; - "shqq" = dontDistribute super."shqq"; - "shuffle" = dontDistribute super."shuffle"; - "sieve" = dontDistribute super."sieve"; - "sifflet" = dontDistribute super."sifflet"; - "sifflet-lib" = dontDistribute super."sifflet-lib"; - "sign" = dontDistribute super."sign"; - "signals" = dontDistribute super."signals"; - "signed-multiset" = dontDistribute super."signed-multiset"; - "simd" = dontDistribute super."simd"; - "simgi" = dontDistribute super."simgi"; - "simple-actors" = dontDistribute super."simple-actors"; - "simple-atom" = dontDistribute super."simple-atom"; - "simple-bluetooth" = dontDistribute super."simple-bluetooth"; - "simple-c-value" = dontDistribute super."simple-c-value"; - "simple-conduit" = dontDistribute super."simple-conduit"; - "simple-config" = dontDistribute super."simple-config"; - "simple-css" = dontDistribute super."simple-css"; - "simple-download" = dontDistribute super."simple-download"; - "simple-effects" = dontDistribute super."simple-effects"; - "simple-eval" = dontDistribute super."simple-eval"; - "simple-firewire" = dontDistribute super."simple-firewire"; - "simple-form" = dontDistribute super."simple-form"; - "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; - "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; - "simple-get-opt" = dontDistribute super."simple-get-opt"; - "simple-index" = dontDistribute super."simple-index"; - "simple-log-syslog" = dontDistribute super."simple-log-syslog"; - "simple-logger" = dontDistribute super."simple-logger"; - "simple-neural-networks" = dontDistribute super."simple-neural-networks"; - "simple-nix" = dontDistribute super."simple-nix"; - "simple-observer" = dontDistribute super."simple-observer"; - "simple-pascal" = dontDistribute super."simple-pascal"; - "simple-pipe" = dontDistribute super."simple-pipe"; - "simple-rope" = dontDistribute super."simple-rope"; - "simple-server" = dontDistribute super."simple-server"; - "simple-sessions" = dontDistribute super."simple-sessions"; - "simple-sql-parser" = dontDistribute super."simple-sql-parser"; - "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; - "simple-tabular" = dontDistribute super."simple-tabular"; - "simple-tar" = dontDistribute super."simple-tar"; - "simple-vec3" = dontDistribute super."simple-vec3"; - "simple-zipper" = dontDistribute super."simple-zipper"; - "simpleargs" = dontDistribute super."simpleargs"; - "simpleirc-lens" = dontDistribute super."simpleirc-lens"; - "simplenote" = dontDistribute super."simplenote"; - "simpleprelude" = dontDistribute super."simpleprelude"; - "simplesmtpclient" = dontDistribute super."simplesmtpclient"; - "simplessh" = dontDistribute super."simplessh"; - "simplest-sqlite" = dontDistribute super."simplest-sqlite"; - "simplex" = dontDistribute super."simplex"; - "simplex-basic" = dontDistribute super."simplex-basic"; - "simseq" = dontDistribute super."simseq"; - "simtreelo" = dontDistribute super."simtreelo"; - "sindre" = dontDistribute super."sindre"; - "singleton-bool" = dontDistribute super."singleton-bool"; - "singleton-nats" = dontDistribute super."singleton-nats"; - "singletons" = doDistribute super."singletons_2_0_1"; - "sink" = dontDistribute super."sink"; - "siphon" = dontDistribute super."siphon"; - "sirkel" = dontDistribute super."sirkel"; - "sitemap" = dontDistribute super."sitemap"; - "size-based" = dontDistribute super."size-based"; - "sized" = dontDistribute super."sized"; - "sized-types" = dontDistribute super."sized-types"; - "sized-vector" = dontDistribute super."sized-vector"; - "sizes" = dontDistribute super."sizes"; - "sjsp" = dontDistribute super."sjsp"; - "skeleton" = dontDistribute super."skeleton"; - "skell" = dontDistribute super."skell"; - "skemmtun" = dontDistribute super."skemmtun"; - "skulk" = dontDistribute super."skulk"; - "skype4hs" = dontDistribute super."skype4hs"; - "skypelogexport" = dontDistribute super."skypelogexport"; - "slack" = dontDistribute super."slack"; - "slack-api" = dontDistribute super."slack-api"; - "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; - "slave-thread" = doDistribute super."slave-thread_1_0_1_1"; - "sleep" = dontDistribute super."sleep"; - "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; - "slidemews" = dontDistribute super."slidemews"; - "slim" = dontDistribute super."slim"; - "sloane" = dontDistribute super."sloane"; - "slot-lambda" = dontDistribute super."slot-lambda"; - "sloth" = dontDistribute super."sloth"; - "slug" = doDistribute super."slug_0_1_4"; - "smallarray" = dontDistribute super."smallarray"; - "smallcheck-laws" = dontDistribute super."smallcheck-laws"; - "smallcheck-lens" = dontDistribute super."smallcheck-lens"; - "smallcheck-series" = dontDistribute super."smallcheck-series"; - "smallpt-hs" = dontDistribute super."smallpt-hs"; - "smallstring" = dontDistribute super."smallstring"; - "smaoin" = dontDistribute super."smaoin"; - "smartGroup" = dontDistribute super."smartGroup"; - "smartcheck" = dontDistribute super."smartcheck"; - "smartconstructor" = dontDistribute super."smartconstructor"; - "smartword" = dontDistribute super."smartword"; - "sme" = dontDistribute super."sme"; - "smerdyakov" = dontDistribute super."smerdyakov"; - "smoothie" = doDistribute super."smoothie_0_4_2_2"; - "smsaero" = dontDistribute super."smsaero"; - "smt-lib" = dontDistribute super."smt-lib"; - "smtlib2" = dontDistribute super."smtlib2"; - "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; - "smtp2mta" = dontDistribute super."smtp2mta"; - "smtps-gmail" = dontDistribute super."smtps-gmail"; - "snake" = dontDistribute super."snake"; - "snake-game" = dontDistribute super."snake-game"; - "snap" = doDistribute super."snap_0_14_0_7"; - "snap-accept" = dontDistribute super."snap-accept"; - "snap-app" = dontDistribute super."snap-app"; - "snap-auth-cli" = dontDistribute super."snap-auth-cli"; - "snap-blaze" = dontDistribute super."snap-blaze"; - "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; - "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; - "snap-core" = doDistribute super."snap-core_0_9_8_0"; - "snap-cors" = dontDistribute super."snap-cors"; - "snap-elm" = dontDistribute super."snap-elm"; - "snap-error-collector" = dontDistribute super."snap-error-collector"; - "snap-extras" = dontDistribute super."snap-extras"; - "snap-language" = dontDistribute super."snap-language"; - "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; - "snap-loader-static" = dontDistribute super."snap-loader-static"; - "snap-predicates" = dontDistribute super."snap-predicates"; - "snap-routes" = dontDistribute super."snap-routes"; - "snap-server" = doDistribute super."snap-server_0_9_5_1"; - "snap-templates" = dontDistribute super."snap-templates"; - "snap-testing" = dontDistribute super."snap-testing"; - "snap-utils" = dontDistribute super."snap-utils"; - "snap-web-routes" = dontDistribute super."snap-web-routes"; - "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; - "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; - "snaplet-amqp" = dontDistribute super."snaplet-amqp"; - "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; - "snaplet-coffee" = dontDistribute super."snaplet-coffee"; - "snaplet-css-min" = dontDistribute super."snaplet-css-min"; - "snaplet-environments" = dontDistribute super."snaplet-environments"; - "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; - "snaplet-hasql" = dontDistribute super."snaplet-hasql"; - "snaplet-haxl" = dontDistribute super."snaplet-haxl"; - "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; - "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; - "snaplet-i18n" = dontDistribute super."snaplet-i18n"; - "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; - "snaplet-lss" = dontDistribute super."snaplet-lss"; - "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; - "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; - "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; - "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; - "snaplet-oauth" = dontDistribute super."snaplet-oauth"; - "snaplet-persistent" = dontDistribute super."snaplet-persistent"; - "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; - "snaplet-postmark" = dontDistribute super."snaplet-postmark"; - "snaplet-purescript" = dontDistribute super."snaplet-purescript"; - "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; - "snaplet-redis" = dontDistribute super."snaplet-redis"; - "snaplet-redson" = dontDistribute super."snaplet-redson"; - "snaplet-rest" = dontDistribute super."snaplet-rest"; - "snaplet-riak" = dontDistribute super."snaplet-riak"; - "snaplet-sass" = dontDistribute super."snaplet-sass"; - "snaplet-scoped-session" = dontDistribute super."snaplet-scoped-session"; - "snaplet-sedna" = dontDistribute super."snaplet-sedna"; - "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; - "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; - "snaplet-stripe" = dontDistribute super."snaplet-stripe"; - "snaplet-tasks" = dontDistribute super."snaplet-tasks"; - "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; - "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; - "snappy" = dontDistribute super."snappy"; - "snappy-conduit" = dontDistribute super."snappy-conduit"; - "snappy-framing" = dontDistribute super."snappy-framing"; - "snappy-iteratee" = dontDistribute super."snappy-iteratee"; - "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; - "sneakyterm" = dontDistribute super."sneakyterm"; - "sneathlane-haste" = dontDistribute super."sneathlane-haste"; - "snippet-extractor" = dontDistribute super."snippet-extractor"; - "snm" = dontDistribute super."snm"; - "snow-white" = dontDistribute super."snow-white"; - "snowball" = dontDistribute super."snowball"; - "snowglobe" = dontDistribute super."snowglobe"; - "soap" = doDistribute super."soap_0_2_3_0"; - "sock2stream" = dontDistribute super."sock2stream"; - "sockaddr" = dontDistribute super."sockaddr"; - "socket" = doDistribute super."socket_0_6_0_1"; - "socket-activation" = dontDistribute super."socket-activation"; - "socket-sctp" = dontDistribute super."socket-sctp"; - "socketio" = dontDistribute super."socketio"; - "socketson" = dontDistribute super."socketson"; - "soegtk" = dontDistribute super."soegtk"; - "solga" = dontDistribute super."solga"; - "solga-swagger" = dontDistribute super."solga-swagger"; - "solr" = dontDistribute super."solr"; - "sonic-visualiser" = dontDistribute super."sonic-visualiser"; - "sophia" = dontDistribute super."sophia"; - "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; - "sorted" = dontDistribute super."sorted"; - "sorted-list" = doDistribute super."sorted-list_0_1_6_1"; - "sorting" = dontDistribute super."sorting"; - "sorty" = dontDistribute super."sorty"; - "sound-collage" = dontDistribute super."sound-collage"; - "sounddelay" = dontDistribute super."sounddelay"; - "source-code-server" = dontDistribute super."source-code-server"; - "sousit" = dontDistribute super."sousit"; - "sox" = dontDistribute super."sox"; - "soxlib" = dontDistribute super."soxlib"; - "soyuz" = dontDistribute super."soyuz"; - "spacefill" = dontDistribute super."spacefill"; - "spacepart" = dontDistribute super."spacepart"; - "spaceprobe" = dontDistribute super."spaceprobe"; - "spanout" = dontDistribute super."spanout"; - "sparkle" = dontDistribute super."sparkle"; - "sparse" = dontDistribute super."sparse"; - "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; - "sparsebit" = dontDistribute super."sparsebit"; - "sparsecheck" = dontDistribute super."sparsecheck"; - "sparser" = dontDistribute super."sparser"; - "spata" = dontDistribute super."spata"; - "spatial-math" = dontDistribute super."spatial-math"; - "spawn" = dontDistribute super."spawn"; - "spe" = dontDistribute super."spe"; - "special-functors" = dontDistribute super."special-functors"; - "special-keys" = dontDistribute super."special-keys"; - "specialize-th" = dontDistribute super."specialize-th"; - "species" = dontDistribute super."species"; - "speculation-transformers" = dontDistribute super."speculation-transformers"; - "spelling-suggest" = dontDistribute super."spelling-suggest"; - "sphero" = dontDistribute super."sphero"; - "sphinx-cli" = dontDistribute super."sphinx-cli"; - "spice" = dontDistribute super."spice"; - "spike" = dontDistribute super."spike"; - "spine" = dontDistribute super."spine"; - "spir-v" = dontDistribute super."spir-v"; - "splay" = dontDistribute super."splay"; - "splaytree" = dontDistribute super."splaytree"; - "spline3" = dontDistribute super."spline3"; - "splines" = dontDistribute super."splines"; - "split-channel" = dontDistribute super."split-channel"; - "split-record" = dontDistribute super."split-record"; - "split-tchan" = dontDistribute super."split-tchan"; - "splitter" = dontDistribute super."splitter"; - "splot" = dontDistribute super."splot"; - "spoonutil" = dontDistribute super."spoonutil"; - "spoty" = dontDistribute super."spoty"; - "spreadsheet" = dontDistribute super."spreadsheet"; - "spritz" = dontDistribute super."spritz"; - "sproxy" = dontDistribute super."sproxy"; - "sproxy-web" = dontDistribute super."sproxy-web"; - "spsa" = dontDistribute super."spsa"; - "spy" = dontDistribute super."spy"; - "sql-simple" = dontDistribute super."sql-simple"; - "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; - "sql-simple-pool" = dontDistribute super."sql-simple-pool"; - "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; - "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; - "sqlite" = dontDistribute super."sqlite"; - "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; - "sqlvalue-list" = dontDistribute super."sqlvalue-list"; - "squeeze" = dontDistribute super."squeeze"; - "sr-extra" = dontDistribute super."sr-extra"; - "srcinst" = dontDistribute super."srcinst"; - "srec" = dontDistribute super."srec"; - "sscgi" = dontDistribute super."sscgi"; - "sscript" = dontDistribute super."sscript"; - "ssh" = dontDistribute super."ssh"; - "sshd-lint" = dontDistribute super."sshd-lint"; - "sshtun" = dontDistribute super."sshtun"; - "sssp" = dontDistribute super."sssp"; - "sstable" = dontDistribute super."sstable"; - "ssv" = dontDistribute super."ssv"; - "stable-heap" = dontDistribute super."stable-heap"; - "stable-maps" = dontDistribute super."stable-maps"; - "stable-marriage" = dontDistribute super."stable-marriage"; - "stable-memo" = dontDistribute super."stable-memo"; - "stable-tree" = dontDistribute super."stable-tree"; - "stache" = dontDistribute super."stache"; - "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; - "stack-prism" = dontDistribute super."stack-prism"; - "stack-run" = dontDistribute super."stack-run"; - "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; - "stackage-upload" = doDistribute super."stackage-upload_0_1_0_5"; - "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; - "standalone-haddock" = dontDistribute super."standalone-haddock"; - "star-to-star" = dontDistribute super."star-to-star"; - "star-to-star-contra" = dontDistribute super."star-to-star-contra"; - "starling" = dontDistribute super."starling"; - "starrover2" = dontDistribute super."starrover2"; - "stash" = dontDistribute super."stash"; - "state" = dontDistribute super."state"; - "state-bag" = dontDistribute super."state-bag"; - "state-record" = dontDistribute super."state-record"; - "statechart" = dontDistribute super."statechart"; - "stateful-mtl" = dontDistribute super."stateful-mtl"; - "statethread" = dontDistribute super."statethread"; - "statgrab" = dontDistribute super."statgrab"; - "static-hash" = dontDistribute super."static-hash"; - "static-resources" = dontDistribute super."static-resources"; - "staticanalysis" = dontDistribute super."staticanalysis"; - "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; - "statistics-fusion" = dontDistribute super."statistics-fusion"; - "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; - "stats" = dontDistribute super."stats"; - "statsd" = dontDistribute super."statsd"; - "statsd-client" = dontDistribute super."statsd-client"; - "statsd-datadog" = dontDistribute super."statsd-datadog"; - "statvfs" = dontDistribute super."statvfs"; - "stb-image" = dontDistribute super."stb-image"; - "stb-truetype" = dontDistribute super."stb-truetype"; - "stdata" = dontDistribute super."stdata"; - "stdf" = dontDistribute super."stdf"; - "steambrowser" = dontDistribute super."steambrowser"; - "steeloverseer" = dontDistribute super."steeloverseer"; - "stemmer" = dontDistribute super."stemmer"; - "step-function" = dontDistribute super."step-function"; - "stepwise" = dontDistribute super."stepwise"; - "stgi" = dontDistribute super."stgi"; - "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; - "stitch" = dontDistribute super."stitch"; - "stm-channelize" = dontDistribute super."stm-channelize"; - "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; - "stm-conduit" = doDistribute super."stm-conduit_2_8_0"; - "stm-containers" = doDistribute super."stm-containers_0_2_14"; - "stm-firehose" = dontDistribute super."stm-firehose"; - "stm-io-hooks" = dontDistribute super."stm-io-hooks"; - "stm-lifted" = dontDistribute super."stm-lifted"; - "stm-linkedlist" = dontDistribute super."stm-linkedlist"; - "stm-orelse-io" = dontDistribute super."stm-orelse-io"; - "stm-promise" = dontDistribute super."stm-promise"; - "stm-queue-extras" = dontDistribute super."stm-queue-extras"; - "stm-sbchan" = dontDistribute super."stm-sbchan"; - "stm-split" = dontDistribute super."stm-split"; - "stm-tlist" = dontDistribute super."stm-tlist"; - "stmcontrol" = dontDistribute super."stmcontrol"; - "stochastic" = dontDistribute super."stochastic"; - "stomp-conduit" = dontDistribute super."stomp-conduit"; - "stomp-patterns" = dontDistribute super."stomp-patterns"; - "stomp-queue" = dontDistribute super."stomp-queue"; - "stompl" = dontDistribute super."stompl"; - "storable" = dontDistribute super."storable"; - "storable-record" = dontDistribute super."storable-record"; - "storable-static-array" = dontDistribute super."storable-static-array"; - "storable-tuple" = dontDistribute super."storable-tuple"; - "storablevector" = dontDistribute super."storablevector"; - "storablevector-carray" = dontDistribute super."storablevector-carray"; - "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; - "store" = dontDistribute super."store"; - "store-core" = dontDistribute super."store-core"; - "str" = dontDistribute super."str"; - "stratosphere" = doDistribute super."stratosphere_0_1_2_1"; - "stratum-tool" = dontDistribute super."stratum-tool"; - "stratux" = dontDistribute super."stratux"; - "stratux-http" = dontDistribute super."stratux-http"; - "stratux-types" = dontDistribute super."stratux-types"; - "stratux-websockets" = dontDistribute super."stratux-websockets"; - "stream" = dontDistribute super."stream"; - "stream-fusion" = dontDistribute super."stream-fusion"; - "stream-monad" = dontDistribute super."stream-monad"; - "streamed" = dontDistribute super."streamed"; - "streaming-eversion" = dontDistribute super."streaming-eversion"; - "streaming-histogram" = dontDistribute super."streaming-histogram"; - "streaming-png" = dontDistribute super."streaming-png"; - "streaming-utils" = dontDistribute super."streaming-utils"; - "streaming-wai" = dontDistribute super."streaming-wai"; - "streams" = doDistribute super."streams_3_2_1"; - "strict-concurrency" = dontDistribute super."strict-concurrency"; - "strict-data" = dontDistribute super."strict-data"; - "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; - "strict-identity" = dontDistribute super."strict-identity"; - "strict-io" = dontDistribute super."strict-io"; - "strictify" = dontDistribute super."strictify"; - "strictly" = dontDistribute super."strictly"; - "string" = dontDistribute super."string"; - "string-convert" = dontDistribute super."string-convert"; - "string-quote" = dontDistribute super."string-quote"; - "string-similarity" = dontDistribute super."string-similarity"; - "string-typelits" = dontDistribute super."string-typelits"; - "stringlike" = dontDistribute super."stringlike"; - "stringprep" = dontDistribute super."stringprep"; - "strings" = dontDistribute super."strings"; - "stringtable-atom" = dontDistribute super."stringtable-atom"; - "strio" = dontDistribute super."strio"; - "stripe" = dontDistribute super."stripe"; - "stripe-core" = doDistribute super."stripe-core_2_0_3"; - "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; - "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; - "strive" = doDistribute super."strive_2_2_2"; - "strptime" = dontDistribute super."strptime"; - "structs" = dontDistribute super."structs"; - "structural-induction" = dontDistribute super."structural-induction"; - "structural-traversal" = dontDistribute super."structural-traversal"; - "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; - "structured-mongoDB" = dontDistribute super."structured-mongoDB"; - "structures" = dontDistribute super."structures"; - "stunclient" = dontDistribute super."stunclient"; - "stunts" = dontDistribute super."stunts"; - "stylish-haskell" = doDistribute super."stylish-haskell_0_5_17_0"; - "stylized" = dontDistribute super."stylized"; - "sub-state" = dontDistribute super."sub-state"; - "subhask" = dontDistribute super."subhask"; - "subleq-toolchain" = dontDistribute super."subleq-toolchain"; - "subnet" = dontDistribute super."subnet"; - "subtitleParser" = dontDistribute super."subtitleParser"; - "subtitles" = dontDistribute super."subtitles"; - "subwordgraph" = dontDistribute super."subwordgraph"; - "suffixarray" = dontDistribute super."suffixarray"; - "suffixtree" = dontDistribute super."suffixtree"; - "sugarhaskell" = dontDistribute super."sugarhaskell"; - "suitable" = dontDistribute super."suitable"; - "sump" = dontDistribute super."sump"; - "sunlight" = dontDistribute super."sunlight"; - "sunroof-compiler" = dontDistribute super."sunroof-compiler"; - "sunroof-examples" = dontDistribute super."sunroof-examples"; - "sunroof-server" = dontDistribute super."sunroof-server"; - "super-user-spark" = dontDistribute super."super-user-spark"; - "supercollider-ht" = dontDistribute super."supercollider-ht"; - "supercollider-midi" = dontDistribute super."supercollider-midi"; - "superdoc" = dontDistribute super."superdoc"; - "supero" = dontDistribute super."supero"; - "supervisor" = dontDistribute super."supervisor"; - "supplemented" = dontDistribute super."supplemented"; - "suspend" = dontDistribute super."suspend"; - "svg2q" = dontDistribute super."svg2q"; - "svgcairo" = dontDistribute super."svgcairo"; - "svgutils" = dontDistribute super."svgutils"; - "svm" = dontDistribute super."svm"; - "svm-light-utils" = dontDistribute super."svm-light-utils"; - "svm-simple" = dontDistribute super."svm-simple"; - "svndump" = dontDistribute super."svndump"; - "swagger2" = doDistribute super."swagger2_2_0_2"; - "swapper" = dontDistribute super."swapper"; - "swearjure" = dontDistribute super."swearjure"; - "swf" = dontDistribute super."swf"; - "swift-lda" = dontDistribute super."swift-lda"; - "swish" = dontDistribute super."swish"; - "sws" = dontDistribute super."sws"; - "syb-extras" = dontDistribute super."syb-extras"; - "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; - "sylvia" = dontDistribute super."sylvia"; - "sym" = dontDistribute super."sym"; - "sym-plot" = dontDistribute super."sym-plot"; - "symengine" = dontDistribute super."symengine"; - "symengine-hs" = dontDistribute super."symengine-hs"; - "symon" = dontDistribute super."symon"; - "sync" = dontDistribute super."sync"; - "synchronous-channels" = dontDistribute super."synchronous-channels"; - "syncthing-hs" = dontDistribute super."syncthing-hs"; - "synt" = dontDistribute super."synt"; - "syntactic" = dontDistribute super."syntactic"; - "syntactical" = dontDistribute super."syntactical"; - "syntax" = dontDistribute super."syntax"; - "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; - "syntax-example" = dontDistribute super."syntax-example"; - "syntax-example-json" = dontDistribute super."syntax-example-json"; - "syntax-pretty" = dontDistribute super."syntax-pretty"; - "syntax-printer" = dontDistribute super."syntax-printer"; - "syntax-trees" = dontDistribute super."syntax-trees"; - "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; - "synthesizer" = dontDistribute super."synthesizer"; - "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; - "synthesizer-core" = dontDistribute super."synthesizer-core"; - "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; - "synthesizer-filter" = dontDistribute super."synthesizer-filter"; - "synthesizer-inference" = dontDistribute super."synthesizer-inference"; - "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; - "synthesizer-midi" = dontDistribute super."synthesizer-midi"; - "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; - "sys-process" = dontDistribute super."sys-process"; - "system-canonicalpath" = dontDistribute super."system-canonicalpath"; - "system-command" = dontDistribute super."system-command"; - "system-gpio" = dontDistribute super."system-gpio"; - "system-info" = dontDistribute super."system-info"; - "system-inotify" = dontDistribute super."system-inotify"; - "system-lifted" = dontDistribute super."system-lifted"; - "system-locale" = dontDistribute super."system-locale"; - "system-random-effect" = dontDistribute super."system-random-effect"; - "system-test" = dontDistribute super."system-test"; - "system-time-monotonic" = dontDistribute super."system-time-monotonic"; - "system-util" = dontDistribute super."system-util"; - "system-uuid" = dontDistribute super."system-uuid"; - "systemd" = dontDistribute super."systemd"; - "systemstats" = dontDistribute super."systemstats"; - "t-regex" = dontDistribute super."t-regex"; - "t3-client" = dontDistribute super."t3-client"; - "t3-game" = dontDistribute super."t3-game"; - "t3-server" = dontDistribute super."t3-server"; - "ta" = dontDistribute super."ta"; - "table" = dontDistribute super."table"; - "table-layout" = dontDistribute super."table-layout"; - "table-tennis" = dontDistribute super."table-tennis"; - "tableaux" = dontDistribute super."tableaux"; - "tables" = dontDistribute super."tables"; - "tablestorage" = dontDistribute super."tablestorage"; - "tabloid" = dontDistribute super."tabloid"; - "taffybar" = dontDistribute super."taffybar"; - "tag-bits" = dontDistribute super."tag-bits"; - "tag-stream" = dontDistribute super."tag-stream"; - "tagchup" = dontDistribute super."tagchup"; - "tagged" = doDistribute super."tagged_0_8_4"; - "tagged-exception-core" = dontDistribute super."tagged-exception-core"; - "tagged-list" = dontDistribute super."tagged-list"; - "tagged-th" = dontDistribute super."tagged-th"; - "tagged-timers" = dontDistribute super."tagged-timers"; - "tagged-transformer" = dontDistribute super."tagged-transformer"; - "tagging" = dontDistribute super."tagging"; - "taglib" = dontDistribute super."taglib"; - "taglib-api" = dontDistribute super."taglib-api"; - "tagset-positional" = dontDistribute super."tagset-positional"; - "tagsoup" = doDistribute super."tagsoup_0_13_10"; - "tagsoup-ht" = dontDistribute super."tagsoup-ht"; - "tagsoup-megaparsec" = dontDistribute super."tagsoup-megaparsec"; - "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; - "tai64" = dontDistribute super."tai64"; - "tak" = dontDistribute super."tak"; - "tak-ai" = dontDistribute super."tak-ai"; - "takahashi" = dontDistribute super."takahashi"; - "takusen-oracle" = dontDistribute super."takusen-oracle"; - "tal" = dontDistribute super."tal"; - "tamarin-prover" = dontDistribute super."tamarin-prover"; - "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; - "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; - "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; - "tamper" = dontDistribute super."tamper"; - "target" = dontDistribute super."target"; - "task" = dontDistribute super."task"; - "task-distribution" = dontDistribute super."task-distribution"; - "taskpool" = dontDistribute super."taskpool"; - "tasty" = doDistribute super."tasty_0_11_0_3"; - "tasty-golden" = doDistribute super."tasty-golden_2_3_1"; - "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; - "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; - "tasty-integrate" = dontDistribute super."tasty-integrate"; - "tasty-laws" = dontDistribute super."tasty-laws"; - "tasty-lens" = dontDistribute super."tasty-lens"; - "tasty-program" = dontDistribute super."tasty-program"; - "tasty-silver" = doDistribute super."tasty-silver_3_1_8_1"; - "tateti-tateti" = dontDistribute super."tateti-tateti"; - "tau" = dontDistribute super."tau"; - "tbox" = dontDistribute super."tbox"; - "tcache-AWS" = dontDistribute super."tcache-AWS"; - "tccli" = dontDistribute super."tccli"; - "tce-conf" = dontDistribute super."tce-conf"; - "tconfig" = dontDistribute super."tconfig"; - "tcp" = dontDistribute super."tcp"; - "tcp-streams" = dontDistribute super."tcp-streams"; - "tdd-util" = dontDistribute super."tdd-util"; - "tdoc" = dontDistribute super."tdoc"; - "teams" = dontDistribute super."teams"; - "teeth" = dontDistribute super."teeth"; - "telegram" = dontDistribute super."telegram"; - "telegram-api" = doDistribute super."telegram-api_0_4_3_1"; - "teleport" = dontDistribute super."teleport"; - "template-default" = dontDistribute super."template-default"; - "template-haskell-util" = dontDistribute super."template-haskell-util"; - "template-hsml" = dontDistribute super."template-hsml"; - "template-yj" = dontDistribute super."template-yj"; - "templateify" = dontDistribute super."templateify"; - "templatepg" = dontDistribute super."templatepg"; - "templater" = dontDistribute super."templater"; - "tempo" = dontDistribute super."tempo"; - "tempodb" = dontDistribute super."tempodb"; - "temporal-csound" = dontDistribute super."temporal-csound"; - "temporal-media" = dontDistribute super."temporal-media"; - "temporal-music-notation" = dontDistribute super."temporal-music-notation"; - "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; - "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; - "temporary-resourcet" = dontDistribute super."temporary-resourcet"; - "tempus" = dontDistribute super."tempus"; - "tempus-fugit" = dontDistribute super."tempus-fugit"; - "tensor" = dontDistribute super."tensor"; - "term-rewriting" = dontDistribute super."term-rewriting"; - "termbox-bindings" = dontDistribute super."termbox-bindings"; - "termination-combinators" = dontDistribute super."termination-combinators"; - "terminfo" = doDistribute super."terminfo_0_4_0_2"; - "terminfo-hs" = dontDistribute super."terminfo-hs"; - "termplot" = dontDistribute super."termplot"; - "terntup" = dontDistribute super."terntup"; - "terrahs" = dontDistribute super."terrahs"; - "tersmu" = dontDistribute super."tersmu"; - "test-fixture" = dontDistribute super."test-fixture"; - "test-framework-doctest" = dontDistribute super."test-framework-doctest"; - "test-framework-golden" = dontDistribute super."test-framework-golden"; - "test-framework-program" = dontDistribute super."test-framework-program"; - "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; - "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; - "test-framework-skip" = dontDistribute super."test-framework-skip"; - "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; - "test-invariant" = dontDistribute super."test-invariant"; - "test-pkg" = dontDistribute super."test-pkg"; - "test-sandbox" = dontDistribute super."test-sandbox"; - "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; - "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; - "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; - "test-shouldbe" = dontDistribute super."test-shouldbe"; - "testPkg" = dontDistribute super."testPkg"; - "testbench" = dontDistribute super."testbench"; - "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; - "testloop" = dontDistribute super."testloop"; - "testpack" = dontDistribute super."testpack"; - "testpattern" = dontDistribute super."testpattern"; - "testrunner" = dontDistribute super."testrunner"; - "tetris" = dontDistribute super."tetris"; - "tex2txt" = dontDistribute super."tex2txt"; - "texmath" = doDistribute super."texmath_0_8_6_4"; - "texrunner" = dontDistribute super."texrunner"; - "text-all" = dontDistribute super."text-all"; - "text-and-plots" = dontDistribute super."text-and-plots"; - "text-conversions" = dontDistribute super."text-conversions"; - "text-format-simple" = dontDistribute super."text-format-simple"; - "text-icu-normalized" = dontDistribute super."text-icu-normalized"; - "text-icu-translit" = dontDistribute super."text-icu-translit"; - "text-json-qq" = dontDistribute super."text-json-qq"; - "text-latin1" = dontDistribute super."text-latin1"; - "text-lips" = dontDistribute super."text-lips"; - "text-loc" = dontDistribute super."text-loc"; - "text-locale-encoding" = dontDistribute super."text-locale-encoding"; - "text-markup" = dontDistribute super."text-markup"; - "text-metrics" = dontDistribute super."text-metrics"; - "text-normal" = dontDistribute super."text-normal"; - "text-position" = dontDistribute super."text-position"; - "text-printer" = dontDistribute super."text-printer"; - "text-regex-replace" = dontDistribute super."text-regex-replace"; - "text-register-machine" = dontDistribute super."text-register-machine"; - "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; - "text-show-instances" = dontDistribute super."text-show-instances"; - "text-stream-decode" = dontDistribute super."text-stream-decode"; - "text-utf7" = dontDistribute super."text-utf7"; - "text-xml-generic" = dontDistribute super."text-xml-generic"; - "text-xml-qq" = dontDistribute super."text-xml-qq"; - "text-zipper" = doDistribute super."text-zipper_0_4"; - "text-zipper-monad" = dontDistribute super."text-zipper-monad"; - "text1" = dontDistribute super."text1"; - "textPlot" = dontDistribute super."textPlot"; - "textmatetags" = dontDistribute super."textmatetags"; - "textocat-api" = dontDistribute super."textocat-api"; - "texts" = dontDistribute super."texts"; - "textual" = dontDistribute super."textual"; - "tfp" = dontDistribute super."tfp"; - "tfp-th" = dontDistribute super."tfp-th"; - "tftp" = dontDistribute super."tftp"; - "tga" = dontDistribute super."tga"; - "th-alpha" = dontDistribute super."th-alpha"; - "th-build" = dontDistribute super."th-build"; - "th-cas" = dontDistribute super."th-cas"; - "th-context" = dontDistribute super."th-context"; - "th-desugar" = doDistribute super."th-desugar_1_5_5"; - "th-fold" = dontDistribute super."th-fold"; - "th-inline-io-action" = dontDistribute super."th-inline-io-action"; - "th-instance-reification" = dontDistribute super."th-instance-reification"; - "th-instances" = dontDistribute super."th-instances"; - "th-kinds" = dontDistribute super."th-kinds"; - "th-kinds-fork" = dontDistribute super."th-kinds-fork"; - "th-orphans" = doDistribute super."th-orphans_0_13_0"; - "th-printf" = dontDistribute super."th-printf"; - "th-sccs" = dontDistribute super."th-sccs"; - "th-traced" = dontDistribute super."th-traced"; - "th-typegraph" = dontDistribute super."th-typegraph"; - "th-utilities" = dontDistribute super."th-utilities"; - "themoviedb" = dontDistribute super."themoviedb"; - "themplate" = dontDistribute super."themplate"; - "thentos-cookie-session" = dontDistribute super."thentos-cookie-session"; - "theoremquest" = dontDistribute super."theoremquest"; - "theoremquest-client" = dontDistribute super."theoremquest-client"; - "these" = doDistribute super."these_0_6_2_1"; - "thespian" = dontDistribute super."thespian"; - "theta-functions" = dontDistribute super."theta-functions"; - "thih" = dontDistribute super."thih"; - "thimk" = dontDistribute super."thimk"; - "thorn" = dontDistribute super."thorn"; - "thread-local-storage" = dontDistribute super."thread-local-storage"; - "threadPool" = dontDistribute super."threadPool"; - "threadmanager" = dontDistribute super."threadmanager"; - "threads-pool" = dontDistribute super."threads-pool"; - "threads-supervisor" = dontDistribute super."threads-supervisor"; - "threadscope" = dontDistribute super."threadscope"; - "threefish" = dontDistribute super."threefish"; - "threepenny-gui" = dontDistribute super."threepenny-gui"; - "thrift" = dontDistribute super."thrift"; - "thrist" = dontDistribute super."thrist"; - "throttle" = dontDistribute super."throttle"; - "throttled-io-loop" = dontDistribute super."throttled-io-loop"; - "thumbnail" = dontDistribute super."thumbnail"; - "tianbar" = dontDistribute super."tianbar"; - "tic-tac-toe" = dontDistribute super."tic-tac-toe"; - "tickle" = dontDistribute super."tickle"; - "tictactoe3d" = dontDistribute super."tictactoe3d"; - "tidal" = doDistribute super."tidal_0_7_1"; - "tidal-midi" = dontDistribute super."tidal-midi"; - "tidal-serial" = dontDistribute super."tidal-serial"; - "tidal-vis" = dontDistribute super."tidal-vis"; - "tie-knot" = dontDistribute super."tie-knot"; - "tiempo" = dontDistribute super."tiempo"; - "tiger" = dontDistribute super."tiger"; - "tight-apply" = dontDistribute super."tight-apply"; - "tightrope" = dontDistribute super."tightrope"; - "tighttp" = dontDistribute super."tighttp"; - "tilings" = dontDistribute super."tilings"; - "timberc" = dontDistribute super."timberc"; - "time-cache" = dontDistribute super."time-cache"; - "time-extras" = dontDistribute super."time-extras"; - "time-exts" = dontDistribute super."time-exts"; - "time-http" = dontDistribute super."time-http"; - "time-interval" = dontDistribute super."time-interval"; - "time-io-access" = dontDistribute super."time-io-access"; - "time-out" = dontDistribute super."time-out"; - "time-patterns" = dontDistribute super."time-patterns"; - "time-qq" = dontDistribute super."time-qq"; - "time-recurrence" = dontDistribute super."time-recurrence"; - "time-series" = dontDistribute super."time-series"; - "time-w3c" = dontDistribute super."time-w3c"; - "timecalc" = dontDistribute super."timecalc"; - "timeconsole" = dontDistribute super."timeconsole"; - "timelens" = dontDistribute super."timelens"; - "timeless" = dontDistribute super."timeless"; - "timelike" = dontDistribute super."timelike"; - "timelike-clock" = dontDistribute super."timelike-clock"; - "timelike-time" = dontDistribute super."timelike-time"; - "timeout" = dontDistribute super."timeout"; - "timeout-control" = dontDistribute super."timeout-control"; - "timeout-with-results" = dontDistribute super."timeout-with-results"; - "timeparsers" = dontDistribute super."timeparsers"; - "timeplot" = dontDistribute super."timeplot"; - "timeprint" = dontDistribute super."timeprint"; - "timers" = dontDistribute super."timers"; - "timers-updatable" = dontDistribute super."timers-updatable"; - "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; - "timestamper" = dontDistribute super."timestamper"; - "timezone-olson-th" = dontDistribute super."timezone-olson-th"; - "timing-convenience" = dontDistribute super."timing-convenience"; - "tinyMesh" = dontDistribute super."tinyMesh"; - "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; - "tip-lib" = dontDistribute super."tip-lib"; - "tiphys" = dontDistribute super."tiphys"; - "titlecase" = dontDistribute super."titlecase"; - "tkhs" = dontDistribute super."tkhs"; - "tkyprof" = dontDistribute super."tkyprof"; - "tld" = dontDistribute super."tld"; - "tls-extra" = dontDistribute super."tls-extra"; - "tmpl" = dontDistribute super."tmpl"; - "tn" = dontDistribute super."tn"; - "tnet" = dontDistribute super."tnet"; - "to-haskell" = dontDistribute super."to-haskell"; - "to-string-class" = dontDistribute super."to-string-class"; - "to-string-instances" = dontDistribute super."to-string-instances"; - "todos" = dontDistribute super."todos"; - "tofromxml" = dontDistribute super."tofromxml"; - "toilet" = dontDistribute super."toilet"; - "tokenify" = dontDistribute super."tokenify"; - "tokenize" = dontDistribute super."tokenize"; - "toktok" = dontDistribute super."toktok"; - "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; - "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; - "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; - "toml" = dontDistribute super."toml"; - "toolshed" = dontDistribute super."toolshed"; - "topkata" = dontDistribute super."topkata"; - "torch" = dontDistribute super."torch"; - "total" = dontDistribute super."total"; - "total-alternative" = dontDistribute super."total-alternative"; - "total-map" = dontDistribute super."total-map"; - "total-maps" = dontDistribute super."total-maps"; - "touched" = dontDistribute super."touched"; - "toysolver" = dontDistribute super."toysolver"; - "tpar" = dontDistribute super."tpar"; - "tpdb" = dontDistribute super."tpdb"; - "trace" = dontDistribute super."trace"; - "trace-call" = dontDistribute super."trace-call"; - "trace-function-call" = dontDistribute super."trace-function-call"; - "traced" = dontDistribute super."traced"; - "tracer" = dontDistribute super."tracer"; - "tracetree" = dontDistribute super."tracetree"; - "tracker" = dontDistribute super."tracker"; - "traildb" = dontDistribute super."traildb"; - "trajectory" = dontDistribute super."trajectory"; - "transactional-events" = dontDistribute super."transactional-events"; - "transf" = dontDistribute super."transf"; - "transformations" = dontDistribute super."transformations"; - "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; - "transformers-compose" = dontDistribute super."transformers-compose"; - "transformers-convert" = dontDistribute super."transformers-convert"; - "transformers-eff" = dontDistribute super."transformers-eff"; - "transformers-free" = dontDistribute super."transformers-free"; - "transformers-runnable" = dontDistribute super."transformers-runnable"; - "transformers-supply" = dontDistribute super."transformers-supply"; - "transient" = dontDistribute super."transient"; - "transient-universe" = dontDistribute super."transient-universe"; - "translatable-intset" = dontDistribute super."translatable-intset"; - "translate" = dontDistribute super."translate"; - "travis" = dontDistribute super."travis"; - "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; - "trawl" = dontDistribute super."trawl"; - "traypoweroff" = dontDistribute super."traypoweroff"; - "tree-monad" = dontDistribute super."tree-monad"; - "treemap" = dontDistribute super."treemap"; - "treemap-html" = dontDistribute super."treemap-html"; - "treemap-html-tools" = dontDistribute super."treemap-html-tools"; - "treersec" = dontDistribute super."treersec"; - "treeviz" = dontDistribute super."treeviz"; - "tremulous-query" = dontDistribute super."tremulous-query"; - "trhsx" = dontDistribute super."trhsx"; - "triangulation" = dontDistribute super."triangulation"; - "trifecta" = doDistribute super."trifecta_1_5_2"; - "trimpolya" = dontDistribute super."trimpolya"; - "tripLL" = dontDistribute super."tripLL"; - "trivia" = dontDistribute super."trivia"; - "trivial-constraint" = dontDistribute super."trivial-constraint"; - "tropical" = dontDistribute super."tropical"; - "truelevel" = dontDistribute super."truelevel"; - "trurl" = dontDistribute super."trurl"; - "truthful" = dontDistribute super."truthful"; - "tsession" = dontDistribute super."tsession"; - "tsession-happstack" = dontDistribute super."tsession-happstack"; - "tskiplist" = dontDistribute super."tskiplist"; - "tslib" = dontDistribute super."tslib"; - "tslogger" = dontDistribute super."tslogger"; - "tsp-viz" = dontDistribute super."tsp-viz"; - "tsparse" = dontDistribute super."tsparse"; - "tst" = dontDistribute super."tst"; - "tsvsql" = dontDistribute super."tsvsql"; - "ttask" = dontDistribute super."ttask"; - "tttool" = doDistribute super."tttool_1_6_1_1"; - "tubes" = dontDistribute super."tubes"; - "tuntap" = dontDistribute super."tuntap"; - "tup-functor" = dontDistribute super."tup-functor"; - "tuple-gen" = dontDistribute super."tuple-gen"; - "tuple-generic" = dontDistribute super."tuple-generic"; - "tuple-hlist" = dontDistribute super."tuple-hlist"; - "tuple-lenses" = dontDistribute super."tuple-lenses"; - "tuple-morph" = dontDistribute super."tuple-morph"; - "tupleinstances" = dontDistribute super."tupleinstances"; - "turing" = dontDistribute super."turing"; - "turing-machines" = dontDistribute super."turing-machines"; - "turing-music" = dontDistribute super."turing-music"; - "turingMachine" = dontDistribute super."turingMachine"; - "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; - "turni" = dontDistribute super."turni"; - "tweak" = dontDistribute super."tweak"; - "twee" = dontDistribute super."twee"; - "twentefp" = dontDistribute super."twentefp"; - "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; - "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; - "twentefp-graphs" = dontDistribute super."twentefp-graphs"; - "twentefp-number" = dontDistribute super."twentefp-number"; - "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; - "twentefp-trees" = dontDistribute super."twentefp-trees"; - "twentefp-websockets" = dontDistribute super."twentefp-websockets"; - "twentyseven" = dontDistribute super."twentyseven"; - "twhs" = dontDistribute super."twhs"; - "twidge" = dontDistribute super."twidge"; - "twilight-stm" = dontDistribute super."twilight-stm"; - "twilio" = dontDistribute super."twilio"; - "twill" = dontDistribute super."twill"; - "twiml" = dontDistribute super."twiml"; - "twine" = dontDistribute super."twine"; - "twisty" = dontDistribute super."twisty"; - "twitch" = dontDistribute super."twitch"; - "twitter" = dontDistribute super."twitter"; - "twitter-enumerator" = dontDistribute super."twitter-enumerator"; - "twitter-feed" = doDistribute super."twitter-feed_0_2_0_7"; - "tx" = dontDistribute super."tx"; - "txt-sushi" = dontDistribute super."txt-sushi"; - "txt2rtf" = dontDistribute super."txt2rtf"; - "txtblk" = dontDistribute super."txtblk"; - "ty" = dontDistribute super."ty"; - "typalyze" = dontDistribute super."typalyze"; - "type-booleans" = dontDistribute super."type-booleans"; - "type-cache" = dontDistribute super."type-cache"; - "type-cereal" = dontDistribute super."type-cereal"; - "type-combinators" = dontDistribute super."type-combinators"; - "type-combinators-quote" = dontDistribute super."type-combinators-quote"; - "type-digits" = dontDistribute super."type-digits"; - "type-equality" = dontDistribute super."type-equality"; - "type-equality-check" = dontDistribute super."type-equality-check"; - "type-fun" = dontDistribute super."type-fun"; - "type-functions" = dontDistribute super."type-functions"; - "type-hint" = dontDistribute super."type-hint"; - "type-int" = dontDistribute super."type-int"; - "type-iso" = dontDistribute super."type-iso"; - "type-level" = dontDistribute super."type-level"; - "type-level-bst" = dontDistribute super."type-level-bst"; - "type-level-natural-number" = dontDistribute super."type-level-natural-number"; - "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; - "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; - "type-level-sets" = dontDistribute super."type-level-sets"; - "type-level-tf" = dontDistribute super."type-level-tf"; - "type-list" = doDistribute super."type-list_0_3_0_4"; - "type-natural" = dontDistribute super."type-natural"; - "type-operators" = dontDistribute super."type-operators"; - "type-ord" = dontDistribute super."type-ord"; - "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; - "type-prelude" = dontDistribute super."type-prelude"; - "type-settheory" = dontDistribute super."type-settheory"; - "type-spec" = dontDistribute super."type-spec"; - "type-spine" = dontDistribute super."type-spine"; - "type-structure" = dontDistribute super."type-structure"; - "type-sub-th" = dontDistribute super."type-sub-th"; - "type-unary" = dontDistribute super."type-unary"; - "typeable-th" = dontDistribute super."typeable-th"; - "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; - "typed-wire" = dontDistribute super."typed-wire"; - "typed-wire-utils" = dontDistribute super."typed-wire-utils"; - "typedquery" = dontDistribute super."typedquery"; - "typehash" = dontDistribute super."typehash"; - "typelevel" = dontDistribute super."typelevel"; - "typelevel-tensor" = dontDistribute super."typelevel-tensor"; - "typeof" = dontDistribute super."typeof"; - "typeparams" = dontDistribute super."typeparams"; - "typesafe-endian" = dontDistribute super."typesafe-endian"; - "typescript-docs" = dontDistribute super."typescript-docs"; - "typical" = dontDistribute super."typical"; - "tz" = doDistribute super."tz_0_1_1_1"; - "uAgda" = dontDistribute super."uAgda"; - "uacpid" = dontDistribute super."uacpid"; - "uber" = dontDistribute super."uber"; - "uberlast" = dontDistribute super."uberlast"; - "uconv" = dontDistribute super."uconv"; - "udbus" = dontDistribute super."udbus"; - "udbus-model" = dontDistribute super."udbus-model"; - "udcode" = dontDistribute super."udcode"; - "udev" = dontDistribute super."udev"; - "uhc-light" = dontDistribute super."uhc-light"; - "uhc-util" = dontDistribute super."uhc-util"; - "uhexdump" = dontDistribute super."uhexdump"; - "uhttpc" = dontDistribute super."uhttpc"; - "ui-command" = dontDistribute super."ui-command"; - "uid" = dontDistribute super."uid"; - "una" = dontDistribute super."una"; - "unagi-bloomfilter" = dontDistribute super."unagi-bloomfilter"; - "unagi-chan" = dontDistribute super."unagi-chan"; - "unagi-streams" = dontDistribute super."unagi-streams"; - "unamb" = dontDistribute super."unamb"; - "unamb-custom" = dontDistribute super."unamb-custom"; - "unbound" = dontDistribute super."unbound"; - "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; - "unboxed-containers" = dontDistribute super."unboxed-containers"; - "unbreak" = dontDistribute super."unbreak"; - "unfoldable" = dontDistribute super."unfoldable"; - "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; - "ungadtagger" = dontDistribute super."ungadtagger"; - "uni-events" = dontDistribute super."uni-events"; - "uni-graphs" = dontDistribute super."uni-graphs"; - "uni-htk" = dontDistribute super."uni-htk"; - "uni-posixutil" = dontDistribute super."uni-posixutil"; - "uni-reactor" = dontDistribute super."uni-reactor"; - "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; - "uni-util" = dontDistribute super."uni-util"; - "unicode" = dontDistribute super."unicode"; - "unicode-names" = dontDistribute super."unicode-names"; - "unicode-normalization" = dontDistribute super."unicode-normalization"; - "unicode-prelude" = dontDistribute super."unicode-prelude"; - "unicode-properties" = dontDistribute super."unicode-properties"; - "unicode-show" = dontDistribute super."unicode-show"; - "unicode-symbols" = dontDistribute super."unicode-symbols"; - "unicode-transforms" = dontDistribute super."unicode-transforms"; - "unicoder" = dontDistribute super."unicoder"; - "uniform-io" = dontDistribute super."uniform-io"; - "uniform-pair" = dontDistribute super."uniform-pair"; - "union" = doDistribute super."union_0_1_1_0"; - "union-find-array" = dontDistribute super."union-find-array"; - "union-map" = dontDistribute super."union-map"; - "unique" = dontDistribute super."unique"; - "unique-logic" = dontDistribute super."unique-logic"; - "unique-logic-tf" = dontDistribute super."unique-logic-tf"; - "uniqueid" = dontDistribute super."uniqueid"; - "unit" = dontDistribute super."unit"; - "unit-constraint" = dontDistribute super."unit-constraint"; - "units" = dontDistribute super."units"; - "units-attoparsec" = dontDistribute super."units-attoparsec"; - "units-defs" = dontDistribute super."units-defs"; - "units-parser" = dontDistribute super."units-parser"; - "unittyped" = dontDistribute super."unittyped"; - "universal-binary" = dontDistribute super."universal-binary"; - "universe-th" = dontDistribute super."universe-th"; - "unix-compat" = doDistribute super."unix-compat_0_4_1_4"; - "unix-fcntl" = dontDistribute super."unix-fcntl"; - "unix-handle" = dontDistribute super."unix-handle"; - "unix-io-extra" = dontDistribute super."unix-io-extra"; - "unix-memory" = dontDistribute super."unix-memory"; - "unix-process-conduit" = dontDistribute super."unix-process-conduit"; - "unix-pty-light" = dontDistribute super."unix-pty-light"; - "unix-time" = doDistribute super."unix-time_0_3_6"; - "unlambda" = dontDistribute super."unlambda"; - "unlit" = dontDistribute super."unlit"; - "unm-hip" = dontDistribute super."unm-hip"; - "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; - "unordered-graphs" = dontDistribute super."unordered-graphs"; - "unpack-funcs" = dontDistribute super."unpack-funcs"; - "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; - "unsafe" = dontDistribute super."unsafe"; - "unsafe-promises" = dontDistribute super."unsafe-promises"; - "unsafely" = dontDistribute super."unsafely"; - "unsafeperformst" = dontDistribute super."unsafeperformst"; - "unscramble" = dontDistribute super."unscramble"; - "unsequential" = dontDistribute super."unsequential"; - "unusable-pkg" = dontDistribute super."unusable-pkg"; - "unused" = dontDistribute super."unused"; - "uom-plugin" = dontDistribute super."uom-plugin"; - "up" = dontDistribute super."up"; - "up-grade" = dontDistribute super."up-grade"; - "uploadcare" = dontDistribute super."uploadcare"; - "upskirt" = dontDistribute super."upskirt"; - "ureader" = dontDistribute super."ureader"; - "urembed" = dontDistribute super."urembed"; - "uri" = dontDistribute super."uri"; - "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2"; - "uri-conduit" = dontDistribute super."uri-conduit"; - "uri-encode" = doDistribute super."uri-encode_1_5_0_4"; - "uri-enumerator" = dontDistribute super."uri-enumerator"; - "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; - "uri-template" = dontDistribute super."uri-template"; - "url-generic" = dontDistribute super."url-generic"; - "urlcheck" = dontDistribute super."urlcheck"; - "urldecode" = dontDistribute super."urldecode"; - "urldisp-happstack" = dontDistribute super."urldisp-happstack"; - "urlencoded" = dontDistribute super."urlencoded"; - "urn" = dontDistribute super."urn"; - "urxml" = dontDistribute super."urxml"; - "usb" = dontDistribute super."usb"; - "usb-enumerator" = dontDistribute super."usb-enumerator"; - "usb-hid" = dontDistribute super."usb-hid"; - "usb-id-database" = dontDistribute super."usb-id-database"; - "usb-iteratee" = dontDistribute super."usb-iteratee"; - "usb-safe" = dontDistribute super."usb-safe"; - "userid" = doDistribute super."userid_0_1_2_6"; - "utc" = dontDistribute super."utc"; - "utf8-env" = dontDistribute super."utf8-env"; - "utf8-prelude" = dontDistribute super."utf8-prelude"; - "utility-ht" = doDistribute super."utility-ht_0_0_11"; - "uu-cco" = dontDistribute super."uu-cco"; - "uu-cco-examples" = dontDistribute super."uu-cco-examples"; - "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; - "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; - "uu-options" = dontDistribute super."uu-options"; - "uu-tc" = dontDistribute super."uu-tc"; - "uuagc" = dontDistribute super."uuagc"; - "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; - "uuagc-cabal" = dontDistribute super."uuagc-cabal"; - "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; - "uuagd" = dontDistribute super."uuagd"; - "uuid-aeson" = dontDistribute super."uuid-aeson"; - "uuid-le" = dontDistribute super."uuid-le"; - "uuid-orphans" = doDistribute super."uuid-orphans_1_3_11_1"; - "uuid-quasi" = dontDistribute super."uuid-quasi"; - "uulib" = dontDistribute super."uulib"; - "uvector" = dontDistribute super."uvector"; - "uvector-algorithms" = dontDistribute super."uvector-algorithms"; - "uxadt" = dontDistribute super."uxadt"; - "uzbl-with-source" = dontDistribute super."uzbl-with-source"; - "v4l2" = dontDistribute super."v4l2"; - "v4l2-examples" = dontDistribute super."v4l2-examples"; - "vacuum" = dontDistribute super."vacuum"; - "vacuum-cairo" = dontDistribute super."vacuum-cairo"; - "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; - "vacuum-opengl" = dontDistribute super."vacuum-opengl"; - "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; - "valid-names" = dontDistribute super."valid-names"; - "validate" = dontDistribute super."validate"; - "validated-literals" = dontDistribute super."validated-literals"; - "validations" = dontDistribute super."validations"; - "validity" = dontDistribute super."validity"; - "validity-containers" = dontDistribute super."validity-containers"; - "value-supply" = dontDistribute super."value-supply"; - "vampire" = dontDistribute super."vampire"; - "var" = dontDistribute super."var"; - "varan" = dontDistribute super."varan"; - "variable-precision" = dontDistribute super."variable-precision"; - "variables" = dontDistribute super."variables"; - "varying" = dontDistribute super."varying"; - "vaultaire-common" = dontDistribute super."vaultaire-common"; - "vcache" = dontDistribute super."vcache"; - "vcache-trie" = dontDistribute super."vcache-trie"; - "vcard" = dontDistribute super."vcard"; - "vcatt" = dontDistribute super."vcatt"; - "vcd" = dontDistribute super."vcd"; - "vcs-revision" = dontDistribute super."vcs-revision"; - "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; - "vect-floating" = dontDistribute super."vect-floating"; - "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; - "vect-opengl" = dontDistribute super."vect-opengl"; - "vector-binary" = dontDistribute super."vector-binary"; - "vector-bytes-instances" = dontDistribute super."vector-bytes-instances"; - "vector-bytestring" = dontDistribute super."vector-bytestring"; - "vector-clock" = dontDistribute super."vector-clock"; - "vector-conduit" = dontDistribute super."vector-conduit"; - "vector-fftw" = doDistribute super."vector-fftw_0_1_3_6"; - "vector-functorlazy" = dontDistribute super."vector-functorlazy"; - "vector-heterogenous" = dontDistribute super."vector-heterogenous"; - "vector-instances-collections" = dontDistribute super."vector-instances-collections"; - "vector-mmap" = dontDistribute super."vector-mmap"; - "vector-random" = dontDistribute super."vector-random"; - "vector-read-instances" = dontDistribute super."vector-read-instances"; - "vector-sized" = dontDistribute super."vector-sized"; - "vector-space-map" = dontDistribute super."vector-space-map"; - "vector-space-opengl" = dontDistribute super."vector-space-opengl"; - "vector-space-points" = dontDistribute super."vector-space-points"; - "vector-static" = dontDistribute super."vector-static"; - "vector-strategies" = dontDistribute super."vector-strategies"; - "vectortiles" = dontDistribute super."vectortiles"; - "verbalexpressions" = dontDistribute super."verbalexpressions"; - "verbosity" = dontDistribute super."verbosity"; - "verdict" = dontDistribute super."verdict"; - "verdict-json" = dontDistribute super."verdict-json"; - "verilog" = dontDistribute super."verilog"; - "versions" = doDistribute super."versions_2_0_0"; - "vhdl" = dontDistribute super."vhdl"; - "views" = dontDistribute super."views"; - "vigilance" = dontDistribute super."vigilance"; - "vimeta" = dontDistribute super."vimeta"; - "vimus" = dontDistribute super."vimus"; - "vintage-basic" = dontDistribute super."vintage-basic"; - "vinyl-gl" = dontDistribute super."vinyl-gl"; - "vinyl-json" = dontDistribute super."vinyl-json"; - "vinyl-operational" = dontDistribute super."vinyl-operational"; - "vinyl-plus" = dontDistribute super."vinyl-plus"; - "vinyl-vectors" = dontDistribute super."vinyl-vectors"; - "virthualenv" = dontDistribute super."virthualenv"; - "visibility" = dontDistribute super."visibility"; - "vision" = dontDistribute super."vision"; - "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; - "visual-prof" = dontDistribute super."visual-prof"; - "vk-aws-route53" = dontDistribute super."vk-aws-route53"; - "vk-posix-pty" = dontDistribute super."vk-posix-pty"; - "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; - "vorbiscomment" = dontDistribute super."vorbiscomment"; - "vowpal-utils" = dontDistribute super."vowpal-utils"; - "voyeur" = dontDistribute super."voyeur"; - "vrpn" = dontDistribute super."vrpn"; - "vte" = dontDistribute super."vte"; - "vtegtk3" = dontDistribute super."vtegtk3"; - "vty" = doDistribute super."vty_5_5_0"; - "vty-examples" = dontDistribute super."vty-examples"; - "vty-menu" = dontDistribute super."vty-menu"; - "vty-ui" = dontDistribute super."vty-ui"; - "vty-ui-extras" = dontDistribute super."vty-ui-extras"; - "vulkan" = dontDistribute super."vulkan"; - "wacom-daemon" = dontDistribute super."wacom-daemon"; - "waddle" = dontDistribute super."waddle"; - "wai-accept-language" = dontDistribute super."wai-accept-language"; - "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; - "wai-app-static" = doDistribute super."wai-app-static_3_1_5"; - "wai-devel" = dontDistribute super."wai-devel"; - "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; - "wai-dispatch" = dontDistribute super."wai-dispatch"; - "wai-extra" = doDistribute super."wai-extra_3_0_16_1"; - "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; - "wai-graceful" = dontDistribute super."wai-graceful"; - "wai-handler-devel" = dontDistribute super."wai-handler-devel"; - "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; - "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; - "wai-handler-snap" = dontDistribute super."wai-handler-snap"; - "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; - "wai-hastache" = dontDistribute super."wai-hastache"; - "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; - "wai-http2-extra" = dontDistribute super."wai-http2-extra"; - "wai-lens" = dontDistribute super."wai-lens"; - "wai-lite" = dontDistribute super."wai-lite"; - "wai-logger" = doDistribute super."wai-logger_2_2_7"; - "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; - "wai-make-assets" = dontDistribute super."wai-make-assets"; - "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; - "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; - "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; - "wai-middleware-content-type" = doDistribute super."wai-middleware-content-type_0_4_0"; - "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4_1"; - "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; - "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; - "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; - "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; - "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; - "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; - "wai-middleware-route" = dontDistribute super."wai-middleware-route"; - "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; - "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0"; - "wai-predicates" = doDistribute super."wai-predicates_0_8_6"; - "wai-request-spec" = dontDistribute super."wai-request-spec"; - "wai-responsible" = dontDistribute super."wai-responsible"; - "wai-route" = doDistribute super."wai-route_0_3_1"; - "wai-router" = dontDistribute super."wai-router"; - "wai-routing" = doDistribute super."wai-routing_0_12_3"; - "wai-session-alt" = dontDistribute super."wai-session-alt"; - "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; - "wai-session-mysql" = dontDistribute super."wai-session-mysql"; - "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; - "wai-static-cache" = dontDistribute super."wai-static-cache"; - "wai-static-pages" = dontDistribute super."wai-static-pages"; - "wai-test" = dontDistribute super."wai-test"; - "wai-thrift" = dontDistribute super."wai-thrift"; - "wai-throttler" = dontDistribute super."wai-throttler"; - "wai-websockets" = doDistribute super."wai-websockets_3_0_0_9"; - "wait-handle" = dontDistribute super."wait-handle"; - "waitfree" = dontDistribute super."waitfree"; - "warc" = dontDistribute super."warc"; - "warp" = doDistribute super."warp_3_2_7"; - "warp-dynamic" = dontDistribute super."warp-dynamic"; - "warp-static" = dontDistribute super."warp-static"; - "warp-tls-uid" = dontDistribute super."warp-tls-uid"; - "watchdog" = dontDistribute super."watchdog"; - "watcher" = dontDistribute super."watcher"; - "watchit" = dontDistribute super."watchit"; - "wavconvert" = dontDistribute super."wavconvert"; - "wavesurfer" = dontDistribute super."wavesurfer"; - "wavy" = dontDistribute super."wavy"; - "wcwidth" = dontDistribute super."wcwidth"; - "weather-api" = dontDistribute super."weather-api"; - "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; - "web-css" = dontDistribute super."web-css"; - "web-encodings" = dontDistribute super."web-encodings"; - "web-inv-route" = dontDistribute super."web-inv-route"; - "web-mongrel2" = dontDistribute super."web-mongrel2"; - "web-page" = dontDistribute super."web-page"; - "web-routes" = doDistribute super."web-routes_0_27_10"; - "web-routes-mtl" = dontDistribute super."web-routes-mtl"; - "web-routes-quasi" = dontDistribute super."web-routes-quasi"; - "web-routes-regular" = dontDistribute super."web-routes-regular"; - "web-routes-transformers" = dontDistribute super."web-routes-transformers"; - "webapi" = dontDistribute super."webapi"; - "webapp" = dontDistribute super."webapp"; - "webcloud" = dontDistribute super."webcloud"; - "webcrank" = dontDistribute super."webcrank"; - "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; - "webcrank-wai" = dontDistribute super."webcrank-wai"; - "webdriver-angular" = doDistribute super."webdriver-angular_0_1_10"; - "webdriver-snoy" = dontDistribute super."webdriver-snoy"; - "webfinger-client" = dontDistribute super."webfinger-client"; - "webidl" = dontDistribute super."webidl"; - "webify" = dontDistribute super."webify"; - "webkit" = dontDistribute super."webkit"; - "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; - "webkitgtk3" = doDistribute super."webkitgtk3_0_14_1_1"; - "webkitgtk3-javascriptcore" = doDistribute super."webkitgtk3-javascriptcore_0_13_1_2"; - "webrtc-vad" = dontDistribute super."webrtc-vad"; - "webserver" = dontDistribute super."webserver"; - "websnap" = dontDistribute super."websnap"; - "websockets" = doDistribute super."websockets_0_9_6_2"; - "websockets-snap" = doDistribute super."websockets-snap_0_9_2_0"; - "webwire" = dontDistribute super."webwire"; - "wedding-announcement" = dontDistribute super."wedding-announcement"; - "wedged" = dontDistribute super."wedged"; - "weighted-regexp" = dontDistribute super."weighted-regexp"; - "weighted-search" = dontDistribute super."weighted-search"; - "welshy" = dontDistribute super."welshy"; - "werewolf" = doDistribute super."werewolf_1_0_2_2"; - "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_4"; - "wheb-mongo" = dontDistribute super."wheb-mongo"; - "wheb-redis" = dontDistribute super."wheb-redis"; - "wheb-strapped" = dontDistribute super."wheb-strapped"; - "while-lang-parser" = dontDistribute super."while-lang-parser"; - "whim" = dontDistribute super."whim"; - "whiskers" = dontDistribute super."whiskers"; - "whitespace" = dontDistribute super."whitespace"; - "whois" = dontDistribute super."whois"; - "why3" = dontDistribute super."why3"; - "wigner-symbols" = dontDistribute super."wigner-symbols"; - "wikicfp-scraper" = dontDistribute super."wikicfp-scraper"; - "wikipedia4epub" = dontDistribute super."wikipedia4epub"; - "win-hp-path" = dontDistribute super."win-hp-path"; - "windowslive" = dontDistribute super."windowslive"; - "winerror" = dontDistribute super."winerror"; - "winio" = dontDistribute super."winio"; - "wire-streams" = dontDistribute super."wire-streams"; - "wires" = dontDistribute super."wires"; - "wiring" = dontDistribute super."wiring"; - "witness" = dontDistribute super."witness"; - "witty" = dontDistribute super."witty"; - "wkt" = dontDistribute super."wkt"; - "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; - "wlc-hs" = dontDistribute super."wlc-hs"; - "wobsurv" = dontDistribute super."wobsurv"; - "woffex" = dontDistribute super."woffex"; - "wol" = dontDistribute super."wol"; - "wolf" = dontDistribute super."wolf"; - "woot" = dontDistribute super."woot"; - "word-vector" = dontDistribute super."word-vector"; - "word24" = dontDistribute super."word24"; - "wordcloud" = dontDistribute super."wordcloud"; - "wordexp" = dontDistribute super."wordexp"; - "words" = dontDistribute super."words"; - "wordsearch" = dontDistribute super."wordsearch"; - "wordsetdiff" = dontDistribute super."wordsetdiff"; - "workdays" = dontDistribute super."workdays"; - "workflow-osx" = dontDistribute super."workflow-osx"; - "wp-archivebot" = dontDistribute super."wp-archivebot"; - "wraparound" = dontDistribute super."wraparound"; - "wraxml" = dontDistribute super."wraxml"; - "wreq-sb" = dontDistribute super."wreq-sb"; - "wright" = dontDistribute super."wright"; - "writer-cps-monads-tf" = dontDistribute super."writer-cps-monads-tf"; - "writer-cps-mtl" = dontDistribute super."writer-cps-mtl"; - "writer-cps-transformers" = dontDistribute super."writer-cps-transformers"; - "wsdl" = dontDistribute super."wsdl"; - "wsedit" = dontDistribute super."wsedit"; - "wtk" = dontDistribute super."wtk"; - "wtk-gtk" = dontDistribute super."wtk-gtk"; - "wumpus-basic" = dontDistribute super."wumpus-basic"; - "wumpus-core" = dontDistribute super."wumpus-core"; - "wumpus-drawing" = dontDistribute super."wumpus-drawing"; - "wumpus-microprint" = dontDistribute super."wumpus-microprint"; - "wumpus-tree" = dontDistribute super."wumpus-tree"; - "wuss" = doDistribute super."wuss_1_0_4"; - "wx" = dontDistribute super."wx"; - "wxAsteroids" = dontDistribute super."wxAsteroids"; - "wxFruit" = dontDistribute super."wxFruit"; - "wxc" = dontDistribute super."wxc"; - "wxcore" = dontDistribute super."wxcore"; - "wxdirect" = dontDistribute super."wxdirect"; - "wxhnotepad" = dontDistribute super."wxhnotepad"; - "wxturtle" = dontDistribute super."wxturtle"; - "wybor" = dontDistribute super."wybor"; - "wyvern" = dontDistribute super."wyvern"; - "x-dsp" = dontDistribute super."x-dsp"; - "x11-xim" = dontDistribute super."x11-xim"; - "x11-xinput" = dontDistribute super."x11-xinput"; - "x509-util" = dontDistribute super."x509-util"; - "x86-64bit" = dontDistribute super."x86-64bit"; - "xattr" = dontDistribute super."xattr"; - "xbattbar" = dontDistribute super."xbattbar"; - "xcb-types" = dontDistribute super."xcb-types"; - "xcffib" = dontDistribute super."xcffib"; - "xchat-plugin" = dontDistribute super."xchat-plugin"; - "xcp" = dontDistribute super."xcp"; - "xdcc" = doDistribute super."xdcc_1_0_4"; - "xdg-userdirs" = dontDistribute super."xdg-userdirs"; - "xdot" = dontDistribute super."xdot"; - "xfconf" = dontDistribute super."xfconf"; - "xhaskell-library" = dontDistribute super."xhaskell-library"; - "xhb" = dontDistribute super."xhb"; - "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; - "xhb-ewmh" = dontDistribute super."xhb-ewmh"; - "xhtml" = doDistribute super."xhtml_3000_2_1"; - "xhtml-combinators" = dontDistribute super."xhtml-combinators"; - "xilinx-lava" = dontDistribute super."xilinx-lava"; - "xine" = dontDistribute super."xine"; - "xing-api" = dontDistribute super."xing-api"; - "xinput-conduit" = dontDistribute super."xinput-conduit"; - "xkbcommon" = dontDistribute super."xkbcommon"; - "xkcd" = dontDistribute super."xkcd"; - "xlsx" = doDistribute super."xlsx_0_2_3"; - "xlsx-templater" = dontDistribute super."xlsx-templater"; - "xml-basic" = dontDistribute super."xml-basic"; - "xml-catalog" = dontDistribute super."xml-catalog"; - "xml-conduit-decode" = dontDistribute super."xml-conduit-decode"; - "xml-enumerator" = dontDistribute super."xml-enumerator"; - "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; - "xml-extractors" = dontDistribute super."xml-extractors"; - "xml-helpers" = dontDistribute super."xml-helpers"; - "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; - "xml-monad" = dontDistribute super."xml-monad"; - "xml-parsec" = dontDistribute super."xml-parsec"; - "xml-picklers" = dontDistribute super."xml-picklers"; - "xml-pipe" = dontDistribute super."xml-pipe"; - "xml-prettify" = dontDistribute super."xml-prettify"; - "xml-push" = dontDistribute super."xml-push"; - "xml-query" = dontDistribute super."xml-query"; - "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; - "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; - "xml2html" = dontDistribute super."xml2html"; - "xml2json" = dontDistribute super."xml2json"; - "xml2x" = dontDistribute super."xml2x"; - "xmlhtml" = doDistribute super."xmlhtml_0_2_3_4"; - "xmltv" = dontDistribute super."xmltv"; - "xmms2-client" = dontDistribute super."xmms2-client"; - "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; - "xmobar" = dontDistribute super."xmobar"; - "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; - "xmonad-contrib" = dontDistribute super."xmonad-contrib"; - "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; - "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; - "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; - "xmonad-eval" = dontDistribute super."xmonad-eval"; - "xmonad-extras" = dontDistribute super."xmonad-extras"; - "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; - "xmonad-utils" = dontDistribute super."xmonad-utils"; - "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; - "xmonad-windownames" = dontDistribute super."xmonad-windownames"; - "xmpipe" = dontDistribute super."xmpipe"; - "xorshift" = dontDistribute super."xorshift"; - "xosd" = dontDistribute super."xosd"; - "xournal-builder" = dontDistribute super."xournal-builder"; - "xournal-convert" = dontDistribute super."xournal-convert"; - "xournal-parser" = dontDistribute super."xournal-parser"; - "xournal-render" = dontDistribute super."xournal-render"; - "xournal-types" = dontDistribute super."xournal-types"; - "xpathdsv" = dontDistribute super."xpathdsv"; - "xsact" = dontDistribute super."xsact"; - "xsd" = dontDistribute super."xsd"; - "xsha1" = dontDistribute super."xsha1"; - "xslt" = dontDistribute super."xslt"; - "xtc" = dontDistribute super."xtc"; - "xtest" = dontDistribute super."xtest"; - "xturtle" = dontDistribute super."xturtle"; - "xxhash" = dontDistribute super."xxhash"; - "y0l0bot" = dontDistribute super."y0l0bot"; - "yabi" = dontDistribute super."yabi"; - "yabi-muno" = dontDistribute super."yabi-muno"; - "yahoo-finance-api" = dontDistribute super."yahoo-finance-api"; - "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; - "yahoo-web-search" = dontDistribute super."yahoo-web-search"; - "yajl" = dontDistribute super."yajl"; - "yajl-enumerator" = dontDistribute super."yajl-enumerator"; - "yall" = dontDistribute super."yall"; - "yamemo" = dontDistribute super."yamemo"; - "yaml" = doDistribute super."yaml_0_8_18_1"; - "yaml-config" = dontDistribute super."yaml-config"; - "yaml-light-lens" = dontDistribute super."yaml-light-lens"; - "yaml-rpc" = dontDistribute super."yaml-rpc"; - "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; - "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; - "yaml-union" = dontDistribute super."yaml-union"; - "yaml2owl" = dontDistribute super."yaml2owl"; - "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; - "yampa-canvas" = dontDistribute super."yampa-canvas"; - "yampa-glfw" = dontDistribute super."yampa-glfw"; - "yampa-glut" = dontDistribute super."yampa-glut"; - "yampa2048" = dontDistribute super."yampa2048"; - "yandex-translate" = dontDistribute super."yandex-translate"; - "yaop" = dontDistribute super."yaop"; - "yap" = dontDistribute super."yap"; - "yarr" = dontDistribute super."yarr"; - "yarr-image-io" = dontDistribute super."yarr-image-io"; - "yate" = dontDistribute super."yate"; - "yavie" = dontDistribute super."yavie"; - "ycextra" = dontDistribute super."ycextra"; - "yeganesh" = dontDistribute super."yeganesh"; - "yeller" = dontDistribute super."yeller"; - "yeshql" = dontDistribute super."yeshql"; - "yesod-angular" = dontDistribute super."yesod-angular"; - "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; - "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3"; - "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_2"; - "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; - "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1"; - "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; - "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; - "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; - "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; - "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; - "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_10"; - "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; - "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; - "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; - "yesod-bin" = doDistribute super."yesod-bin_1_4_18_2"; - "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; - "yesod-comments" = dontDistribute super."yesod-comments"; - "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; - "yesod-continuations" = dontDistribute super."yesod-continuations"; - "yesod-core" = doDistribute super."yesod-core_1_4_22"; - "yesod-crud" = dontDistribute super."yesod-crud"; - "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; - "yesod-csp" = dontDistribute super."yesod-csp"; - "yesod-datatables" = dontDistribute super."yesod-datatables"; - "yesod-dsl" = dontDistribute super."yesod-dsl"; - "yesod-examples" = dontDistribute super."yesod-examples"; - "yesod-form-json" = dontDistribute super."yesod-form-json"; - "yesod-goodies" = dontDistribute super."yesod-goodies"; - "yesod-ip" = dontDistribute super."yesod-ip"; - "yesod-json" = dontDistribute super."yesod-json"; - "yesod-links" = dontDistribute super."yesod-links"; - "yesod-lucid" = dontDistribute super."yesod-lucid"; - "yesod-mangopay" = dontDistribute super."yesod-mangopay"; - "yesod-markdown" = dontDistribute super."yesod-markdown"; - "yesod-media-simple" = dontDistribute super."yesod-media-simple"; - "yesod-paginate" = dontDistribute super."yesod-paginate"; - "yesod-pagination" = dontDistribute super."yesod-pagination"; - "yesod-paginator" = dontDistribute super."yesod-paginator"; - "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_5"; - "yesod-platform" = dontDistribute super."yesod-platform"; - "yesod-pnotify" = dontDistribute super."yesod-pnotify"; - "yesod-pure" = dontDistribute super."yesod-pure"; - "yesod-purescript" = dontDistribute super."yesod-purescript"; - "yesod-raml" = dontDistribute super."yesod-raml"; - "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; - "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; - "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; - "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; - "yesod-routes" = dontDistribute super."yesod-routes"; - "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; - "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; - "yesod-rst" = dontDistribute super."yesod-rst"; - "yesod-s3" = dontDistribute super."yesod-s3"; - "yesod-sass" = dontDistribute super."yesod-sass"; - "yesod-session-redis" = dontDistribute super."yesod-session-redis"; - "yesod-static" = doDistribute super."yesod-static_1_5_0_3"; - "yesod-tableview" = dontDistribute super."yesod-tableview"; - "yesod-test" = doDistribute super."yesod-test_1_5_1_1"; - "yesod-test-json" = dontDistribute super."yesod-test-json"; - "yesod-tls" = dontDistribute super."yesod-tls"; - "yesod-transloadit" = dontDistribute super."yesod-transloadit"; - "yesod-vend" = dontDistribute super."yesod-vend"; - "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; - "yesod-worker" = dontDistribute super."yesod-worker"; - "yet-another-logger" = dontDistribute super."yet-another-logger"; - "yhccore" = dontDistribute super."yhccore"; - "yi-contrib" = dontDistribute super."yi-contrib"; - "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; - "yi-gtk" = dontDistribute super."yi-gtk"; - "yi-monokai" = dontDistribute super."yi-monokai"; - "yi-rope" = doDistribute super."yi-rope_0_7_0_1"; - "yi-snippet" = dontDistribute super."yi-snippet"; - "yi-solarized" = dontDistribute super."yi-solarized"; - "yi-spolsky" = dontDistribute super."yi-spolsky"; - "yi-vty" = dontDistribute super."yi-vty"; - "yices" = dontDistribute super."yices"; - "yices-easy" = dontDistribute super."yices-easy"; - "yices-painless" = dontDistribute super."yices-painless"; - "yjftp" = dontDistribute super."yjftp"; - "yjftp-libs" = dontDistribute super."yjftp-libs"; - "yjsvg" = dontDistribute super."yjsvg"; - "yocto" = dontDistribute super."yocto"; - "yoctoparsec" = dontDistribute super."yoctoparsec"; - "yoko" = dontDistribute super."yoko"; - "york-lava" = dontDistribute super."york-lava"; - "youtube" = dontDistribute super."youtube"; - "yql" = dontDistribute super."yql"; - "yst" = dontDistribute super."yst"; - "yuiGrid" = dontDistribute super."yuiGrid"; - "yuuko" = dontDistribute super."yuuko"; - "yxdb-utils" = dontDistribute super."yxdb-utils"; - "z3" = dontDistribute super."z3"; - "z3-encoding" = dontDistribute super."z3-encoding"; - "zabt" = dontDistribute super."zabt"; - "zalgo" = dontDistribute super."zalgo"; - "zampolit" = dontDistribute super."zampolit"; - "zasni-gerna" = dontDistribute super."zasni-gerna"; - "zcache" = dontDistribute super."zcache"; - "zenc" = dontDistribute super."zenc"; - "zendesk-api" = dontDistribute super."zendesk-api"; - "zeno" = dontDistribute super."zeno"; - "zerobin" = dontDistribute super."zerobin"; - "zeromq-haskell" = dontDistribute super."zeromq-haskell"; - "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; - "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; - "zeroth" = dontDistribute super."zeroth"; - "zigbee-znet25" = dontDistribute super."zigbee-znet25"; - "zip-archive" = doDistribute super."zip-archive_0_2_3_7"; - "zip-conduit" = dontDistribute super."zip-conduit"; - "zipedit" = dontDistribute super."zipedit"; - "zipkin" = dontDistribute super."zipkin"; - "zipper" = dontDistribute super."zipper"; - "zippo" = dontDistribute super."zippo"; - "zlib-conduit" = dontDistribute super."zlib-conduit"; - "zmcat" = dontDistribute super."zmcat"; - "zmidi-core" = dontDistribute super."zmidi-core"; - "zmidi-score" = dontDistribute super."zmidi-score"; - "zmqat" = dontDistribute super."zmqat"; - "zoneinfo" = dontDistribute super."zoneinfo"; - "zoom" = dontDistribute super."zoom"; - "zoom-cache" = dontDistribute super."zoom-cache"; - "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; - "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; - "zoom-refs" = dontDistribute super."zoom-refs"; - "zsh-battery" = dontDistribute super."zsh-battery"; - "ztail" = dontDistribute super."ztail"; - "zxcvbn-c" = dontDistribute super."zxcvbn-c"; - -} diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index baec1bfb818d..19940bd70bea 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -49,7 +49,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; @@ -87,7 +87,7 @@ let packages = selectFrom self; hoogle = callPackage ./hoogle.nix { inherit packages; - hoogle = self.hoogle_4_2_43; + hoogle = self.hoogle_5_0_4; }; in withPackages (packages ++ [ hoogle ]); diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5eb4e1fac83a..2b597532b44d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -47,6 +47,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false +, hardeningDisable ? [] } @ args: assert editedCabalFile != null -> revision != null; @@ -329,5 +330,6 @@ stdenv.mkDerivation ({ // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } +// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } // optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9ec33c96e03..c3fbcd0c21b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -691,54 +691,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Agda_2_5_1" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.1"; - sha256 = "ee4658eafb514460d598322fa98528d1af6e25e5aa51843bb473c0d8a325c0c8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; - executableToolDepends = [ emacs ]; - jailbreak = true; - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - "Agda" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring , containers, cpphs, data-hash, deepseq, directory, EdisonAPI @@ -2378,34 +2330,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_22_8_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HUnit - , old-time, pretty, process, QuickCheck, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unix - }: - mkDerivation { - pname = "Cabal"; - version = "1.22.8.0"; - sha256 = "2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e"; - 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; - doCheck = false; - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Cabal_1_24_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty @@ -2452,9 +2376,7 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; - doHaddock = false; jailbreak = true; - doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2584,25 +2506,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart_1_6" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.6"; - sha256 = "0f73779ab322346cac7c131f58dbda9bcaf1f43693a9e102510be80a07569ea5"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector @@ -2620,25 +2523,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-cairo_1_6" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.6"; - sha256 = "e209b6b4d7d7f392593cbd3e8a8cde1d5af83066fee994195e4b25bda680ca0f"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2656,29 +2540,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-diagrams_1_6" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl - , old-locale, operational, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.6"; - sha256 = "c4c5a60bc623bb3221da113c84c0400b4dd75c481e64f5a9b6788b923ff998eb"; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts - text time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2735,25 +2596,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ChasingBottoms_1_3_1" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1"; - sha256 = "116cf6aad779499fb02fd1f44e0d42236b69401723bb29ed6138ff6b59eee888"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ChasingBottoms" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb @@ -3475,39 +3317,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , data-default, exceptions, http-client, http-client-tls - , http-types, lens, mtl, mtl-compat, network, network-uri - , optparse-applicative, transformers, transformers-base - , transformers-compat, utf8-string, xml-conduit, xml-hamlet - }: - mkDerivation { - pname = "DAV"; - version = "1.2"; - sha256 = "1a07c8ef17cd4207c6f889e7eb5c45d9f025374f2cdacc1e34e6d71fe103b746"; - revision = "1"; - editedCabalFile = "6c084095b369b6a2cb797a19a9accf5488f729f19bb6c0240e0f6faf1ac266bb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat - transformers transformers-base transformers-compat utf8-string - xml-conduit xml-hamlet - ]; - executableHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat network - network-uri optparse-applicative transformers transformers-base - transformers-compat utf8-string xml-conduit xml-hamlet - ]; - homepage = "http://floss.scru.org/hDAV"; - description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "DAV" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, haskeline, http-client, http-client-tls @@ -3688,7 +3497,6 @@ self: { crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel prettyclass QuickCheck tagged test-framework test-framework-hunit ]; - doCheck = false; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -4032,20 +3840,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Diff_0_3_2" = callPackage - ({ mkDerivation, array, base, pretty }: - mkDerivation { - pname = "Diff"; - version = "0.3.2"; - sha256 = "7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e"; - revision = "1"; - editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328"; - libraryHaskellDepends = [ array base pretty ]; - description = "O(ND) diff algorithm in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -4595,19 +4389,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "EdisonAPI_1_3" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "EdisonAPI"; - version = "1.3"; - sha256 = "a369d5c9b412bafb16a023121a72470a6fed0116b3d6d143a03dd54cb854154f"; - libraryHaskellDepends = [ base mtl ]; - homepage = "http://rwd.rdockins.name/edison/home/"; - description = "A library of efficent, purely-functional data structures (API)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "EdisonAPI" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -5631,23 +5412,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Frames_0_1_4" = callPackage - ({ mkDerivation, base, ghc-prim, pipes, primitive, readable - , template-haskell, text, transformers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.1.4"; - sha256 = "3330b53867f07959c58b2cfc237390422ea08ca474b329547f092b6cb2bf39a0"; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Frames" = callPackage ({ mkDerivation, base, ghc-prim, pipes, primitive, readable , template-haskell, text, transformers, vector, vinyl @@ -5809,7 +5573,6 @@ self: { base bindings-GLFW HUnit test-framework test-framework-hunit ]; jailbreak = true; - doCheck = false; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6361,30 +6124,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Glob_0_7_10" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.10"; - sha256 = "db8f67725566df72379cdbbdb2f7aaf6500163b94924229b4b0aa9bbaa9804a7"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -6796,31 +6535,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "H_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed - , inline-r, pretty, process, singletons, tasty, tasty-golden - , tasty-hunit, temporary, text, vector - }: - mkDerivation { - pname = "H"; - version = "0.8.0.0"; - sha256 = "b679dc140f783afa598da1bc2d111d603ad94b5f04d7db912452194635d47484"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring cmdargs file-embed inline-r pretty process - temporary vector - ]; - testHaskellDepends = [ - base bytestring directory inline-r process singletons tasty - tasty-golden tasty-hunit text vector - ]; - doCheck = false; - description = "The Haskell/R mixed programming environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "H" = callPackage ({ mkDerivation, base, bytestring, cmdargs, file-embed, inline-r , pretty, process, temporary, vector @@ -7030,21 +6744,22 @@ self: { }) {}; "HDBC-mysql" = callPackage - ({ mkDerivation, base, bytestring, HDBC, mysqlclient, time - , utf8-string + ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient + , openssl, time, utf8-string, zlib }: mkDerivation { pname = "HDBC-mysql"; - version = "0.6.6.4"; - sha256 = "01df81920b9a005cd9e11467aa5e05b10534d284933fddc34991400e5888048b"; + version = "0.7.0.0"; + sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; - librarySystemDepends = [ mysqlclient ]; - jailbreak = true; - homepage = "https://github.com/ryantm/hdbc-mysql"; + librarySystemDepends = [ mysqlclient openssl zlib ]; + homepage = "http://github.com/ryantm/hdbc-mysql"; description = "MySQL driver for HDBC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {mysqlclient = null;}; + }) {mysqlclient = null; inherit (pkgs) openssl; + inherit (pkgs) zlib;}; "HDBC-odbc" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, HDBC, mtl @@ -7098,8 +6813,8 @@ self: { ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; - version = "0.1.0.1"; - sha256 = "bf9342008c1d86733f05c60f90b18974e8c6748b9bd254bb47555245b6f77008"; + version = "0.1.1.0"; + sha256 = "4ad37a6c9d17b8f2f049ec4f3c4ea5efc8d866b02b226c6c066ab11153fc80b9"; libraryHaskellDepends = [ base HDBC ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; @@ -8315,7 +8030,6 @@ self: { process random regex-compat template-haskell temporary text unordered-containers ]; - doCheck = false; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; license = "LGPL"; @@ -8394,20 +8108,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit_1_3_1_1" = callPackage - ({ mkDerivation, base, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.3.1.1"; - sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq filepath ]; - homepage = "https://github.com/hspec/HUnit#readme"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HUnit" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { @@ -8558,51 +8258,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HaRe_0_8_2_3" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-helper, containers - , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod - , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit - , monad-control, monoid-extras, mtl, old-time, parsec, pretty - , process, QuickCheck, rosezipper, semigroups, silently - , Strafunski-StrategyLib, stringbuilder, syb, syz, time - , transformers, transformers-base - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.2.3"; - sha256 = "8ccd728cd666929cc59ac1ad9fc16a5a462454a6c04c7c5019767f0b490a0e04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - executableHaskellDepends = [ - array base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time parsec pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - testHaskellDepends = [ - base Cabal cabal-helper containers deepseq Diff directory filepath - ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils - hslogger hspec HUnit monad-control monoid-extras mtl old-time - process QuickCheck rosezipper semigroups silently - Strafunski-StrategyLib stringbuilder syb syz time transformers - transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HaRe" = callPackage ({ mkDerivation, array, base, Cabal, cabal-helper, containers , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod @@ -8642,10 +8297,10 @@ self: { Strafunski-StrategyLib stringbuilder syb syz time transformers transformers-base ]; - doCheck = false; homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX" = callPackage @@ -9189,7 +8844,6 @@ self: { version = "3.0.0.4"; sha256 = "d8c80bd2d035571cd76ce4f69453e9fcef4096dbc8868eb4cfcd7eb74fe5f712"; libraryHaskellDepends = [ base mtl process strict ]; - doCheck = false; homepage = "https://github.com/jetho/Hclip"; description = "A small cross-platform library for reading and modifying the system clipboard"; license = stdenv.lib.licenses.bsd3; @@ -9663,7 +9317,6 @@ self: { base bytestring HUnit test-framework test-framework-hunit ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/phonohawk/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -10289,24 +9942,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels_3_2_7_2" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.2.7.2"; - sha256 = "500b0ed64e1385a5f5e5fa4b51f3575d38e77ebac19a374942a308a04fa7c902"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib @@ -10365,28 +10000,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels-scale-dct_0_1_1_0" = callPackage - ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels - , JuicyPixels-util, time - }: - mkDerivation { - pname = "JuicyPixels-scale-dct"; - version = "0.1.1.0"; - sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9"; - revision = "2"; - editedCabalFile = "d80ead4c776cec3babb37a69c099560b421e5eb929b9ebe8e433a8fa4ef243ea"; - libraryHaskellDepends = [ - base base-compat carray fft JuicyPixels - ]; - testHaskellDepends = [ - base base-compat carray fft JuicyPixels JuicyPixels-util time - ]; - homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; - description = "Scale JuicyPixels images with DCT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels-scale-dct" = callPackage ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time }: @@ -10400,7 +10013,6 @@ self: { testHaskellDepends = [ base base-compat carray fft JuicyPixels time ]; - doCheck = false; homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; description = "Scale JuicyPixels images with DCT"; license = stdenv.lib.licenses.bsd3; @@ -10701,9 +10313,11 @@ self: { base constraint-classes hmatrix semigroups vector ]; librarySystemDepends = [ openblasCompat ]; + jailbreak = true; homepage = "http://github.com/guaraqe/lats#readme"; description = "Linear Algebra on Typed Spaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "LDAP" = callPackage @@ -11147,28 +10761,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ListLike_4_2_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist, fmlist - , HUnit, QuickCheck, random, text, vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.2.1"; - sha256 = "d6542ae5bef685e3571cd46b018c5adac2b6c854f72777ddd35a6823bcf08859"; - libraryHaskellDepends = [ - array base bytestring containers dlist fmlist text vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text vector - ]; - doCheck = false; - homepage = "http://software.complete.org/listlike"; - description = "Generic support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ListLike" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string @@ -11186,7 +10778,6 @@ self: { array base bytestring containers dlist fmlist HUnit QuickCheck random text utf8-string vector ]; - doCheck = false; homepage = "http://github.com/JohnLato/listlike"; description = "Generic support for list-like structures"; license = stdenv.lib.licenses.bsd3; @@ -11664,12 +11255,24 @@ self: { revision = "1"; editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7"; libraryHaskellDepends = [ base ]; - doHaddock = false; homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; }) {}; + "MemoTrie_0_6_7" = callPackage + ({ mkDerivation, base, newtype-generics }: + mkDerivation { + pname = "MemoTrie"; + version = "0.6.7"; + sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672"; + libraryHaskellDepends = [ base newtype-generics ]; + homepage = "https://github.com/conal/MemoTrie"; + description = "Trie-based memo functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MetaHDBC" = callPackage ({ mkDerivation, base, convertible, hashtables, HDBC, HDBC-odbc , mtl, template-haskell @@ -11787,34 +11390,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_3_0_2" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.3.0.2"; - sha256 = "64b870214f406d83e48fa13f58f9e4ebf8b69ae898c99788d2d0f3ebfed55ab2"; - revision = "2"; - editedCabalFile = "e3f9dfdd2ff45ad9877fffe9bc6d9cd1d2e150cc6aa8dfcf4b3c37ea16bacbe3"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - doCheck = false; - homepage = "http://software.complete.org/missingh"; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -11834,7 +11409,6 @@ self: { hslogger HUnit mtl network old-locale old-time parsec process QuickCheck random regex-compat testpack time unix ]; - doCheck = false; homepage = "http://software.complete.org/missingh"; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; @@ -12525,28 +12099,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) net_snmp;}; - "Network-NineP_0_4_0" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP - , regex-posix, stateref, transformers - }: - mkDerivation { - pname = "Network-NineP"; - version = "0.4.0"; - sha256 = "2d7e78e03feeb484d5812a3a8cef5f248d26e9daad8b7fe535516f6ec20dd7c0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers - ]; - jailbreak = true; - description = "High-level abstraction over 9P protocol"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Network-NineP" = callPackage ({ mkDerivation, base, binary, bytestring, containers, convertible , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl @@ -13183,24 +12735,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGLRaw_3_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.1.0"; - sha256 = "a1554684460bd34b2e031cfc5f5e5388e6266f67482bd77829575b5b8b339afe"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa;}; - "OpenGLRaw" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers @@ -13930,20 +13464,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "PortMidi_0_1_6_0" = callPackage - ({ mkDerivation, alsaLib, base }: - mkDerivation { - pname = "PortMidi"; - version = "0.1.6.0"; - sha256 = "54599bc0377847ab17b175641023ec495587ca82807fd2360e17f4c5575814b1"; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; - homepage = "http://haskell.org/haskellwiki/PortMidi"; - description = "A binding for PortMedia/PortMidi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) alsaLib;}; - "PortMidi" = callPackage ({ mkDerivation, alsaLib, base }: mkDerivation { @@ -14340,14 +13860,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_9_1" = callPackage + "QuickCheck_2_9_2" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.9.1"; - sha256 = "f8769cbef895a67f9bd1ac554faa577e6c1fb41e271425880a759009e454d05f"; + version = "2.9.2"; + sha256 = "155c1656f583bc797587846ee1959143d2b1b9c88fbcb9d3f510f58d8fb93685"; libraryHaskellDepends = [ base containers random template-haskell tf-random transformers ]; @@ -14876,7 +14396,6 @@ self: { executableHaskellDepends = [ base system-filepath text ]; testHaskellDepends = [ base hspec system-filepath text ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; @@ -15038,7 +14557,6 @@ self: { utf8-string vector zlib ]; testHaskellDepends = [ base directory doctest hspec lens vector ]; - doCheck = false; homepage = "http://code.haskell.org/~aavogt/Rlang-QQ"; description = "quasiquoter for inline-R code"; license = stdenv.lib.licenses.bsd3; @@ -16215,39 +15733,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock_0_10_0_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, crypto-random, directory, focus - , hashable, hspec, hspec-wai, http-types, hvect, list-t - , monad-control, mtl, old-locale, path-pieces, random, reroute - , resource-pool, resourcet, stm, stm-containers, text, time - , transformers, transformers-base, unordered-containers, vault, wai - , wai-extra, warp - }: - mkDerivation { - pname = "Spock"; - version = "0.10.0.1"; - sha256 = "ef80deb37728e89369f34c3a8cc9c4190d8aa50911a08a9e1e0c1993466595d2"; - revision = "1"; - editedCabalFile = "4c9fc2e3aae3df4e64c014a0fcba192dda7e1bd244c87145e0723bf0c6b2abf4"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - crypto-random directory focus hashable http-types hvect list-t - monad-control mtl old-locale path-pieces random reroute - resource-pool resourcet stm stm-containers text time transformers - transformers-base unordered-containers vault wai wai-extra warp - ]; - testHaskellDepends = [ - base base64-bytestring bytestring hspec hspec-wai http-types - reroute stm text time unordered-containers wai wai-extra - ]; - jailbreak = true; - homepage = "http://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -16358,27 +15843,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-digestive_0_2_0_0" = callPackage - ({ mkDerivation, base, digestive-functors, http-types, mtl, Spock - , text, unordered-containers, wai - }: - mkDerivation { - pname = "Spock-digestive"; - version = "0.2.0.0"; - sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260"; - revision = "1"; - editedCabalFile = "040e9c024b49a598fe3fa0a5aa2593e601c1d47b16986d7a52de079c7dac0c35"; - libraryHaskellDepends = [ - base digestive-functors http-types mtl Spock text - unordered-containers wai - ]; - jailbreak = true; - homepage = "https://github.com/agrafix/Spock-digestive"; - description = "Digestive functors support for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-digestive" = callPackage ({ mkDerivation, base, digestive-functors, http-types, mtl , Spock-core, text, unordered-containers, wai @@ -16410,28 +15874,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-worker_0_3_0_0" = callPackage - ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl - , Spock, stm, text, time, transformers, vector - }: - mkDerivation { - pname = "Spock-worker"; - version = "0.3.0.0"; - sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; - revision = "1"; - editedCabalFile = "4e69af8f88f8afd53d7c02d5fb5171de1f584e039d638b15b223e3e6f1a434c5"; - libraryHaskellDepends = [ - base containers errors lifted-base mtl Spock stm text time - transformers vector - ]; - testHaskellDepends = [ base containers HTF stm vector ]; - jailbreak = true; - homepage = "http://github.com/agrafix/Spock-worker"; - description = "Background workers for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-worker" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector @@ -17797,6 +17239,23 @@ self: { license = "GPL"; }) {}; + "ViennaRNAParser_1_3_0" = callPackage + ({ mkDerivation, base, hspec, parsec, ParsecTools, process + , transformers + }: + mkDerivation { + pname = "ViennaRNAParser"; + version = "1.3.0"; + sha256 = "a0d10a770b194f3bf6ed5143f89ea3654eebe860bf980a85806c84889efea738"; + libraryHaskellDepends = [ + base parsec ParsecTools process transformers + ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Libary for parsing ViennaRNA package output"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -18108,25 +17567,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_3_1_0" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, user32, winmm - }: - mkDerivation { - pname = "Win32"; - version = "2.3.1.0"; - sha256 = "685a695e9ec86efb06d3a2effb3e18f916c8696e71ca4811cb53befa04323ff9"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder user32 winmm - ]; - homepage = "https://github.com/haskell/win32"; - description = "A binding to part of the Win32 library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; - "Win32" = callPackage ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 , shfolder, user32, winmm @@ -18146,6 +17586,18 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage + ({ mkDerivation, base, Win32 }: + mkDerivation { + pname = "Win32-console"; + version = "0.1.0.0"; + sha256 = "69d8cc973b9d08571e01eb33aca6840aae4a084e80e55313c878ac3602712704"; + libraryHaskellDepends = [ base Win32 ]; + description = "Binding to the Win32 console API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-dhcp-server" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { @@ -18520,8 +17972,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.3"; - sha256 = "d62e8062e1a2d2f00d8e6d8a707fb798ae5b5cc2c48a513375d5634fef116fd4"; + version = "0.1.0.4"; + sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -19512,26 +18964,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "acid-state_0_14_1" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, extensible-exceptions, filepath, mtl, network - , safecopy, stm, template-haskell, unix - }: - mkDerivation { - pname = "acid-state"; - version = "0.14.1"; - sha256 = "5ae9dde518e2aedbb1650445023ff45049541a18e8ca5e7f1a5269507c034fc2"; - libraryHaskellDepends = [ - array base bytestring cereal containers directory - extensible-exceptions filepath mtl network safecopy stm - template-haskell unix - ]; - homepage = "http://acid-state.seize.it/"; - description = "Add ACID guarantees to any serializable Haskell data structure"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, extensible-exceptions, filepath, mtl, network @@ -20221,7 +19653,6 @@ self: { transformers ]; testHaskellDepends = [ base directory doctest filepath ]; - doCheck = false; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -20472,37 +19903,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson_0_11_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, 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"; - sha256 = "447a454b51b8d6ca9e3b59bc5918115a880a9320afeb9030000fe6c87fd2285e"; - revision = "3"; - editedCabalFile = "eba3349e8834893267f4cd28c153613c8c6ea0acb9775db221ad9532d6f96ce1"; - 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 base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl @@ -20515,6 +19915,8 @@ self: { pname = "aeson"; version = "0.11.2.1"; sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c"; + revision = "1"; + editedCabalFile = "e97fac43eddd037bf21752ea10150a224b9c08d267f634ea54f799023a6c5e13"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist fail ghc-prim hashable mtl scientific syb tagged template-haskell text time @@ -20531,7 +19933,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_0_0_0" = callPackage + "aeson_1_0_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , bytestring, containers, deepseq, dlist, generic-deriving , ghc-prim, hashable, hashable-time, HUnit, QuickCheck @@ -20541,8 +19943,10 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.0.0.0"; - sha256 = "a336e25fcd547a277e55f5bdbfdbf896038d0e2311e8396cca15fb3973ef6be9"; + version = "1.0.1.0"; + sha256 = "6053851a44bb858691cfd991bf7ba2a0e151ae574fdd3ce3aeea33e1b2855c5f"; + revision = "1"; + editedCabalFile = "bb8ad9976eea1ce6d53d279639104c53da92d01ffec90d1ee56acbd6b62b4b04"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20555,7 +19959,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; @@ -20651,10 +20054,8 @@ self: { }: mkDerivation { pname = "aeson-compat"; - version = "0.3.5.1"; - sha256 = "6ab707c4e4f15d2f55e968a91809ab52c06d0099a58c1255c0f0c382caf3c843"; - revision = "1"; - editedCabalFile = "3cf09a8689292ddb50651736b5e0b197e4d473632965855f265fbe3e91b8be63"; + version = "0.3.6"; + sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions hashable nats scientific semigroups tagged text time @@ -20822,7 +20223,6 @@ self: { aeson base bytestring lens text unordered-containers vector ]; testHaskellDepends = [ base doctest ]; - doCheck = false; description = "Lens of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20911,8 +20311,8 @@ self: { }: mkDerivation { pname = "aeson-pretty"; - version = "0.8.1"; - sha256 = "922a7c4413394b28c83e70d41f105e5bb2b991e1e47e2d802876a33589b6e6a1"; + version = "0.8.2"; + sha256 = "6cb429821040bdd6f819b1c6170cac630a4155fa57fa24eb3d496c06030fb9b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21361,40 +20761,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "airship_0_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, cryptohash - , directory, either, filepath, http-date, http-media, http-types - , lifted-base, microlens, mime-types, mmorph, monad-control, mtl - , network, old-locale, random, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-base, unix - , unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.5.0"; - sha256 = "f42e81e118a419125ed559f6041a7c17fd07020d2bb5052d1649301049689951"; - revision = "1"; - editedCabalFile = "ab014ad2f1fe2d23bb67c980755c67622843dd6b1a591470de4f7773668fffd2"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive cryptohash directory either - filepath http-date http-media http-types lifted-base microlens - mime-types mmorph monad-control mtl network old-locale random text - time transformers transformers-base unix unordered-containers wai - wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - jailbreak = true; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "airship" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers @@ -21513,13 +20879,12 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "4.3.1"; - sha256 = "16a94b1d7fb03a6184755ad10b3c6691d9a7b5f2a02006b2891fefd6087ecaa1"; + version = "4.3.2"; + sha256 = "819e5f3d0c36cddf108979c816ee96fbe8da54d097939971501677cdabd2bed9"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split ]; - jailbreak = true; homepage = "http://github.com/dsorokin/aivika-experiment-chart"; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; @@ -21617,23 +20982,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; - "alarmclock_0_2_0_9" = callPackage - ({ mkDerivation, base, stm, time, unbounded-delays }: - mkDerivation { - pname = "alarmclock"; - version = "0.2.0.9"; - sha256 = "606b06d8e037258cdd51a4f0aa9869b33dfa9dc34eb605c2f6a7357778bd676d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base stm time unbounded-delays ]; - executableHaskellDepends = [ base time ]; - jailbreak = true; - homepage = "https://bitbucket.org/davecturner/alarmclock"; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "alarmclock" = callPackage ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: mkDerivation { @@ -21734,31 +21082,29 @@ self: { "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, hxt, megaparsec, mtl - , optparse-applicative, path, path-io, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, hspec, hxt + , megaparsec, mtl, optparse-applicative, path, path-io, QuickCheck + , random, text, tf-random, transformers, yaml }: mkDerivation { pname = "alga"; - version = "0.2.1"; - sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7"; + version = "0.2.2"; + sha256 = "3e90507199b1eb960bdad6bf6a531068cc60898d1fa289d52fa230500ee920f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline hxt megaparsec mtl path random - text tf-random transformers + base containers exceptions haskeline hxt megaparsec mtl path + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline hxt megaparsec mtl optparse-applicative path path-io - random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline hxt megaparsec mtl optparse-applicative path + path-io QuickCheck random text tf-random transformers yaml ]; testHaskellDepends = [ - base containers hxt megaparsec mtl QuickCheck random test-framework - test-framework-quickcheck2 text tf-random transformers + base containers hspec hxt megaparsec mtl QuickCheck random text + tf-random transformers ]; - jailbreak = true; homepage = "https://github.com/mrkkrp/alga"; description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; @@ -22002,6 +21348,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alphachar" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens, parsec + , parsers, QuickCheck, template-haskell + }: + mkDerivation { + pname = "alphachar"; + version = "0.0.1"; + sha256 = "3b0e0f756de147603602b45e8d5018abd705d3a4c73ca662f306daec65e7b75d"; + libraryHaskellDepends = [ base lens parsers ]; + testHaskellDepends = [ + base directory doctest filepath parsec QuickCheck template-haskell + ]; + jailbreak = true; + homepage = "https://github.com/data61/alphachar"; + description = "A character between a-z"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alpino-tools" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, conduit , containers, hexpat-pickle, MonadRandom, mtl, random-shuffle @@ -22875,7 +22240,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; @@ -23399,7 +22763,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; @@ -23563,7 +22926,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; @@ -23659,36 +23021,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amqp_0_13_1" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.13.1"; - sha256 = "3ea6523228f1c2bf0622d52ebf73c9e3c2e2af637a7ea29908c07ff9fa0dd4ae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - doCheck = false; - homepage = "https://github.com/hreinhardt/amqp"; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amqp" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations @@ -23712,7 +23044,6 @@ self: { data-binary-ieee754 hspec hspec-expectations network network-uri split stm text vector ]; - doCheck = false; homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; @@ -23920,7 +23251,6 @@ self: { tasty-hunit tasty-quickcheck text time transformers unix unordered-containers ]; - doCheck = false; homepage = "http://github.com/MichaelXavier/Angel"; description = "Process management and supervision daemon"; license = stdenv.lib.licenses.bsd3; @@ -24048,8 +23378,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.0"; sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424"; - revision = "2"; - editedCabalFile = "76329a4d951e443e7d43bc570d6420d03b9a6a0aa337f22efbb5f4ff7006bf22"; + revision = "3"; + editedCabalFile = "f95f677bc3d419b5ad555799a7456684a11612e35ab08e2fe557323ed22d3127"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -24097,12 +23427,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ansigraph_0_3_0_0" = callPackage + "ansigraph_0_3_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.0"; - sha256 = "0eb9433a0f282e07ee5f0eabba5bda296daedc801293a6a3c54915b0fbbc510f"; + version = "0.3.0.2"; + sha256 = "d3cefc45710751473685ca621969e04e9bc27218ecc581d3c38164c81df05a20"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -24220,6 +23550,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiprimes" = callPackage + ({ mkDerivation, base, hspec, primes }: + mkDerivation { + pname = "antiprimes"; + version = "0.1.0.1"; + sha256 = "8e8b457ec223b9df3c3036d1c5fd1fd4c62144a911a4284a3e38fc2a1a9c292b"; + libraryHaskellDepends = [ base primes ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wokibe/antiprimes#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "antiquoter" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -24982,39 +24325,6 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "apply-refact_0_2_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.2.0.0"; - sha256 = "f74abeae9f6ad6e3ab5b00b108e99c4351ff26f691f5a0c1d3662b2b18648d5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - jailbreak = true; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -25186,36 +24496,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; - "arbtt_0_9_0_9" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.9"; - sha256 = "4fdb7d699030c593c25b3a58638988a2c51c122ee49777e644b4a70ea86319a5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath @@ -25621,6 +24901,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arithmoi_0_4_3_0" = callPackage + ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp + , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, transformers + , transformers-compat + }: + mkDerivation { + pname = "arithmoi"; + version = "0.4.3.0"; + sha256 = "daa3343d4be19d0a8574c542c9188f6f3075098c86c69d3bc66acd5091d5d196"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base containers ghc-prim integer-gmp mtl random + ]; + testHaskellDepends = [ + base containers QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck transformers transformers-compat + ]; + homepage = "https://github.com/cartazio/arithmoi"; + description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "armada" = callPackage ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }: mkDerivation { @@ -25980,35 +25284,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asciidiagram_1_3_1_1" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, filepath, FontyFruity, JuicyPixels, lens, linear, mtl - , optparse-applicative, rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.1.1"; - sha256 = "7210b71dd14b86286ac874e4de7d042402bca7cb1cff4376269b590c1df0522f"; - 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 - ]; - testHaskellDepends = [ - base blaze-html containers directory filepath JuicyPixels - rasterific-svg svg-tree text - ]; - doCheck = false; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "asciidiagram" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative @@ -26310,13 +25585,17 @@ self: { }) {}; "async-dejafu" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: + ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit + , hunit-dejafu + }: mkDerivation { pname = "async-dejafu"; - version = "0.1.2.2"; - sha256 = "ff459f69420e8ef8c26d5c7f2158d49501d1ee06a4c3a664b8826fb90f517db0"; - libraryHaskellDepends = [ base dejafu exceptions ]; - testHaskellDepends = [ base dejafu HUnit hunit-dejafu ]; + version = "0.1.3.0"; + sha256 = "d893a14c85af9cb947e3b3298b77c3665112a54cc8876dca8fc08e6871952afd"; + libraryHaskellDepends = [ base concurrency exceptions ]; + testHaskellDepends = [ + base concurrency dejafu HUnit hunit-dejafu + ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; @@ -26461,8 +25740,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.0"; - sha256 = "4e4cac3e768e7488772751264b8ecf217841a8bc45e0fc2931398d1b056f416b"; + version = "0.4.4.1"; + sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -26566,36 +25845,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "atom-conduit_0_3_1_1" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.3.1.1"; - sha256 = "d0603a5a726fade01a9fe6c5859d81c6f53d8770dc0db8b889e2717e63a3d2b3"; - revision = "1"; - editedCabalFile = "8ebc45eae1c2408eb475b62923c8801b07abe999d107f3d9b22ec22c2e8c1dad"; - libraryHaskellDepends = [ - base conduit conduit-parse exceptions foldl lens-simple - mono-traversable parsers text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default exceptions hlint - lens-simple mono-traversable parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - jailbreak = true; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "atom-conduit" = callPackage ({ mkDerivation, base, conduit, conduit-parse, data-default , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers @@ -26728,15 +25977,15 @@ self: { }) {}; "atp-haskell" = callPackage - ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl - , parsec, pretty, template-haskell, time + ({ mkDerivation, applicative-extras, base, containers, extra, HUnit + , mtl, parsec, pretty, template-haskell, time }: mkDerivation { pname = "atp-haskell"; - version = "1.13"; - sha256 = "9e71ff29922844208afc039bf0541392a58ef4d651f6020e19679a8fa68bb5b0"; + version = "1.14"; + sha256 = "350bd95dee79275f6ee1929f8ea4940a2a909f8ab8133f20c0c3c4abbfec04d0"; libraryHaskellDepends = [ - applicative-extras base containers HUnit mtl parsec pretty + applicative-extras base containers extra HUnit mtl parsec pretty template-haskell time ]; testHaskellDepends = [ base containers HUnit time ]; @@ -26813,6 +26062,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , QuickCheck, quickcheck-unicode, scientific, tasty + , tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.1.0"; + sha256 = "52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -27497,16 +26769,18 @@ self: { }) {}; "avwx" = callPackage - ({ mkDerivation, attoparsec, base, HTTP, pretty-show, text }: + ({ mkDerivation, attoparsec, base, HTTP, lens, parsers, pretty-show + , text + }: mkDerivation { pname = "avwx"; - version = "0.1.0.1"; - sha256 = "6c1c7a58489a6b2b1e19c4b5ade3d606b80f61e663e755526adbcb5c5cfcd7e8"; + version = "0.2.0.0"; + sha256 = "6a667d54fd8eedb57fb7e48917646f8fb0acd1e68ecdccc0a3e95d3804bb5c13"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ attoparsec base HTTP text ]; + libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ]; executableHaskellDepends = [ base pretty-show ]; - testHaskellDepends = [ base text ]; + testHaskellDepends = [ attoparsec base text ]; homepage = "https://github.com/hce/avwx"; description = "Parse METAR weather reports"; license = stdenv.lib.licenses.mit; @@ -27567,42 +26841,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {awesomium = null;}; - "aws_0_13_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-conduit, http-types, lifted-base, monad-control - , mtl, network, old-locale, QuickCheck, quickcheck-instances - , resourcet, safe, scientific, tagged, tasty, tasty-quickcheck - , text, time, transformers, transformers-base, unordered-containers - , utf8-string, vector, xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.13.2"; - sha256 = "998a9ddc9bc3e74a292e733aac1e9af0ec654d17aa1834319f9f6af4d907ff59"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring errors http-client lifted-base monad-control - mtl QuickCheck quickcheck-instances resourcet tagged tasty - tasty-quickcheck text time transformers transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring @@ -27633,7 +26871,6 @@ self: { resourcet tagged tasty tasty-hunit tasty-quickcheck text time transformers transformers-base ]; - doCheck = false; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -28716,21 +27953,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "base-noprelude_4_8_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.8.2.0"; - sha256 = "bd4ab7685a14d82f7586074b1af88e22a8401e552a439286710592e3a2d763c7"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - jailbreak = true; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "base-noprelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28993,24 +28215,6 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.5.2"; - sha256 = "96666a0ddd6b12eaa4d172cf76e0a4b3846da49d96a2b68d627e949ea7c75752"; - libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/basic-prelude"; - description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; - }) {}; - - "basic-prelude_0_6_1" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; version = "0.6.1"; sha256 = "6c2b905777d6e22157da48d7e3d5f3862e0698736afbf4f237fff9d14e803061"; libraryHaskellDepends = [ @@ -29020,7 +28224,6 @@ self: { homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basic-sop" = callPackage @@ -29054,6 +28257,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "batch-rename" = callPackage + ({ mkDerivation, base, directory, filepath, Glob }: + mkDerivation { + pname = "batch-rename"; + version = "0.1.1.0"; + sha256 = "c22af153685c355df65c048986da2b9e5133f3892bc398dcf88aa1a6e864645e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory filepath Glob ]; + homepage = "https://github.com/uppet/batch_rename"; + description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\""; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "battlenet" = callPackage ({ mkDerivation, aeson, base, containers, http-conduit, text }: mkDerivation { @@ -29167,18 +28384,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bcrypt_0_0_8" = callPackage - ({ mkDerivation, base, bytestring, entropy, memory }: - mkDerivation { - pname = "bcrypt"; - version = "0.0.8"; - sha256 = "9cd100975d7349190a1d8ed6459d9e2677a74385ce86b35f2da3f5c582e11100"; - libraryHaskellDepends = [ base bytestring entropy memory ]; - description = "Haskell bindings to the bcrypt password hash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -29742,30 +28947,6 @@ self: { license = "LGPL"; }) {}; - "bifunctors_5_2" = callPackage - ({ mkDerivation, base, comonad, containers, hspec, QuickCheck - , semigroups, tagged, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.2"; - sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14"; - libraryHaskellDepends = [ - base comonad containers semigroups tagged template-haskell - transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck transformers transformers-compat - ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/bifunctors/"; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , QuickCheck, semigroups, tagged, template-haskell, transformers @@ -30179,8 +29360,8 @@ self: { pname = "binary-orphans"; version = "0.1.5.1"; sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; - revision = "2"; - editedCabalFile = "987c5b6812e28ae7ab9b6073cbb6e5db7d4e1f6c286dc5b69d8a1d6bcb51831b"; + revision = "3"; + editedCabalFile = "d983e4991d7753af287d15af9e8b6391662769e8466ddf956fcc0c8c39342233"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -30212,6 +29393,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-parsers" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-lexing, deepseq, directory, filepath, QuickCheck + , quickcheck-instances, quickcheck-unicode, scientific, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "binary-parsers"; + version = "0.1.0.0"; + sha256 = "f3fcce48a05ff770c1c94f876962ced3440932783b9080fbc81c21022d63a702"; + libraryHaskellDepends = [ + base binary bytestring bytestring-lexing scientific + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-lexing deepseq + directory filepath QuickCheck quickcheck-instances + quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck + text unordered-containers vector + ]; + homepage = "https://github.com/winterland1989/binary-parsers"; + description = "Extends binary with parsec/attoparsec style parsing combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -30252,7 +29457,6 @@ self: { testHaskellDepends = [ base directory doctest filepath hspec QuickCheck ]; - doCheck = false; description = "Binary and exponential searches"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30515,7 +29719,6 @@ self: { base HUnit test-framework test-framework-hunit ]; jailbreak = true; - doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; @@ -31431,21 +30634,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "biophd_0_0_4" = callPackage - ({ mkDerivation, base, binary, biocore, bytestring, parsec, text }: - mkDerivation { - pname = "biophd"; - version = "0.0.4"; - sha256 = "a31005a449218e3f383ede0a177c48ef8c7ec21ae7bc5d122bd6eb6a9e1bfb82"; - libraryHaskellDepends = [ - base binary biocore bytestring parsec text - ]; - homepage = "https://patch-tag.com/r/dfornika/biophd/home"; - description = "Library for reading phd sequence files"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "biophd" = callPackage ({ mkDerivation, base, binary, biocore, bytestring, parsec, text , time, time-locale-compat @@ -31607,7 +30795,6 @@ self: { base base58string bitcoin-script bitcoin-tx bytestring hspec http-client lens text wreq ]; - doCheck = false; homepage = "http://www.leonmergen.com/opensource.html"; description = "Provides access to the RPC API of Bitcoin Core"; license = stdenv.lib.licenses.mit; @@ -31630,7 +30817,6 @@ self: { base bitcoin-api bitcoin-tx bytestring conduit hspec http-client lens text wreq ]; - doCheck = false; homepage = "http://www.leonmergen.com/opensource.html"; description = "Higher level constructs on top of the bitcoin-api package"; license = stdenv.lib.licenses.mit; @@ -31658,22 +30844,21 @@ self: { "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, binary, bytestring, cereal, errors - , haskoin-core, hexstring, QuickCheck, scientific, text, time + , base64-bytestring, bytestring, cereal, errors, haskoin-core + , hexstring, QuickCheck, scientific, text, time }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.2.2.0"; - sha256 = "cc0d19904ea5363453765c702b5f1e6f1ac99a2a90d8d17223d94d610dee3806"; + version = "0.3.0.1"; + sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal errors haskoin-core hexstring scientific text - time + aeson base base16-bytestring base64-bytestring bytestring cereal + errors haskoin-core hexstring scientific text time ]; executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary + aeson base base16-bytestring base58string base64-bytestring bytestring cereal haskoin-core hexstring QuickCheck text time ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; @@ -31823,24 +31008,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bits_0_4" = callPackage - ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl - , transformers - }: - mkDerivation { - pname = "bits"; - version = "0.4"; - sha256 = "e626310d69e0808586a9c7cc965a0c2eb3413d643271e523fef8037fc8f4458b"; - libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/analytics/bits"; - description = "Various bit twiddling and bitwise serialization primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bits" = callPackage ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl , transformers @@ -31954,7 +31121,7 @@ self: { description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;}; + }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -32185,25 +31352,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blake2_0_1_0" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, hlint - , QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "blake2"; - version = "0.1.0"; - sha256 = "d4cdb38b973125fdd80a12f335ec536dc5c5d1dfd5611c9ebe46c3bf78841ce5"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring hlint QuickCheck tasty - tasty-quickcheck - ]; - homepage = "https://github.com/centromere/blake2"; - description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blake2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hlint , QuickCheck, tasty, tasty-quickcheck @@ -32277,7 +31425,6 @@ self: { testHaskellDepends = [ base containers directory process shake stm text time unix vector ]; - doCheck = false; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; @@ -32437,29 +31584,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-html_0_8_1_1" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.8.1.1"; - sha256 = "f8d2e39764b318f5dde33288f9f11a125ac51552c48b981e2b8068002728dcb6"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework @@ -32552,26 +31676,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "blaze-markup_0_7_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.7.0.3"; - sha256 = "3e69a0e88dde5a6a3c8b4204d847a545f7872025a2ac4554cd5df2861aa41b20"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -32802,7 +31906,6 @@ self: { QuickCheck quickcheck-properties semigroups text time unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -33038,20 +32141,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "bmp_1_2_5_2" = callPackage - ({ mkDerivation, base, binary, bytestring }: - mkDerivation { - pname = "bmp"; - version = "1.2.5.2"; - sha256 = "bdd8681204d79176a974100958a020bb65471752ae7819e5fad7856abd700839"; - libraryHaskellDepends = [ base binary bytestring ]; - jailbreak = true; - homepage = "http://code.ouroborus.net/bmp"; - description = "Read and write uncompressed BMP image files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bmp" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -33116,8 +32205,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.5.0.0"; - sha256 = "3720a7004ebe8b1334bbc1c2fe240f20a49fbb1ca9003a5f7257dad5ed2ba3ab"; + version = "0.6.0.0"; + sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33148,8 +32237,8 @@ self: { }: mkDerivation { pname = "bond-haskell"; - version = "0.1.4.0"; - sha256 = "5590a50af8e143df9b0fd9dcee284fde9f051a8684dd45f3c769ce1d54f10419"; + version = "0.1.4.1"; + sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -33172,8 +32261,8 @@ self: { }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.4.0"; - sha256 = "729134e6f72594997ddf4f96c237d9ac9ab8e6c6fc5a8098c1cf17623d6de266"; + version = "0.1.4.1"; + sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33183,6 +32272,7 @@ self: { aeson base bond bytestring cmdargs directory filepath monad-loops ]; testHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://github.com/rblaze/bond-haskell#readme"; description = "Bond code generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -33215,6 +32305,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bookkeeper-permissions" = callPackage + ({ mkDerivation, base, bookkeeper, type-level-sets }: + mkDerivation { + pname = "bookkeeper-permissions"; + version = "0.1.0.0"; + sha256 = "66ea36897fd62e23eaf4de657e12c43067d86f86b441ecb819c4216889fc7cb4"; + libraryHaskellDepends = [ base bookkeeper type-level-sets ]; + homepage = "https://github.com/pkamenarsky/bookkeeper-permissions"; + description = "Permissions for bookkeeper records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33464,7 +32567,6 @@ self: { base directory doctest filepath prelude-extras transformers vector ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; @@ -33706,25 +32808,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick_0_4_1" = callPackage - ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, lens, template-haskell, text, text-zipper, transformers - , vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.4.1"; - sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d"; - libraryHaskellDepends = [ - base containers contravariant data-default deepseq lens - template-haskell text text-zipper transformers vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, microlens, microlens-mtl, microlens-th, template-haskell @@ -33732,8 +32815,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.8"; - sha256 = "f730fd999e070700d90d36aadf8716aaf7d86094900f204f06f6593b5e5b1382"; + version = "0.9"; + sha256 = "3e13c7ec5be06e416fc609e565e765e91f2cdf967aa97589fcff4dc0f73b3d40"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34456,19 +33539,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring-builder_0_10_6_0_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq }: - mkDerivation { - pname = "bytestring-builder"; - version = "0.10.6.0.0"; - sha256 = "9c439987d11150ad3f73158ad3be1f9d1f70572cd2cf8fdf585765403f116fd6"; - libraryHaskellDepends = [ base bytestring deepseq ]; - doHaddock = false; - description = "The new bytestring builder, packaged outside of GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-builder" = callPackage ({ mkDerivation, base, bytestring, deepseq }: mkDerivation { @@ -34573,7 +33643,6 @@ self: { base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - doCheck = false; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; @@ -34711,28 +33780,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring-tree-builder_0_2_7" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7"; - sha256 = "1d62f411de750723b3b72bc3b60e288b3d2b52c0e982cff332544e2a7fe7a003"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-tree-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -34908,6 +33955,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "c2ats" = callPackage + ({ mkDerivation, base, containers, HUnit, language-c, pretty + , regex-posix, test-framework, test-framework-hunit + , test-framework-th + }: + mkDerivation { + pname = "c2ats"; + version = "0.1.0.1"; + sha256 = "fd0b1a15d6545948ed719d77d3cd5cab528e3de2ff1dce371871114fb47c226f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers language-c pretty regex-posix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit test-framework-th + ]; + homepage = "https://github.com/metasepi/c2ats#readme"; + description = "Translate C code into ATS"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "c2hs" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , dlist, filepath, HUnit, language-c, pretty, process, shelly @@ -35119,10 +34189,10 @@ self: { base Cabal containers debian Diff directory filepath hsemail HUnit lens pretty process text ]; - doCheck = false; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -35244,38 +34314,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-helper_0_6_3_1" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.6.3.1"; - sha256 = "c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe"; - revision = "1"; - editedCabalFile = "63136d3d9e1dc39c8fd90687c031727aa7c8c5f38dcf2b26a3b652a44b4d8041"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers - ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim process - template-haskell temporary transformers utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string - ]; - testToolDepends = [ cabal-install ]; - jailbreak = true; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory , extra, filepath, ghc-prim, mtl, process, template-haskell @@ -35326,42 +34364,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "cabal-install_1_22_9_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl - , network, network-uri, pretty, process, QuickCheck, random - , regex-posix, stm, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, unix, zlib - }: - mkDerivation { - pname = "cabal-install"; - version = "1.22.9.0"; - sha256 = "874035e5730263653c7aa459f270efbffc06da92ea0c828e09ebc04400e94940"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring Cabal containers directory filepath HTTP mtl - network network-uri pretty process random stm time unix zlib - ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory - extensible-exceptions filepath HTTP HUnit mtl network network-uri - pretty process QuickCheck regex-posix stm test-framework - test-framework-hunit test-framework-quickcheck2 time unix zlib - ]; - jailbreak = true; - doCheck = false; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, directory @@ -35600,25 +34602,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-rpm_0_9_11" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.9.11"; - sha256 = "ba5c748e84cfda23dee92d9381b34f013bf2840452bebe53d3f0c2e1bd31d581"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-rpm" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix @@ -35911,6 +34894,38 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "cabal2nix_2_0_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal + , containers, deepseq, directory, distribution-nixpkgs, filepath + , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl + , optparse-applicative, pretty, process, SHA, split, text, time + , transformers, utf8-string, yaml + }: + mkDerivation { + pname = "cabal2nix"; + version = "2.0.2"; + sha256 = "f0c61d4674bbc9ba82d306adbb9fb39527aa73309fdea088489940fe39b02867"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bytestring Cabal containers deepseq + directory distribution-nixpkgs filepath hackage-db language-nix + lens optparse-applicative pretty process SHA split text + transformers yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring Cabal containers deepseq + directory distribution-nixpkgs filepath hackage-db language-nix + lens monad-par monad-par-extras mtl optparse-applicative pretty + process SHA split text time transformers utf8-string yaml + ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "cabal2spec" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , haskell98, old-locale, process, tar, time, unix, Unixutils, zlib @@ -36110,27 +35125,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cacophony_0_6_0" = callPackage - ({ mkDerivation, async, base, bytestring, cryptonite, deepseq, free - , hlint, lens, memory, mtl, QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "cacophony"; - version = "0.6.0"; - sha256 = "2a1b2cf962fbf2743efb36439428b89882add585a4877436533b9fc755d98a9c"; - libraryHaskellDepends = [ - base bytestring cryptonite deepseq free lens memory mtl - ]; - testHaskellDepends = [ - async base bytestring hlint mtl QuickCheck tasty tasty-quickcheck - ]; - doCheck = false; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cacophony" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , cryptonite, deepseq, directory, exceptions, free, hlint, lens @@ -36198,25 +35192,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cairo_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, gtk2hs-buildtools - , mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.1.1"; - sha256 = "58ae22451e7812a88531eaf91ae1250c277f48d0a88d1cae2438bd76f79e89f6"; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; - "cairo" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo , gtk2hs-buildtools, mtl, text, utf8-string @@ -36526,7 +35501,6 @@ self: { array base bytestring containers directory filepath fortran-src hmatrix hspec mtl QuickCheck uniplate ]; - doCheck = false; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; }) {}; @@ -36849,23 +35823,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "carray_0_1_6_4" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable - , QuickCheck, syb - }: - mkDerivation { - pname = "carray"; - version = "0.1.6.4"; - sha256 = "52964f076e8f03051f2af5e5cd6e450860dd1623ed67549a9f12f318d6c00c50"; - libraryHaskellDepends = [ - array base binary bytestring ix-shapable QuickCheck syb - ]; - testHaskellDepends = [ array base ix-shapable QuickCheck ]; - description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "carray" = callPackage ({ mkDerivation, array, base, binary, bytestring, ix-shapable , QuickCheck, syb @@ -36882,27 +35839,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cartel_0_16_0_0" = callPackage - ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , random, tasty, tasty-quickcheck, tasty-th, time, transformers - }: - mkDerivation { - pname = "cartel"; - version = "0.16.0.0"; - sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3"; - libraryHaskellDepends = [ - base directory filepath time transformers - ]; - testHaskellDepends = [ - base directory filepath multiarg QuickCheck random tasty - tasty-quickcheck tasty-th time transformers - ]; - homepage = "http://www.github.com/massysett/cartel"; - description = "Specify Cabal files in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg , optparse-applicative, pretty-show, process, QuickCheck, random @@ -37147,7 +36083,6 @@ self: { base HTF HUnit loch-th placeholders QuickCheck text ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; @@ -37693,28 +36628,29 @@ self: { libraryHaskellDepends = [ base bytestring directory filepath unix ]; - doCheck = false; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; }) {}; "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , http-client, http-conduit, lens, lens-aeson, mtl, text + , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text , transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.1.5.1"; - sha256 = "3a2eab27b2aa711141d43248a5505154945e8563d846e1db3379f486b140563c"; + version = "0.2.0.0"; + sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; homepage = "https://github.com/MichelBoucey/cayley-client"; description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-dickson" = callPackage @@ -37904,27 +36840,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal_0_5_2_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.2.0"; - sha256 = "b50e77ad340d672d0f2c53ce526a088ecdf74f1ed34f6bb2f95deab725dd2b14"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cereal" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 @@ -38312,10 +37227,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "chalk"; - version = "0.1.0.1"; - sha256 = "be7bc5016333d20771b30fb8375af438f92eb1d2c4af7bf6beac702e42b93835"; + version = "0.1.0.2"; + sha256 = "f24e9f7990a72ffcdc2b5a6613780b04c319bdc4151794b8afc3675bf3f8dec7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/joom/chalk"; description = "Terminal string styling"; license = stdenv.lib.licenses.mit; @@ -38980,27 +37894,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chunked-data_0_2_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , mono-traversable, semigroups, text, transformers, vector - }: - mkDerivation { - pname = "chunked-data"; - version = "0.2.0"; - sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272"; - revision = "3"; - editedCabalFile = "8fd1f0e3423794b4389c4741ad6a48297197b96153e002c822c0ea9a5e96a108"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers mono-traversable - semigroups text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/fpco/chunked-data"; - description = "Typeclasses for dealing with various chunked data representations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "chunked-data" = callPackage ({ mkDerivation, base, bytestring, containers, semigroups, text , transformers, vector @@ -39120,21 +38013,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cipher-aes128_0_7_0_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: - mkDerivation { - pname = "cipher-aes128"; - version = "0.7.0.1"; - sha256 = "18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662"; - libraryHaskellDepends = [ - base bytestring cereal crypto-api tagged - ]; - homepage = "https://github.com/TomMD/cipher-aes128"; - description = "AES and common modes using AES-NI when available"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cipher-aes128" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { @@ -39594,34 +38472,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc_0_6_21" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra - , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, unix - , unordered-containers - }: - mkDerivation { - pname = "clash-ghc"; - version = "0.6.21"; - sha256 = "46be5b228391132b4bb1b21ed1ab599d14bd89efcd808e3fc20e8d553170cf22"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise - hashable haskeline lens mtl process text time transformers - unbound-generics unix unordered-containers - ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl @@ -39652,30 +38502,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib_0_6_19" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.19"; - sha256 = "71faa79c1241b2f121aa3e4247949c7fb7640cc36cf46099f4f8bcf70721ca44"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable - integer-gmp lens mtl pretty process template-haskell text time - transformers unbound-generics unordered-containers uu-parsinglib - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl @@ -39697,27 +38523,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-prelude_0_10_10" = callPackage - ({ mkDerivation, array, base, data-default, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens - , QuickCheck, reflection, singletons, template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.10"; - sha256 = "64577debc8c970919268374eb0b422a4b8152422df3683ce3b665cc1cfa94d9c"; - libraryHaskellDepends = [ - array base data-default ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39737,10 +38542,10 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; - doCheck = false; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -39756,24 +38561,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.7"; - sha256 = "377e57de5f09852b6c2059fc8d114d01b48005f270265092e98251d3c9c4d92b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-systemverilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -39789,23 +38576,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-verilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.7"; - sha256 = "1794d45c04ce52c6488f970a465861785948e2ffa2ca275678efdb75902945ab"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39824,23 +38594,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-vhdl_0_6_15" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.15"; - sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39859,6 +38612,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -39888,34 +38642,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "classy-prelude_0_12_8" = callPackage - ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, dlist, enclosed-exceptions, exceptions - , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , mutable-containers, primitive, QuickCheck, semigroups, stm, text - , time, time-locale-compat, transformers, transformers-base - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "0.12.8"; - sha256 = "afa89959a687d74b851a2a3fce1b2d397cc40041ff5223ec9317bd723d47ca7f"; - libraryHaskellDepends = [ - base basic-prelude bifunctors bytestring chunked-data containers - dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base - mono-traversable mtl mutable-containers primitive semigroups stm - text time time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim @@ -39927,8 +38653,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0.1"; - sha256 = "3df8f7120fa540415fd83d7ddc43b9fc088cc1cefc97bc08ca32c711b636c47e"; + version = "1.0.0.2"; + sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -39946,29 +38672,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-conduit_0_12_8" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "0.12.8"; - sha256 = "5ba261f04339ea8533abbe760257f9108433c9183c644e87bca5ba637ed1663d"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "conduit instances for classy-prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -39990,27 +38693,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-yesod_0_12_8" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "0.12.8"; - sha256 = "fa2c5c8407b0b7e10abeb360d237eec9e629cb34098dc1e84a23baf106f85f5e"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -40030,28 +38712,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "clay_0_10_1" = callPackage - ({ mkDerivation, base, HUnit, mtl, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "clay"; - version = "0.10.1"; - sha256 = "3bb820281b8824055f5a087273f6578ccd5b6f6575891ec88933d9ebdf920a54"; - revision = "1"; - editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ - base HUnit mtl test-framework test-framework-hunit text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clay" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { @@ -40079,8 +38739,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.18"; - sha256 = "48e6a3093b6c9830f9830952833d95bc1a6de742ffb38f8873b0963f8cf7ebce"; + version = "0.23.19.1"; + sha256 = "37798295b8a227277b4531c9899722fda57b65bf7f191844656a7652b5026e83"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -40213,31 +38873,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "clckwrks-plugin-page_0_4_3_3" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, web-plugins, web-routes - , web-routes-happstack, web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-page"; - version = "0.4.3.3"; - sha256 = "cae111456424fe22eae06a3a0ef1d417d9373b4d09809920a678664b89d7e161"; - libraryHaskellDepends = [ - acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl - old-locale random reform reform-happstack reform-hsp safecopy - tagsoup template-haskell text time time-locale-compat uuid - web-plugins web-routes web-routes-happstack web-routes-th - ]; - homepage = "http://www.clckwrks.com/"; - description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clckwrks-plugin-page" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server @@ -40577,12 +39212,23 @@ self: { sha256 = "886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/corsis/clock"; description = "High-resolution clock functions: monotonic, realtime, cputime"; license = stdenv.lib.licenses.bsd3; }) {}; + "clock-extras" = callPackage + ({ mkDerivation, base, clock, hspec }: + mkDerivation { + pname = "clock-extras"; + version = "0.1.0.1"; + sha256 = "7fce6106ea22e4a9322b53f3e2feb94f03481d3f9d5c2fb3280118db6fb5b623"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base hspec ]; + description = "A couple functions that probably should be in the 'clock' package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clocked" = callPackage ({ mkDerivation, base, clock, containers, MonadCatchIO-transformers , QtCore, transformers @@ -40791,9 +39437,9 @@ self: { base binary hierarchical-clustering matrices mwc-random Rlang-QQ split tasty tasty-hunit tasty-quickcheck vector ]; - doCheck = false; description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clustertools" = callPackage @@ -40831,7 +39477,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; "cmaes" = callPackage ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random @@ -41135,6 +39781,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "code-page" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "code-page"; + version = "0.1"; + sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/code-page"; + description = "Windows code page library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "codec" = callPackage ({ mkDerivation, aeson, base, binary, binary-bits, bytestring , data-default-class, mtl, template-haskell, text, transformers @@ -41265,34 +39924,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "codex_0_4_0_10" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash - , directory, either, filepath, hackage-db, http-client, lens - , machines, machines-directory, MissingH, monad-loops, network - , process, tar, text, transformers, wreq, yaml, zlib - }: - mkDerivation { - pname = "codex"; - version = "0.4.0.10"; - sha256 = "1dd23ef2991b14e6c212b91b86ef2c14de86ece126ab7bcf4ed926d1413ad812"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers cryptohash directory either - filepath hackage-db http-client lens machines machines-directory - process tar text transformers wreq yaml zlib - ]; - executableHaskellDepends = [ - base bytestring Cabal directory either filepath hackage-db MissingH - monad-loops network process transformers wreq yaml - ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/codex"; - description = "A ctags file generator for cabal project dependencies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "codex" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens @@ -41301,8 +39932,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.5.0.0"; - sha256 = "f516ed2f3751d3938e526aa61fb94a3553fbe6b6ffe76ed49fd442587e849984"; + version = "0.5.0.1"; + sha256 = "84822ced72c93bd22249f9fe05c79685050b3e7d2d3f7adedd9ded52a8c4407c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41681,6 +40312,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour-space" = callPackage + ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups + , vector-space + }: + mkDerivation { + pname = "colour-space"; + version = "0.1.0.0"; + sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48"; + libraryHaskellDepends = [ + base colour JuicyPixels manifolds semigroups vector-space + ]; + jailbreak = true; + homepage = "https://github.com/leftaroundabout/colour-space"; + description = "Instances of the manifold-classes for colour types"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coltrane" = callPackage ({ mkDerivation, base, bytestring, HTTP, http-types, HUnit, mtl , regex-compat, text, wai, wai-extra, warp @@ -41965,27 +40614,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "comonad_4_2_7_2" = callPackage - ({ mkDerivation, base, containers, contravariant, directory - , distributive, doctest, filepath, semigroups, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "comonad"; - version = "4.2.7.2"; - sha256 = "b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b"; - libraryHaskellDepends = [ - base containers contravariant distributive semigroups tagged - transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - homepage = "http://github.com/ekmett/comonad/"; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "comonad" = callPackage ({ mkDerivation, base, containers, contravariant, directory , distributive, doctest, filepath, semigroups, tagged, transformers @@ -42376,7 +41004,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; @@ -42643,6 +41270,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concurrency" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.0.0.0"; + sha256 = "541f9e730c18464ec8399214097a5fb62cfce319baa3495bf3349e0f4d9cf19d"; + revision = "1"; + editedCabalFile = "3de0faeb048451ba463026c4d88e9cedf21470c4568a044be0b4bff460ad1c90"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -42692,7 +41338,6 @@ self: { unbounded-delays ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -42718,23 +41363,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "concurrent-output_1_7_6" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.7.6"; - sha256 = "ca3668dad7999dd1366582bff46ef3a50ba8ce9a775a812883094db92adac6a5"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "concurrent-output" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix @@ -42941,29 +41569,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "conduit_1_2_6_6" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, mtl, QuickCheck, resourcet, safe, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit"; - version = "1.2.6.6"; - sha256 = "958fe8636ef49b947493fd23ea1522d51e82e6acc87cb9e5038398e25fa5d188"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph mtl resourcet transformers - transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - transformers - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers @@ -43061,35 +41666,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "conduit-combinators_1_0_4" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.4"; - sha256 = "75a90da15f7bd70748ebb3a3612d50896e421d8fdbaa4879e8aabfbeaf4dc7de"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -43100,34 +41676,6 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.5"; - sha256 = "b6e65bcfec9a9b57e268a7a16f067af500f1e8b8f7dad9b96e9aad7bf603c6cd"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-combinators_1_0_6" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; version = "1.0.6"; sha256 = "215c5b29fbeb0177ac7b80f67be9f3c7eaa2a231b9fcb25916ab1ceda007a2fa"; libraryHaskellDepends = [ @@ -43144,7 +41692,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -43154,8 +41701,8 @@ self: { }: mkDerivation { pname = "conduit-connection"; - version = "0.1.0.1"; - sha256 = "c4020f9f2aba7baedeb7dceb9ac092e2aefaa7480d57eb38595800da911671fc"; + version = "0.1.0.2"; + sha256 = "6559115e670911b51a0ce0eb3ea4893fa1c2d32d9c2706af6c835137fbf682ce"; libraryHaskellDepends = [ base bytestring conduit connection resourcet transformers ]; @@ -43195,6 +41742,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_1_13_3" = 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.13.3"; + sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48"; + 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 + ]; + jailbreak = true; + 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 @@ -43277,27 +41852,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-parse_0_1_1_1" = callPackage - ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl - , parsers, resourcet, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.1.1"; - sha256 = "4366a66f5980bd328730c5d44b99f67d7081e5ef76b554bc8284942bf9977f4a"; - libraryHaskellDepends = [ - base conduit dlist exceptions mtl parsers text transformers - ]; - testHaskellDepends = [ - base conduit exceptions hlint mtl parsers resourcet tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-parse" = callPackage ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text @@ -43510,6 +42064,8 @@ self: { pname = "configuration-tools"; version = "0.2.14"; sha256 = "c54c40d72423207f63c7108ea6076612a179c0c35d7e10e540858ba92946f9fb"; + revision = "1"; + editedCabalFile = "7f01977bdb2fa42e3bf503d036db68e4c2d2aba13295b817c812ce17067ca1fc"; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection @@ -43529,6 +42085,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_2_15" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, text, tls + , transformers, unordered-containers, wai, warp, warp-tls, x509 + , x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.2.15"; + sha256 = "8231a7a893add8ae78ccb2b25e0fa98b0c0fd7d7a5f6e2e88d3711e93576121e"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors text tls + transformers unordered-containers x509 x509-system x509-validation + yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + homepage = "https://github.com/alephcloud/hs-configuration-tools"; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -43647,25 +42237,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "connection_0_2_5" = callPackage - ({ mkDerivation, base, byteable, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.2.5"; - sha256 = "8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124"; - libraryHaskellDepends = [ - base byteable bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-connection"; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "connection" = callPackage ({ mkDerivation, base, byteable, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store @@ -43756,8 +42327,8 @@ self: { ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.2.5.1"; - sha256 = "660941f0cfc79793a2102a8638802f5df009a8cc155ca3194c76e3902feaede8"; + version = "0.3.0.0"; + sha256 = "71bd103c5c3fa5faaf3c727fd42e9202ed6798c0cd7fb143ab9baa2e7dae5bc2"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -43793,8 +42364,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "constraint-classes"; - version = "0.2.0"; - sha256 = "7cc34540b60d0e1a89230d1ea65ea05af49524e102915aa3b3d908158b134580"; + version = "0.3.0"; + sha256 = "369f8b61d20c1f83e6460768a8316b029c32f61c4bfe38e2538c9c075802e8f2"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/guaraqe/constraint-classes#readme"; description = "Prelude classes using ConstraintKinds"; @@ -43864,10 +42435,10 @@ self: { testHaskellDepends = [ base http-client HUnit network tasty tasty-hunit text transformers ]; - doCheck = false; homepage = "https://github.com/alphaHeavy/consul-haskell"; description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "consumers" = callPackage @@ -44126,23 +42697,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "contravariant-extras_0_3_2" = callPackage - ({ mkDerivation, base-prelude, contravariant, template-haskell - , tuple-th - }: - mkDerivation { - pname = "contravariant-extras"; - version = "0.3.2"; - sha256 = "9fd92b6d240f9492c0474ce5261751ed9f01b6fd4292f0bbfc482e19d9012505"; - libraryHaskellDepends = [ - base-prelude contravariant template-haskell tuple-th - ]; - homepage = "https://github.com/nikita-volkov/contravariant-extras"; - description = "Extras for the \"contravariant\" package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "contravariant-extras" = callPackage ({ mkDerivation, base-prelude, contravariant, template-haskell , tuple-th @@ -45031,32 +43585,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "courier_0_1_1_3" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, containers - , directory, hslogger, HUnit, network, stm, test-framework - , test-framework-hunit, text, uuid - }: - mkDerivation { - pname = "courier"; - version = "0.1.1.3"; - sha256 = "0cf44b62c2b134a7bf9aa779ef2b04d91f4b44a46273bb478ecdcbd9d1198e83"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring cereal containers hslogger network stm text - uuid - ]; - executableHaskellDepends = [ base cereal ]; - testHaskellDepends = [ - async base cereal containers directory hslogger HUnit network stm - test-framework test-framework-hunit - ]; - homepage = "http://github.com/hargettp/courier"; - description = "A message-passing library for simplifying network applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "courier" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework @@ -45144,8 +43672,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.2.0.2"; - sha256 = "5f6de007fa0b2548d40fdb18cb44b37b8f02cc7cbe631e74ba20ab1aec811554"; + version = "0.3.0.0"; + sha256 = "56afdd13c508767615baa4a529fab0eebc73cd679ac040ef1592023489c42355"; libraryHaskellDepends = [ base containers mtl primitive transformers vector ]; @@ -45175,27 +43703,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs_1_20_1" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.1"; - sha256 = "bd6eab851ec39ed5c5e4b0eb0b956f5892a36dedabcdf127a1ffa84c8e4f6017"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cpphs" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: @@ -45293,10 +43800,9 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, deepseq }: mkDerivation { pname = "cpuinfo"; - version = "0.1.0.0"; - sha256 = "31dda274cd488fcdb295617aa2ed754ee697ad653edef5cf7fba56cb8e942623"; + version = "0.1.0.1"; + sha256 = "d1b3e3992cc0c82edfb21f30e1684bb66e6a3cb23a26b777a079702362d05655"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; - jailbreak = true; homepage = "https://github.com/TravisWhitaker/cpuinfo"; description = "Haskell Library for Checking CPU Information"; license = stdenv.lib.licenses.mit; @@ -45331,30 +43837,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs) python34;}; - "cql_3_0_7" = callPackage - ({ mkDerivation, base, bytestring, cereal, Decimal, iproute - , network, QuickCheck, tasty, tasty-quickcheck, template-haskell - , text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "cql"; - version = "3.0.7"; - sha256 = "54f8535ac3fe7abeb31557ec560f8135941346fc1ec8eb7922a9e0eda10fea76"; - libraryHaskellDepends = [ - base bytestring cereal Decimal iproute network template-haskell - text time transformers uuid vector - ]; - testHaskellDepends = [ - base bytestring cereal Decimal iproute network QuickCheck tasty - tasty-quickcheck text time uuid - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql/"; - description = "Cassandra CQL binary protocol"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute , network, QuickCheck, tasty, tasty-quickcheck, template-haskell @@ -45362,8 +43844,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "3.1.0"; - sha256 = "0639f54c5c1e1a96b27203691aa0b37d59c4309aac1f75c20864d41ad86f4c53"; + version = "3.1.1"; + sha256 = "45b0d9599dfb6b5df02eb17e18d45cef8abd7e175d4eb7f99ab94f9d50866da3"; libraryHaskellDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid vector @@ -45378,30 +43860,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cql-io_0_15_2" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, exceptions, hashable - , HsOpenSSL, iproute, lens, monad-control, mtl, mwc-random, network - , retry, semigroups, stm, text, time, tinylog, transformers - , transformers-base, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "0.15.2"; - sha256 = "cba9bdaae9056151a413760e5d9dea10604a7ef90867fd2c834ddc1a5b6d5669"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base uuid vector - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql-io/"; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, exceptions, hashable @@ -45635,6 +44093,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "craft" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-combinators, conduit-extra + , containers, cryptonite, derive, directory, exceptions + , fast-logger, filepath, formatting, free, hspec, hspec-megaparsec + , ini, lens, lifted-base, megaparsec, memory, MissingH + , monad-logger, mtl, path, path-io, process, process-extras + , pureMD5, QuickCheck, random, split, streaming-commons + , template-haskell, text, transformers, unix, unordered-containers + , versions, wreq, yaml + }: + mkDerivation { + pname = "craft"; + version = "0.0.0.1"; + sha256 = "34cb8c42afa115c0c834af170cb7c51a15fa8819e24bd310c1288a8ad6eb6ad3"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-combinators conduit-extra containers cryptonite derive + directory exceptions fast-logger filepath formatting free ini lens + lifted-base megaparsec memory MissingH monad-logger mtl path + path-io process process-extras pureMD5 QuickCheck random split + streaming-commons template-haskell text transformers unix + unordered-containers versions wreq yaml + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec QuickCheck + ]; + jailbreak = true; + description = "A UNIX configuration management library in Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craftwerk" = callPackage ({ mkDerivation, base, colour, mtl, vector-space }: mkDerivation { @@ -46331,7 +44822,6 @@ self: { base byteable bytestring crypto-random tasty tasty-hunit tasty-quickcheck vector ]; - doCheck = false; homepage = "https://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; license = stdenv.lib.licenses.bsd3; @@ -46355,7 +44845,6 @@ self: { crypto-random cryptohash tasty tasty-hunit tasty-kat tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/vincenthz/hs-crypto-pubkey"; description = "Public Key cryptography"; license = stdenv.lib.licenses.bsd3; @@ -46441,6 +44930,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "crypto-simple" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }: + mkDerivation { + pname = "crypto-simple"; + version = "0.1.0.0"; + sha256 = "a90f3e2643bbeee1849581df44e8705c296d590cc8e25e0b6bf5bebc9fe62e6e"; + libraryHaskellDepends = [ base bytestring cryptonite ]; + testHaskellDepends = [ + base bytestring cryptonite hspec QuickCheck + ]; + homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme"; + description = "A simple high level encryption interface based on cryptonite"; + license = stdenv.lib.licenses.mit; + }) {}; + "crypto-totp" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptohash , tagged, unix @@ -46580,41 +45084,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptol_2_3_0" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, async, base - , base-compat, bytestring, containers, deepseq, deepseq-generics - , directory, filepath, generic-trie, gitrev, GraphSCC, happy - , haskeline, heredoc, monad-control, monadLib, old-time, presburger - , pretty, process, QuickCheck, random, sbv, simple-smt, smtLib, syb - , template-haskell, text, tf-random, transformers - , transformers-base, utf8-string - }: - mkDerivation { - pname = "cryptol"; - version = "2.3.0"; - sha256 = "403577bb14a3ebb5683b2221d9b424ff53b8e8faddb64b27f47a6b00414138ce"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat bytestring containers deepseq - deepseq-generics directory filepath generic-trie gitrev GraphSCC - heredoc monad-control monadLib old-time presburger pretty process - QuickCheck random sbv simple-smt smtLib syb template-haskell text - tf-random transformers transformers-base utf8-string - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - ansi-terminal base base-compat containers deepseq directory - filepath haskeline monad-control monadLib process random sbv - tf-random transformers - ]; - jailbreak = true; - homepage = "http://www.cryptol.net/"; - description = "Cryptol: The Language of Cryptography"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, deepseq, directory, filepath @@ -46647,15 +45116,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_15" = callPackage + "cryptonite" = callPackage ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim , integer-gmp, memory, tasty, tasty-hunit, tasty-kat , tasty-quickcheck }: mkDerivation { pname = "cryptonite"; - version = "0.15"; - sha256 = "aed8fac2bbb87705e1836a27179f85169c559b95d39199aad974d795917ac403"; + version = "0.19"; + sha256 = "1ceac099f80058111b0a57a5bd5c8f336ba875060eb69f3d1981d8bbc99885e7"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -46666,18 +45135,17 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite"; description = "Cryptography Primitives sink"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cryptonite" = callPackage + "cryptonite_0_20" = callPackage ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim , integer-gmp, memory, tasty, tasty-hunit, tasty-kat , tasty-quickcheck }: mkDerivation { pname = "cryptonite"; - version = "0.19"; - sha256 = "1ceac099f80058111b0a57a5bd5c8f336ba875060eb69f3d1981d8bbc99885e7"; + version = "0.20"; + sha256 = "261bfac4e032f24658a31d8c34abd0c0f64f9de07be69ad43a9139a7c0b5c354"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -46688,6 +45156,7 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite"; description = "Cryptography Primitives sink"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -46936,20 +45405,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "css-text_0_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "css-text"; - version = "0.1.2.1"; - sha256 = "dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6"; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; - description = "CSS parser and renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "css-text" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { @@ -46958,7 +45413,6 @@ self: { sha256 = "dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - doCheck = false; homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; license = stdenv.lib.licenses.mit; @@ -47736,7 +46190,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "darcs_2_12_0" = callPackage + "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz @@ -47750,8 +46204,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.12.0"; - sha256 = "17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d"; + version = "2.12.3"; + sha256 = "68ed535dce4bd2d8349ba04258bb56df7d47853dac9d3365fc0325a86db1cde5"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -47778,10 +46232,9 @@ self: { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; - "darcs" = callPackage + "darcs_2_12_4" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz @@ -47795,8 +46248,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.12.2"; - sha256 = "20b2eb292854c89036bae74330e71f1f3b253a369610916ddcc44f0d49f38bdd"; + version = "2.12.4"; + sha256 = "48e836a482bd2fcfe0be499fe4f255925ce50bdcf5ce8023bb9aa359288fdc49"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -47823,6 +46276,7 @@ self: { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -48442,25 +46896,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "data-default_0_5_3" = callPackage - ({ mkDerivation, base, data-default-class - , data-default-instances-base, data-default-instances-containers - , data-default-instances-dlist, data-default-instances-old-locale - }: - mkDerivation { - pname = "data-default"; - version = "0.5.3"; - sha256 = "ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034"; - libraryHaskellDepends = [ - base data-default-class data-default-instances-base - data-default-instances-containers data-default-instances-dlist - data-default-instances-old-locale - ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default" = callPackage ({ mkDerivation, base, data-default-class , data-default-instances-containers, data-default-instances-dlist @@ -48478,18 +46913,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-class_0_0_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-default-class"; - version = "0.0.1"; - sha256 = "adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31"; - libraryHaskellDepends = [ base ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48551,18 +46974,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-instances-base_0_1_0" = callPackage - ({ mkDerivation, base, data-default-class }: - mkDerivation { - pname = "data-default-instances-base"; - version = "0.1.0"; - sha256 = "9e00bc5dc8da3c53a2cb26c3c55d1ffea8272538aec678f65b7c238da09c4636"; - libraryHaskellDepends = [ base data-default-class ]; - description = "Default instances for types in base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-instances-base" = callPackage ({ mkDerivation, base, data-default-class }: mkDerivation { @@ -49209,17 +47620,20 @@ self: { "data-msgpack" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, deepseq, hashable, hspec, QuickCheck, text - , unordered-containers + , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck + , text, unordered-containers }: mkDerivation { pname = "data-msgpack"; - version = "0.0.2"; - sha256 = "59c591a565e0429f6de70d1d8e14c7588547bdff443f0769835f4a534e0690ee"; + version = "0.0.3"; + sha256 = "8df834c9495ff45c68a09a67a01dcf7ae5288d88c3e3af0d8b2060e19f841a6a"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 deepseq hashable QuickCheck text unordered-containers ]; + executableHaskellDepends = [ base bytestring groom ]; testHaskellDepends = [ base bytestring containers hashable hspec QuickCheck text unordered-containers @@ -49971,29 +48385,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dawg-ord_0_5_0_1" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers - , vector - }: - mkDerivation { - pname = "dawg-ord"; - version = "0.5.0.1"; - sha256 = "febbe3a465f67931bf1a96069680c862b8cd9a423013f85e21204832626a5dee"; - libraryHaskellDepends = [ - base containers mtl transformers vector - ]; - testHaskellDepends = [ - base containers HUnit mtl smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - jailbreak = true; - homepage = "https://github.com/kawu/dawg-ord"; - description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dawg-ord" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -50106,7 +48497,6 @@ self: { HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple process split template-haskell text time yaml-light ]; - doCheck = false; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50656,26 +49046,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "debian-build_0_9_2_0" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.9.2.0"; - sha256 = "7d911ef9300a073f8e0db17c3480790a8c6da712ed8141c65098fc7ca99da750"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - homepage = "http://twitter.com/khibino/"; - description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "debian-build" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers @@ -50922,27 +49292,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deepseq-generics_0_1_1_2" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "deepseq-generics"; - version = "0.1.1.2"; - sha256 = "839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06"; - revision = "1"; - editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ - base deepseq ghc-prim HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/hvr/deepseq-generics"; - description = "GHC.Generics-based Control.DeepSeq.rnf implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deepseq-generics" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework , test-framework-hunit @@ -51159,21 +49508,20 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, array, atomic-primops, base, containers, deepseq - , dpor, exceptions, monad-control, monad-loops, mtl, semigroups - , stm, template-haskell, transformers, transformers-base + ({ mkDerivation, base, concurrency, containers, deepseq, dpor + , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers + , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.3.2.1"; - sha256 = "cf3ed66e7b3cf9b45f42227d45cc6136f36b1a06744de1fba2b3aebe84d0777f"; + version = "0.4.0.0"; + sha256 = "876c92c590cce573cb600a1bb575b42ed2c2fb332c59803c5f0667a675df80d4"; libraryHaskellDepends = [ - array atomic-primops base containers deepseq dpor exceptions - monad-control monad-loops mtl semigroups stm template-haskell - transformers transformers-base + base concurrency containers deepseq dpor exceptions monad-loops mtl + ref-fd semigroups transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; - description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; + description = "Systematic testing for Haskell concurrency"; license = stdenv.lib.licenses.mit; }) {}; @@ -51406,19 +49754,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dependent-map_0_2_2_0" = callPackage - ({ mkDerivation, base, containers, dependent-sum }: - mkDerivation { - pname = "dependent-map"; - version = "0.2.2.0"; - sha256 = "f4d79312f2a584de265339f5a2ca0bfbd1d6383fb24560ca9148f7559727871f"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -51669,6 +50004,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-storable" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "derive-storable"; + version = "0.1.0.3"; + sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://www.github.com/mkloczko/derive-storable/"; + description = "Derive Storable instances with help of GHC.Generics."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "derive-storable-plugin" = callPackage + ({ mkDerivation, base, derive-storable, ghc, ghci }: + mkDerivation { + pname = "derive-storable-plugin"; + version = "0.1.0.2"; + sha256 = "d9b080fb359169b2edd8e32cef46681666204673bd460e24dcd6bfb13ec8abcd"; + libraryHaskellDepends = [ base derive-storable ghc ghci ]; + homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; + description = "GHC core plugin supporting the derive-storable package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derive-topdown" = callPackage ({ mkDerivation, base, derive, mtl, template-haskell , template-haskell-util @@ -51700,29 +50062,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deriving-compat_0_2" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-prim, hspec, QuickCheck, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.2"; - sha256 = "763bb09a78ad4ffa00b30a3655bd01a7f2b816ebec8571c7cf059d481998b42a"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck transformers - transformers-compat - ]; - jailbreak = true; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell @@ -51730,8 +50069,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.3.2"; - sha256 = "2a89646d707202e6010155bc224aa3791032e05d433fa8629fc7dfccaf3d5888"; + version = "0.3.3"; + sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell transformers transformers-compat @@ -52027,36 +50366,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_3" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, cmdargs - , diagrams-cairo, diagrams-lib, diagrams-postscript - , diagrams-rasterific, diagrams-svg, directory, exceptions - , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens - , lucid-svg, mtl, split, transformers - }: - mkDerivation { - pname = "diagrams-builder"; - version = "0.7.2.3"; - sha256 = "4763a1e795311335dfec6b8f49deaca3b31a6f3d2bec5168a82f849df4b39029"; - configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-orphans cmdargs diagrams-lib directory exceptions - filepath hashable haskell-src-exts hint lens mtl split transformers - ]; - executableHaskellDepends = [ - base bytestring cmdargs diagrams-cairo diagrams-lib - diagrams-postscript diagrams-rasterific diagrams-svg directory - filepath JuicyPixels lens lucid-svg - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams"; - description = "hint-based build service for the diagrams graphics EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript @@ -52085,28 +50394,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-cairo_1_3_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, colour, containers - , data-default-class, diagrams-core, diagrams-lib, filepath - , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango - , split, statestack, transformers, unix, vector - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.3.1"; - sha256 = "0c3949f07592ffae838f81ea76fb88639dfbf64a3002a563101330accbadc485"; - libraryHaskellDepends = [ - array base bytestring cairo colour containers data-default-class - diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl - optparse-applicative pango split statestack transformers unix - vector - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-cairo" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath @@ -52151,26 +50438,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-canvas_1_3_0_5" = callPackage - ({ mkDerivation, base, blank-canvas, cmdargs, containers - , data-default-class, diagrams-core, diagrams-lib, lens, mtl - , NumInstances, optparse-applicative, statestack, text - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.3.0.5"; - sha256 = "624a99f868ff7fbfed123b6c3ddc0a2369d48b472bf7c5ac9cc5c3a38f755de9"; - libraryHaskellDepends = [ - base blank-canvas cmdargs containers data-default-class - diagrams-core diagrams-lib lens mtl NumInstances - optparse-applicative statestack text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-canvas" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -52212,34 +50479,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib_1_3_0_11" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , data-default, data-default-class, diagrams-core, diagrams-lib - , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom - , mtl, parsec, QuickCheck, random, semigroups, split - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.3.0.11"; - sha256 = "076523498a93223d65758e5d89435df362cf488c940048818fde8f8fbee0a6d5"; - libraryHaskellDepends = [ - base circle-packing colour containers data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout lens linear MonadRandom mtl parsec random semigroups - split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib @@ -52369,26 +50608,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-html5_1_3_0_6" = callPackage - ({ mkDerivation, base, cmdargs, containers, data-default-class - , diagrams-core, diagrams-lib, lens, mtl, NumInstances - , optparse-applicative, split, statestack, static-canvas, text - }: - mkDerivation { - pname = "diagrams-html5"; - version = "1.3.0.6"; - sha256 = "92d980c07aa22df32b898ec43c00ed2c5405c6e6d29b6fb152d420d82a4c171d"; - libraryHaskellDepends = [ - base cmdargs containers data-default-class diagrams-core - diagrams-lib lens mtl NumInstances optparse-applicative split - statestack static-canvas text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-html5" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances @@ -52408,35 +50627,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_3_1_3" = callPackage - ({ mkDerivation, active, adjunctions, array, base, colour - , containers, data-default-class, diagrams-core, diagrams-solve - , directory, distributive, dual-tree, exceptions, filepath - , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens - , linear, monoid-extras, mtl, optparse-applicative, process - , semigroups, tagged, tasty, tasty-hunit, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.3.1.3"; - sha256 = "0bf7e87e0d60af17ebf57d9d770cadc447da8db38b9f54114dd30e25a68d79e8"; - revision = "2"; - editedCabalFile = "f2c86b960dc6a1d416cd78be2e086f0e9b09b493463c1f00b60fa6e1494a01ae"; - libraryHaskellDepends = [ - active adjunctions array base colour containers data-default-class - diagrams-core diagrams-solve directory distributive dual-tree - exceptions filepath fingertree fsnotify hashable intervals - JuicyPixels lens linear monoid-extras mtl optparse-applicative - process semigroups tagged text transformers unordered-containers - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-lib" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve @@ -52564,27 +50754,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-rasterific_1_3_1_7" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable - , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split - , unix - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.3.1.7"; - sha256 = "3568aab7c5dbf557f5c1a49f5d3c0dcc1b74dcc173e31b5c2f59b9f1c9795646"; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl - optparse-applicative Rasterific split unix - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-rasterific" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable @@ -52676,30 +50845,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-svg_1_3_1_10" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, directory, filepath - , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl - , old-time, optparse-applicative, process, semigroups, split, text - , time - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.3.1.10"; - sha256 = "a8293856f359d7d9656bb0b5ca5c97cc13b6ab18eaa71ed30112038cfe0a39a7"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg - monoid-extras mtl old-time optparse-applicative process semigroups - split text time - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams/"; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath @@ -52981,23 +51126,25 @@ self: { }) {}; "difftodo" = callPackage - ({ mkDerivation, base, bytestring, diff-parse, highlighting-kate - , optparse-applicative, protolude, tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, diff-parse, highlighter2 + , optparse-applicative, pretty-show, process, protolude, tasty + , tasty-hunit, text }: mkDerivation { pname = "difftodo"; - version = "0.1.0"; - sha256 = "ab1c892daec3ecee50d16f8353e6da6195d3da86e1bca0ab8f3cb908a9746066"; + version = "0.2.0"; + sha256 = "bdb2c473e15455ae2af37623283bb78fd6cf52491d86eb9a04b1241011fab899"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base diff-parse highlighting-kate protolude text + base bytestring diff-parse highlighter2 protolude text ]; executableHaskellDepends = [ - base optparse-applicative protolude text + base bytestring optparse-applicative process protolude text ]; testHaskellDepends = [ - base bytestring highlighting-kate protolude tasty tasty-hunit text + base bytestring highlighter2 pretty-show protolude tasty + tasty-hunit text ]; homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; @@ -53076,30 +51223,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors_0_8_0_1" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl - , old-locale, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time - }: - mkDerivation { - pname = "digestive-functors"; - version = "0.8.0.1"; - sha256 = "ae3d5cb376c0065a59313424c408f3a81a1d4a1839214d1a60764e3708abf3c6"; - libraryHaskellDepends = [ - base bytestring containers mtl old-locale text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit mtl old-locale QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time - ]; - jailbreak = true; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "A practical formlet library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit @@ -53212,19 +51335,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors-lucid_0_0_0_3" = callPackage - ({ mkDerivation, base, digestive-functors, lucid, text }: - mkDerivation { - pname = "digestive-functors-lucid"; - version = "0.0.0.3"; - sha256 = "15fa8c7a0fb6e8d230cfe9d008101cd72d7eecbcbd1231f0c9982c20a0a73bb9"; - libraryHaskellDepends = [ base digestive-functors lucid text ]; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "Lucid frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors-lucid" = callPackage ({ mkDerivation, base, digestive-functors, lucid, text }: mkDerivation { @@ -53312,18 +51422,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "digits_0_2" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "digits"; - version = "0.2"; - sha256 = "f40437896a7866b210cdb45bfe025d65391ebf9980ea7a92206d6320e79949a3"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Converts integers to lists of digits and back"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digits" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -53352,6 +51450,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensional_1_0_1_3" = callPackage + ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector + }: + mkDerivation { + pname = "dimensional"; + version = "1.0.1.3"; + sha256 = "3bc566a59227115325caec0ea00a35e025e5ea471a3ab531cf595e5365aa93a7"; + libraryHaskellDepends = [ + base deepseq exact-pi numtype-dk vector + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/bjornbm/dimensional/"; + description = "Statically checked physical dimensions, using Type Families and Data Kinds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { @@ -53601,7 +51716,6 @@ self: { testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; - doCheck = false; homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; @@ -53676,20 +51790,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory-tree_0_12_0" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "directory-tree"; - version = "0.12.0"; - sha256 = "ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5"; - libraryHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://brandon.si/code/directory-tree-module-released/"; - description = "A simple directory-like tree datatype, with useful IO functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "directory-tree" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -53926,7 +52026,6 @@ self: { distributed-static exceptions hashable mtl network-transport random rank1dynamic stm syb template-haskell time transformers ]; - doCheck = false; homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54012,10 +52111,10 @@ self: { test-framework-hunit transformers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-ekg" = callPackage @@ -54065,7 +52164,6 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-execution"; description = "Execution Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54100,7 +52198,6 @@ self: { transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-extras"; description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; @@ -54231,6 +52328,7 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-registry"; description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-simplelocalnet" = callPackage @@ -54282,10 +52380,10 @@ self: { unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task" = callPackage @@ -54321,10 +52419,10 @@ self: { test-framework-quickcheck2 time transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-task"; description = "Task Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-tests" = callPackage @@ -54606,20 +52704,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dlist_0_7_1_2" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.2"; - sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -54629,7 +52713,6 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; @@ -54647,31 +52730,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dns_2_0_4" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-builder - , bytestring, conduit, conduit-extra, containers, doctest, hspec - , iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.4"; - sha256 = "2b4fc61f4ccb440aa2b8403bff1ba00a87782e46b4261d34e6c1a5a1f1c71d6d"; - libraryHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - doCheck = false; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -54690,7 +52748,6 @@ self: { conduit-extra containers doctest hspec iproute mtl network random resourcet safe word8 ]; - doCheck = false; testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54743,18 +52800,32 @@ self: { }) {dns_sd = null;}; "do-list" = callPackage - ({ mkDerivation, base, dlist, hspec }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "do-list"; - version = "0.9.0"; - sha256 = "f7f0af10c6e0f817afba7939e070671b232f152adf2f9d72b6656d4b9417dfef"; - libraryHaskellDepends = [ base dlist ]; + version = "1.0.0"; + sha256 = "64fab9aca46541aa95efc4e7a6f4074277fee6f81ca0d98eb41081f061c33738"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/tserduke/do-list"; - description = "List construction with do notation"; + homepage = "https://github.com/tserduke/do-list#readme"; + description = "Do notation for free"; license = stdenv.lib.licenses.bsd3; }) {}; + "do-list_1_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "do-list"; + version = "1.0.1"; + sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/tserduke/do-list#readme"; + description = "Do notation for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doc-review" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring , containers, directory, feed, filepath, haskell98, heist, hexpat @@ -54860,8 +52931,8 @@ self: { }: mkDerivation { pname = "dockercook"; - version = "0.5.0.0"; - sha256 = "fbb9373444c64cc1e16659f4d16edb60f80db4c6254e7e24feca16ad20f7c4fb"; + version = "0.5.0.3"; + sha256 = "ba1e45921535e8fb4767c53e77ac48b3e99c0501acb0efb99ed100b6f3cae032"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54877,7 +52948,6 @@ self: { optparse-applicative process text unordered-containers ]; testHaskellDepends = [ base HTF text vector ]; - jailbreak = true; homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; @@ -54937,7 +53007,6 @@ self: { HUnit process QuickCheck setenv silently stringbuilder syb transformers with-location ]; - doCheck = false; homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; @@ -55002,7 +53071,6 @@ self: { sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base doctest HUnit QuickCheck ]; - doCheck = false; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; }) {}; @@ -55202,28 +53270,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dotenv_0_3_0_1" = callPackage - ({ mkDerivation, base, base-compat, hspec, megaparsec - , optparse-applicative, process, text - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.0.1"; - sha256 = "b83a38f54c0be717bbc86016517a3f1ac0e1d43e6bf1ac9cb318081e9673bb2c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base base-compat megaparsec text ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - ]; - testHaskellDepends = [ base base-compat hspec megaparsec text ]; - jailbreak = true; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dotenv" = callPackage ({ mkDerivation, base, base-compat, hspec, megaparsec , optparse-applicative, process, text @@ -55632,21 +53678,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) dpkg; libdpkg = null;}; - "dpor_0_1_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, random, semigroups }: - mkDerivation { - pname = "dpor"; - version = "0.1.0.1"; - sha256 = "6000f43abf889e08e49bb5966592ad6119393277c2d528a18e5a2602119d6308"; - libraryHaskellDepends = [ - base containers deepseq random semigroups - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dpor" = callPackage ({ mkDerivation, base, containers, deepseq, random, semigroups }: mkDerivation { @@ -55762,10 +53793,10 @@ self: { testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; - doCheck = false; homepage = "http://github.com/michaelxavier/drifter-postgresql"; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drmaa" = callPackage @@ -56417,19 +54448,20 @@ self: { "dynamic-plot" = callPackage ({ mkDerivation, async, base, colour, constrained-categories , containers, data-default, deepseq, diagrams-cairo, diagrams-core - , diagrams-gtk, diagrams-lib, glib, gtk, lens, manifolds, MemoTrie - , MonadRandom, mtl, process, random, semigroups, tagged, time - , transformers, vector, vector-space + , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens + , manifolds, MemoTrie, MonadRandom, mtl, process, random + , semigroups, tagged, time, transformers, vector, vector-space }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.3.0"; - sha256 = "e6fcb68028ffb4148b7cd00fd87a5bb34a4be3f8995669ad136b37dc24747588"; + version = "0.1.4.0"; + sha256 = "7b67a4433324a76e2a6892cbcb9ce2250db09dd32583d6d29b63161ca954b18d"; libraryHaskellDepends = [ async base colour constrained-categories containers data-default - deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib - gtk lens manifolds MemoTrie MonadRandom mtl process random - semigroups tagged time transformers vector vector-space + deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib + free-vector-spaces glib gtk lens manifolds MemoTrie MonadRandom mtl + process random semigroups tagged time transformers vector + vector-space ]; homepage = "https://github.com/leftaroundabout/dynamic-plot"; description = "Interactive diagram windows"; @@ -56811,7 +54843,6 @@ self: { testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck ]; - doCheck = false; homepage = "http://thoughtpolice.github.com/hs-ed25519"; description = "Ed25519 cryptographic signatures"; license = stdenv.lib.licenses.mit; @@ -56848,31 +54879,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ede_0_2_8_4" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, filepath, free, lens, mtl - , parsers, scientific, semigroups, tasty, tasty-golden, text - , text-format, text-manipulate, trifecta, unordered-containers - , vector - }: - mkDerivation { - pname = "ede"; - version = "0.2.8.4"; - sha256 = "f7fda7bc2d28b87fe7042adfca9fa9f7484c546142ad649dcae1d2ad4af5ae72"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base bifunctors bytestring comonad directory - filepath free lens mtl parsers scientific semigroups text - text-format text-manipulate trifecta unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring directory tasty tasty-golden text - ]; - homepage = "http://github.com/brendanhay/ede"; - description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ede" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors , bytestring, comonad, directory, filepath, free, lens, mtl @@ -57414,8 +55420,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.10"; - sha256 = "bbae5b230a5fed82010d012c64fa75f3cf7a31335401df3872d79f3f786d6e90"; + version = "0.4.0.11"; + sha256 = "8cd041f6b7da4f57df1795d619f9140a071ed2adb6ed5ade1c3e899957edb603"; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers @@ -57482,10 +55488,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.0.2"; - sha256 = "6236904ae6410eca5c0fb77a076dc6dab926178768e554fd6050544658eec7d8"; - revision = "1"; - editedCabalFile = "6e9eafd4bf78bee8fe55eca517a4a8ea0af2cb11cd418538f84edf4d4fdcde39"; + version = "0.1.0.3"; + sha256 = "3c97d423ac85903d0fed400845c29ccd39f1ca80666b09659a0238983b743317"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -57552,24 +55556,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ekg-statsd_0_2_0_4" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; - version = "0.2.0.4"; - sha256 = "ebeddf7dd3427268a35b0dad5f716d9009b676326742b7dd005970d9ab6267f7"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ekg-statsd" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers @@ -57772,15 +55758,16 @@ self: { }) {}; "elm-export" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hspec - , hspec-core, mtl, QuickCheck, quickcheck-instances, text, time + ({ mkDerivation, base, bytestring, containers, directory + , formatting, hspec, hspec-core, mtl, QuickCheck + , quickcheck-instances, text, time }: mkDerivation { pname = "elm-export"; - version = "0.4.0.1"; - sha256 = "9aa94c4d0ed01a6f6344778eee2e87b6489fc9ddd1de87154acb2be67fb7b79e"; + version = "0.4.1.0"; + sha256 = "7932ebbf549f02637196a888fe6c2bbfa929f93f9b5dfe8474057f8adf6c3681"; libraryHaskellDepends = [ - base bytestring containers directory mtl text time + base bytestring containers directory formatting mtl text time ]; testHaskellDepends = [ base bytestring containers hspec hspec-core QuickCheck @@ -57842,8 +55829,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "1.0.4"; - sha256 = "39f8ec1e64c1a5025f4568ff59b52470e846d777f3cd343176b7a25d672989d3"; + version = "1.0.5"; + sha256 = "29badb1eb03e5960da6f0d89cb7ba8211ca18dc687840c72c3cce9bef1b11270"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58740,29 +56727,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "envy_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; - version = "1.1.0.0"; - sha256 = "27a2496640ea74ceab5a23a3fe8ef325bfb23d64a851f5dfc18b7c3411beca99"; - revision = "1"; - editedCabalFile = "a3922d3ddac9dd572059abbc0a9af991467cf10c93d6fc579c53faa5d3d22c2e"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - jailbreak = true; - description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "epanet-haskell" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59224,6 +57188,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ersaconcat" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, HTTP + , network-uri, process, QuickCheck, tagsoup, template-haskell + }: + mkDerivation { + pname = "ersaconcat"; + version = "0.0.1"; + sha256 = "7652c59b606769366babbff4b657cd8422ddb3f4aeb62afcc8ed0ce1a3ec139f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath HTTP network-uri process tagsoup + ]; + executableHaskellDepends = [ + base directory filepath HTTP network-uri process tagsoup + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/ersaconcat"; + description = "A script to concatenate AIP ERSA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ersatz" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default , directory, doctest, filepath, lens, mtl, parsec, process @@ -59243,7 +57231,6 @@ self: { array base containers lens mtl parsec ]; testHaskellDepends = [ base directory doctest filepath ]; - doCheck = false; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -59425,7 +57412,6 @@ self: { aeson base bytestring http-conduit text time ]; testHaskellDepends = [ async base hspec MonadRandom mtl text ]; - doCheck = false; description = "Client for etcd, a highly-available key value store"; license = "unknown"; }) {}; @@ -59732,33 +57718,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "eventstore_0_12_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal - , containers, dns, dotnet-timespan, http-client, network, protobuf - , random, semigroups, stm, tasty, tasty-hunit, text, time - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "0.12.0.0"; - sha256 = "c88c65239fd37b4ede7e291ac714384f89aaff6235d65bd41cdbc7421554fda5"; - libraryHaskellDepends = [ - aeson array async base bytestring cereal containers dns - dotnet-timespan http-client network protobuf random semigroups stm - text time unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base dotnet-timespan stm tasty tasty-hunit text time - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/YoEight/eventstore"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bytestring, cereal , connection, containers, dns, dotnet-timespan, http-client @@ -59778,27 +57737,27 @@ self: { aeson base connection dotnet-timespan stm tasty tasty-hunit text time ]; - doCheck = false; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_0_13_1_3" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal + "eventstore_0_13_1_4" = callPackage + ({ mkDerivation, aeson, array, base, cereal, classy-prelude , connection, containers, dns, dotnet-timespan, http-client , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.13.1.3"; - sha256 = "027dda722c410a7b528537c4f296040b90c16cf91d95362356e608c672de6b2a"; + version = "0.13.1.4"; + sha256 = "a72952384c37b1c11c9365fb7c2965bdbad1bf4dc6f54b66462116c7f03e92f7"; libraryHaskellDepends = [ - aeson array async base bytestring cereal connection containers dns - dotnet-timespan http-client protobuf random semigroups stm text - time unordered-containers uuid + aeson array base cereal classy-prelude connection containers dns + dotnet-timespan http-client protobuf random semigroups stm time + unordered-containers uuid ]; testHaskellDepends = [ aeson base connection dotnet-timespan stm tasty tasty-hunit text @@ -60138,8 +58097,8 @@ self: { ({ mkDerivation, base, constraints, singletons }: mkDerivation { pname = "exinst"; - version = "0.1.1"; - sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147"; + version = "0.1.2"; + sha256 = "61f1ad1d9ea25e7ff6edca9ac4b01681e6ab5d0af577c1c07c78afdac1ef5cfa"; libraryHaskellDepends = [ base constraints singletons ]; jailbreak = true; homepage = "https://github.com/k0001/exinst"; @@ -60152,8 +58111,8 @@ self: { ({ mkDerivation, aeson, base, constraints, exinst, singletons }: mkDerivation { pname = "exinst-aeson"; - version = "0.1.0.1"; - sha256 = "bc916d6b4c3e6617b1b82e895b8a373f9ee1f2bf7c9b22efb43e8fb616995162"; + version = "0.1.0.2"; + sha256 = "da509d6ab2c73c22cf718c3b08dcf2327b42abb0f5d0273d38ae4c530f737fa1"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -60168,8 +58127,8 @@ self: { ({ mkDerivation, base, bytes, constraints, exinst, singletons }: mkDerivation { pname = "exinst-bytes"; - version = "0.1.0.1"; - sha256 = "5dc66779093560fce4d5c4722615dab2d330d5c29bca4937981b009a391a8e67"; + version = "0.1.0.2"; + sha256 = "cc830f4af107b32738f83ef87eb1f77f08453758645bd0519d734beb311dec29"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -60184,10 +58143,9 @@ self: { ({ mkDerivation, base, constraints, deepseq, exinst }: mkDerivation { pname = "exinst-deepseq"; - version = "0.1"; - sha256 = "ea7e155a3a09064f65c39cd5e4323a64b8bf8dc4aa32de33b3495207315c361d"; + version = "0.1.0.1"; + sha256 = "078e2bb2f7759555976305fcabae776e7ae331f21a9ac3e5d563f923198f3799"; libraryHaskellDepends = [ base constraints deepseq exinst ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `deepseq` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60198,8 +58156,8 @@ self: { ({ mkDerivation, base, constraints, exinst, hashable, singletons }: mkDerivation { pname = "exinst-hashable"; - version = "0.1.0.1"; - sha256 = "7e76bd3604659dcb861a269362e1311bfe26ac92d5b88d6d6aa8253136c9ba68"; + version = "0.1.0.2"; + sha256 = "3a3051b1a0ccdd13317dcf190944609604f6ce5004a7b05d8327b7202a90ee65"; libraryHaskellDepends = [ base constraints exinst hashable singletons ]; @@ -60319,26 +58277,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "expiring-cache-map_0_0_5_4" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, time - , unordered-containers - }: - mkDerivation { - pname = "expiring-cache-map"; - version = "0.0.5.4"; - sha256 = "088ec3c56e23825f8709b185a97c8e3e485f2775d7299c58e62fc5992e4e7d71"; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers hashable time unordered-containers - ]; - homepage = "https://github.com/elblake/expiring-cache-map"; - description = "General purpose simple caching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "expiring-cache-map" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers @@ -61461,7 +59399,6 @@ self: { text time transformers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; @@ -61503,6 +59440,7 @@ self: { servant servant-server stm text transformers wai wai-logger warp ]; testHaskellDepends = [ aeson base bytestring filepath hspec text ]; + jailbreak = true; homepage = "https://github.com/mseri/fbmessenger-api-hs#fbmessenger-api"; description = "High-level bindings to Facebook Messenger Platform API"; license = stdenv.lib.licenses.bsd3; @@ -62092,24 +60030,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fft_0_1_8_3" = callPackage - ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable - , QuickCheck, storable-complex, syb, transformers - }: - mkDerivation { - pname = "fft"; - version = "0.1.8.3"; - sha256 = "73f450978f2b1f2d6d549aa5a81aaeeadfe153bd8f3ce935690b149a036a3896"; - libraryHaskellDepends = [ - array base carray ix-shapable storable-complex syb transformers - ]; - libraryPkgconfigDepends = [ fftw fftwFloat ]; - testHaskellDepends = [ base carray QuickCheck storable-complex ]; - description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; - "fft" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers @@ -62373,30 +60293,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "file-modules_0_1_2_3" = callPackage - ({ mkDerivation, async, base, directory, filepath, haskell-src-exts - , MissingH, regex-compat, regex-pcre - }: - mkDerivation { - pname = "file-modules"; - version = "0.1.2.3"; - sha256 = "e932a7087e2de523a2c9bebc4070623e6d87520ea31439377be0b1c0845b8c95"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - executableHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - homepage = "https://github.com/yamadapc/stack-run-auto"; - description = "Takes a Haskell source-code file and outputs its modules"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "file-modules" = callPackage ({ mkDerivation, async, base, directory, filepath, haskell-src-exts , MissingH, regex-compat, regex-pcre @@ -63050,6 +60946,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-vector_0_9_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "0.9.0.0"; + sha256 = "2cb64bfaa4c916c681c9a8240bb6edfad4878742003c3d099e770c592e8d4c87"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -63133,8 +61042,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.5.0.0"; - sha256 = "ebac16bee38bc0fd05790429d40b1c4a0089b82a53da45d2e74d226c4bdf8d65"; + version = "0.6.0.0"; + sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -63535,7 +61444,6 @@ self: { sha256 = "f1964913c5bbd81748610c2f66a7aa9750b25953e6940c0933b25d4b2f1b1f62"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - doCheck = false; homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; @@ -64009,6 +61917,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl-statistics" = callPackage + ({ mkDerivation, base, foldl, math-functions, profunctors + , quickcheck-instances, statistics, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "foldl-statistics"; + version = "0.1.1.0"; + sha256 = "aea55a29d9ae80d7007e78a2b49ab49495feb0aa640ac8d9c158d3afbaf0a04f"; + libraryHaskellDepends = [ base foldl math-functions profunctors ]; + testHaskellDepends = [ + base foldl profunctors quickcheck-instances statistics tasty + tasty-quickcheck vector + ]; + homepage = "http://github.com/Data61/foldl-statistics#readme"; + description = "Statistical functions from the statistics package implemented as Folds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , doctest, foldl, free, monoid-subclasses, profunctors @@ -65131,15 +63057,19 @@ self: { }) {}; "free-vector-spaces" = callPackage - ({ mkDerivation, base, lens, linear, MemoTrie, vector-space }: + ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space + }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.0.0"; - sha256 = "9b8d239b900d47869d019fb67c36f369e9ca53a8e95cdad14d00486e7992dbbc"; - libraryHaskellDepends = [ base lens linear MemoTrie vector-space ]; + version = "0.1.1.0"; + sha256 = "fa4066b3cb1e6e58ca471e953154acaca9f978cfc81d3987552da79c4805f1b4"; + libraryHaskellDepends = [ + base lens linear MemoTrie vector vector-space + ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -65289,6 +63219,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "french-cards" = callPackage + ({ mkDerivation, base, hspec, HUnit }: + mkDerivation { + pname = "french-cards"; + version = "0.1.1"; + sha256 = "5c70660593be3ecf1af9a9a30a41498f36aa45bd69825bf7b3793187d7576fd3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec HUnit ]; + homepage = "https://github.com/tserduke/french-cards#readme"; + description = "French Playing Cards"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fresco-binding" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, messagepack , text, unix @@ -65570,7 +63513,6 @@ self: { async base directory filepath tasty tasty-hunit temporary-rc unix-compat ]; - doCheck = false; homepage = "https://github.com/haskell-fswatch/hfsnotify"; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; @@ -66545,7 +64487,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) GConf;}; + }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd @@ -66622,15 +64564,14 @@ self: { }: mkDerivation { pname = "gdo"; - version = "0.1.0"; - sha256 = "762ef322a3702b0ae67cdfa80b56088ab988b3067fcf11255ec434d74152b0fc"; + version = "0.1.2"; + sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers cryptohash directory filepath process transformers ]; - jailbreak = true; description = "recursive atomic build system"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -66925,14 +64866,17 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + ({ mkDerivation, base, containers, ghc-prim, hspec + , template-haskell + }: mkDerivation { pname = "generic-deriving"; - version = "1.11"; - sha256 = "16d40544e4dad85af78d93158e9b6a39b35c88ca10a455cfc861a4282556240d"; + version = "1.11.1"; + sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/dreixel/generic-deriving"; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; @@ -67840,7 +65784,6 @@ self: { testHaskellDepends = [ array base binary bytestring containers mtl ]; - doCheck = false; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67891,28 +65834,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-exactprint_0_5_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filemanip - , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently - , syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.5.1.1"; - sha256 = "ab88a158b659641a1a940b1ebeaeefe8d41e53f1da2bee139914bbad21f15d8a"; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-boot ghc-paths - HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-exactprint" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filemanip , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently @@ -68010,7 +65931,6 @@ self: { process-streaming safe syb transformers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/carlohamalainen/ghc-imported-from"; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; @@ -68047,40 +65967,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-mod_5_5_0_0" = callPackage - ({ mkDerivation, base, binary, bytestring, cabal-helper, containers - , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath - , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec - , monad-control, monad-journal, mtl, old-time, optparse-applicative - , pipes, pretty, process, safe, split, syb, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.5.0.0"; - sha256 = "d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-paths ghc-syb-utils - haskell-src-exts hlint monad-control monad-journal mtl old-time - pipes pretty process safe split syb temporary text time - transformers transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc monad-control - mtl old-time optparse-applicative pretty process split time - ]; - testHaskellDepends = [ base doctest hspec ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-mod" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper , containers, deepseq, directory, djinn-ghc, doctest, extra @@ -68113,7 +65999,6 @@ self: { mtl old-time optparse-applicative pretty process split time ]; testHaskellDepends = [ base doctest hspec ]; - doCheck = false; homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; @@ -68411,27 +66296,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-typelits-extra_0_1_3" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.1.3"; - sha256 = "65c81dd6deca863a313ef121950753797d58affbcf1edb7627559c4ec1411fd7"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit - ]; - homepage = "http://www.clash-lang.org/"; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -68477,24 +66341,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_4_6" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.4.6"; - sha256 = "24cf8f937c88a6c3a489af8a4f2e23ee8f994eb4e5fa7fecb6942cee71bd160e"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit @@ -68663,36 +66509,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcid_0_6_4" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.4"; - sha256 = "fc43077955f9e53519b028364da0ec8bbea467b739b89ed7b2fa234a4a4b71db"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit @@ -68716,7 +66532,6 @@ self: { ansi-terminal base cmdargs containers directory extra filepath fsnotify process tasty tasty-hunit terminal-size time unix ]; - doCheck = false; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; @@ -68746,21 +66561,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcjs-dom_0_2_4_0" = callPackage - ({ mkDerivation, base, glib, gtk3, text, transformers, webkitgtk3 - }: - mkDerivation { - pname = "ghcjs-dom"; - version = "0.2.4.0"; - sha256 = "986db6b770c348d7a28368309a648626455d55e7a5705a849fd5a2981eb868a6"; - libraryHaskellDepends = [ - base glib gtk3 text transformers webkitgtk3 - ]; - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcjs-dom" = callPackage ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { @@ -69284,8 +67084,8 @@ self: { "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobjectIntrospection, gstreamer, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gst"; @@ -69296,20 +67096,18 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gst_all_1) gstreamer;}; + }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -69320,18 +67118,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base - , text, transformers + , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -69342,18 +67142,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -69364,13 +67166,15 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -69483,7 +67287,7 @@ self: { description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, containers, haskell-gi @@ -69570,7 +67374,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + inherit (pkgs.gnome2) pango;}; "gi-pango_1_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -69594,7 +67398,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69616,7 +67420,7 @@ self: { description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69658,7 +67462,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-soup_2_4_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -69680,7 +67484,7 @@ self: { description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -69702,7 +67506,7 @@ self: { description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -69888,25 +67692,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) openssl;}; - "gio_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, glib - , gtk2hs-buildtools, mtl, system-glib - }: - mkDerivation { - pname = "gio"; - version = "0.13.1.1"; - sha256 = "d04d9b87b43bf12c5917ea561da403f80fe955adf735785ea8afa0915478113b"; - libraryHaskellDepends = [ - array base bytestring containers glib mtl - ]; - libraryPkgconfigDepends = [ system-glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to GIO"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {system-glib = pkgs.glib;}; - "gio" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, mtl, system-glib @@ -69925,29 +67710,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; - "gipeda_0_2_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers - , directory, extra, filepath, gitlib, gitlib-libgit2, scientific - , shake, split, tagged, text, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "gipeda"; - version = "0.2.0.1"; - sha256 = "8b2e6d06a7392b5ce4956a97aa6102213b790e575516c74feeaed371e0f7e12e"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring cassava containers directory extra filepath - gitlib gitlib-libgit2 scientific shake split tagged text - unordered-containers vector yaml - ]; - jailbreak = true; - homepage = "https://github.com/nomeata/gipeda"; - description = "Git Performance Dashboard"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed @@ -70059,75 +67821,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "git-annex_6_20160511" = callPackage - ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls - , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , json, lsof, magic, MissingH, monad-control, monad-logger - , mountpoints, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, template-haskell, text, time, torrent, transformers - , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp - , warp-tls, wget, which, xml-types, yesod, yesod-core - , yesod-default, yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "6.20160511"; - sha256 = "85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01"; - configureFlags = [ - "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" - "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" - "-fwebapp-secure" "-fwebdav" "-fxmpp" - ]; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath gnutls hinotify hslogger - http-client http-conduit http-types IfElse json magic MissingH - monad-control monad-logger mountpoints mtl network network-info - network-multicast network-protocol-xmpp network-uri old-locale - optparse-applicative path-pieces persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - jailbreak = true; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; - checkPhase = "./git-annex test"; - enableSharedExecutables = false; - homepage = "http://git-annex.branchable.com/"; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive @@ -70545,33 +68238,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "github-backup_1_20160522" = callPackage - ({ mkDerivation, base, bytestring, 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 - , vector - }: - mkDerivation { - pname = "github-backup"; - version = "1.20160522"; - sha256 = "da5f7c8458321e039f8634cce7ce539bf5c0464e9487072ab79a68fa074d5aa8"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base hslogger MissingH ]; - executableHaskellDepends = [ - base bytestring containers directory exceptions filepath github - hslogger IfElse MissingH mtl network network-uri - optparse-applicative pretty-show process text transformers unix - unix-compat utf8-string vector - ]; - executableToolDepends = [ git ]; - homepage = "https://github.com/joeyh/github-backup"; - description = "backs up everything github knows about a repository, to the repository"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) git;}; - "github-backup" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, MissingH @@ -70946,29 +68612,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitson_0_5_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, errors, filepath, flock, Glob, hspec, monad-control - , process, transformers - }: - mkDerivation { - pname = "gitson"; - version = "0.5.1"; - sha256 = "5efabd7b86a7866bb5179a298bccf3492b814e4c69d1b8073c63b1c1e615b29c"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory errors filepath flock - monad-control process transformers - ]; - testHaskellDepends = [ - aeson base directory doctest Glob hspec process transformers - ]; - doCheck = false; - homepage = "https://github.com/myfreeweb/gitson"; - description = "A document store library for Git + JSON"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, directory, doctest, errors @@ -70987,10 +68630,10 @@ self: { testHaskellDepends = [ aeson base directory doctest Glob hspec process transformers ]; - doCheck = false; homepage = "https://github.com/myfreeweb/gitson"; description = "A document store library for Git + JSON"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitter" = callPackage @@ -71099,7 +68742,7 @@ self: { description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libglade;}; + }) {inherit (pkgs.gnome2) libglade;}; "gladexml-accessor" = callPackage ({ mkDerivation, base, glade, HaXml, template-haskell }: @@ -71169,25 +68812,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glib_0_13_2_2" = callPackage - ({ mkDerivation, base, bytestring, containers, glib - , gtk2hs-buildtools, text, utf8-string - }: - mkDerivation { - pname = "glib"; - version = "0.13.2.2"; - sha256 = "16bc6710ac195778e514c6ba1da3b22a057854d4db0929b4835172ec42e0497f"; - libraryHaskellDepends = [ - base bytestring containers text utf8-string - ]; - libraryPkgconfigDepends = [ glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib;}; - "glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, text, utf8-string @@ -71262,8 +68886,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.15"; - sha256 = "1179f60fc18d4ad3f15241a810f5063f5da1aece2d2b50d8cd04c3af2f562457"; + version = "2.17"; + sha256 = "b0d7ade81c100e760b13079feeac8c4a701a9b24464191c27517f8829880f7a6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -71276,9 +68900,11 @@ self: { ]; executableHaskellDepends = [ base lens text ]; testHaskellDepends = [ base HUnit ]; + jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -71639,8 +69265,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.6"; - sha256 = "bca26c14be41205c86082e303885bd2c031634dbb7b31336ab71f37efc4f654b"; + version = "0.4.8"; + sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71663,8 +69289,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.6"; - sha256 = "d4cecdff03ee9d1b30a804a17a186b2fc1ad84bde59031285cd21e9f550db1ff"; + version = "0.4.8"; + sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71687,8 +69313,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.6"; - sha256 = "c22a6f59bf4e3eddcdfd00500eaef16a9065113b52f97252c1270fdd29e1ad27"; + version = "0.4.8"; + sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71710,8 +69336,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.6"; - sha256 = "595d107c5153ed6ac93b2b0f27fb154e76975f05c6780b78ffa2618cc395dc62"; + version = "0.4.8"; + sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71803,7 +69429,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_keyring;}; + }) {inherit (pkgs.gnome2) gnome_keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -71823,7 +69449,7 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; + }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring @@ -73375,8 +71001,8 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.1.1.1"; - sha256 = "dfd2bbee86c1965e8fb06a9933f090464c2432a2e5e0daaefa5093fd37084d12"; + version = "0.1.2.0"; + sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; @@ -73409,6 +71035,7 @@ self: { aeson base bytestring http-api-data http-client servant servant-client text transformers ]; + jailbreak = true; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -73711,6 +71338,7 @@ self: { homepage = "http://github.com/tgolson/gpio"; description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpolyline" = callPackage @@ -74389,7 +72017,6 @@ self: { testHaskellDepends = [ base containers fgl fgl-arbitrary filepath QuickCheck text ]; - doCheck = false; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -74485,10 +72112,10 @@ self: { aeson aeson-casing base bytestring file-embed network scientific tasty tasty-hunit text time vector ]; - doCheck = false; homepage = "https://github.com/AndrewRademacher/haskell-graylog"; description = "Support for graylog output"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greencard" = callPackage @@ -75071,26 +72698,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; - version = "0.14.2"; - sha256 = "58f780c51fe2f3e25939a048bbe7d0b880e6aeb412df2648438f926a2b7b7eb5"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; - "gtk" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text @@ -75104,7 +72711,6 @@ self: { array base bytestring cairo containers gio glib mtl pango text ]; libraryPkgconfigDepends = [ gtk2 ]; - doHaddock = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -75240,27 +72846,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; - "gtk2hs-buildtools_0_13_0_5" = callPackage - ({ mkDerivation, alex, array, base, containers, directory, filepath - , happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; - version = "0.13.0.5"; - sha256 = "d95811a505ec10e4c82f3ca81c06b317eb9d345e73b6eda7aeaebd1e868f0a93"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory filepath hashtables pretty process - random - ]; - executableToolDepends = [ alex happy ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory , filepath, happy, hashtables, pretty, process, random @@ -75414,26 +72999,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk3_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2hs-buildtools, gtk3, mtl, pango, text - }: - mkDerivation { - pname = "gtk3"; - version = "0.14.2"; - sha256 = "da198906bf3807e61c6d3c85c8537f424d9073d517d511d38197c569a1cb3d1d"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3;}; - "gtk3" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text @@ -75447,7 +73012,6 @@ self: { array base bytestring cairo containers gio glib mtl pango text ]; libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -75486,7 +73050,7 @@ self: { description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtkglext;}; + }) {inherit (pkgs.gnome2) gtkglext;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -75543,26 +73107,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; - - "gtksourceview3_0_13_2_1" = callPackage - ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools - , gtk3, gtksourceview, mtl, text - }: - mkDerivation { - pname = "gtksourceview3"; - version = "0.13.2.1"; - sha256 = "61542fc063d948a0487c0fe784f8154d4a9ca66df3e29bbff0047843bb006ceb"; - libraryHaskellDepends = [ - array base containers glib gtk3 mtl text - ]; - libraryPkgconfigDepends = [ gtksourceview ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GtkSourceView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib @@ -75580,7 +73125,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: @@ -75894,7 +73439,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP_2_4_4" = callPackage + "hOpenPGP" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -75908,8 +73453,10 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.4.4"; - sha256 = "6d137b38a2a60f711fd34612849f34a1731271c6a2cc83aa57c37cfea1f5a806"; + version = "2.5.1"; + sha256 = "6b590806d05485dea63095f91f7c201d578b3bd7de86eee672f141eb9efd08ce"; + revision = "1"; + editedCabalFile = "ea8e25ddecdd0bdcfcbac5a9a94d7b2a9d59e09a2ee29aacfde16df50483de14"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bifunctors binary binary-conduit byteable bytestring bzlib conduit conduit-extra @@ -75932,10 +73479,9 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP" = callPackage + "hOpenPGP_2_5_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -75949,8 +73495,8 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.5.1"; - sha256 = "6b590806d05485dea63095f91f7c201d578b3bd7de86eee672f141eb9efd08ce"; + version = "2.5.2"; + sha256 = "856c0f223602cfc775c8173cd64378064208b8133eabc37c0f6da8126221b8c2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bifunctors binary binary-conduit byteable bytestring bzlib conduit conduit-extra @@ -75973,6 +73519,7 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -77200,25 +74747,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_2_1" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "haddock-library"; - version = "1.2.1"; - sha256 = "0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056"; - libraryHaskellDepends = [ base bytestring deepseq transformers ]; - testHaskellDepends = [ - base base-compat bytestring deepseq hspec QuickCheck transformers - ]; - jailbreak = true; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddock-library" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers @@ -77252,32 +74780,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddocset_0_4_1" = callPackage - ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory - , exceptions, filepath, ghc, haddock-api, http-types, mtl - , optparse-applicative, process, resourcet, sqlite-simple, tagsoup - , text, transformers - }: - mkDerivation { - pname = "haddocset"; - version = "0.4.1"; - sha256 = "b2e17cb5fc695b28cb036e524e1f58fce30953cf4f3de6fdac88e61142ae9c3e"; - revision = "1"; - editedCabalFile = "8d1369b8ba3da5fcb6661f5fc34ec23de02b79c96ed268f0db946a9ff8b5951b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal conduit conduit-extra directory exceptions filepath ghc - haddock-api http-types mtl optparse-applicative process resourcet - sqlite-simple tagsoup text transformers - ]; - jailbreak = true; - homepage = "https://github.com/philopon/haddocset"; - description = "Generate docset of Dash by Haddock haskell documentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddocset" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory , exceptions, filepath, ghc, haddock-api, http-types, mtl @@ -77915,6 +75417,7 @@ self: { homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -77942,6 +75445,8 @@ self: { pname = "hakyll-shakespeare"; version = "0.1.0.0.2"; sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + revision = "1"; + editedCabalFile = "8e81f615162a066f96dff257a9efea27478c87cd345bb708d1cdd4ba565c838d"; libraryHaskellDepends = [ base blaze-html containers hakyll shakespeare text ]; @@ -78578,36 +76083,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "happstack-authenticate_2_3_4_3" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base - , base64-bytestring, boomerang, bytestring, containers - , data-default, email-validate, filepath, happstack-hsp - , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs - , http-conduit, http-types, ixset-typed, jmacro, jwt, lens - , mime-mail, mtl, pwstore-purehaskell, random, safecopy - , shakespeare, text, time, unordered-containers, userid, web-routes - , web-routes-boomerang, web-routes-happstack, web-routes-hsp - , web-routes-th - }: - mkDerivation { - pname = "happstack-authenticate"; - version = "2.3.4.3"; - sha256 = "6029d43f6cf78e68cd88c28a8c9aefacfc6062cc4f7e798a72302ac43abecc30"; - libraryHaskellDepends = [ - acid-state aeson authenticate base base64-bytestring boomerang - bytestring containers data-default email-validate filepath - happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro - hsx2hs http-conduit http-types ixset-typed jmacro jwt lens - mime-mail mtl pwstore-purehaskell random safecopy shakespeare text - time unordered-containers userid web-routes web-routes-boomerang - web-routes-happstack web-routes-hsp web-routes-th - ]; - homepage = "http://www.happstack.com/"; - description = "Happstack Authentication Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happstack-authenticate" = callPackage ({ mkDerivation, acid-state, aeson, authenticate, base , base64-bytestring, boomerang, bytestring, containers @@ -79146,7 +76621,6 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ base process ]; - doCheck = false; homepage = "http://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -80376,34 +77850,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-gi_0_17_4" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , file-embed, filepath, glib, gobjectIntrospection, haskell-gi-base - , mtl, pretty-show, process, safe, text, transformers, xdg-basedir - , xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.17.4"; - sha256 = "e3c306c877f3b28e66f49b1187671233d4a3e15d0d0ed7931213624b67fb733b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory file-embed filepath - haskell-gi-base mtl pretty-show process safe text transformers - xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - jailbreak = true; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "haskell-gi" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl @@ -80430,31 +77876,31 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "haskell-gi-base_0_17" = callPackage + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.17"; - sha256 = "fba8d755d1772cd0e01f7e8e7ac939d5bde9646d6493516c561484853ff77b76"; + version = "0.18.2"; + sha256 = "245b17ab5769fc413f7d10b24ca57efb97962dc7debd6188d3a879454077daa1"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; - "haskell-gi-base" = callPackage + "haskell-gi-base_0_18_4" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.18.2"; - sha256 = "245b17ab5769fc413f7d10b24ca57efb97962dc7debd6188d3a879454077daa1"; + version = "0.18.4"; + sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-google-trends" = callPackage @@ -80564,18 +78010,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lexer_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "haskell-lexer"; - version = "1.0"; - sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86"; - libraryHaskellDepends = [ base ]; - description = "A fully compliant Haskell 98 lexer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-lexer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80650,10 +78084,10 @@ self: { base containers filemanip filepath haskell-src-exts mtl pretty-show tasty tasty-golden traverse-with-class ]; - doCheck = false; homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-names_0_8_0" = callPackage @@ -80708,10 +78142,10 @@ self: { text transformers transformers-base transformers-compat unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-openflow" = callPackage @@ -80986,6 +78420,7 @@ self: { base containers directory filepath mtl pretty-show smallcheck tasty tasty-golden tasty-smallcheck ]; + doCheck = false; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -81842,17 +79277,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec, pretty + ({ mkDerivation, base, containers, filepath, parsec3, pretty , process }: mkDerivation { pname = "haskelzinc"; - version = "0.1.0.1"; - sha256 = "82d828d7fd75f58db210169a167f24856aaa88fb7ac7e7cae16a1a46a0e56146"; + version = "0.2.0.3"; + sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72"; libraryHaskellDepends = [ - base containers filepath parsec pretty process + base containers filepath parsec3 pretty process ]; - jailbreak = true; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -82000,38 +79434,6 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable - , bytestring, conduit, containers, cryptohash, deepseq, either - , entropy, HUnit, largeword, mtl, murmur3, network, pbkdf - , QuickCheck, safe, scientific, secp256k1, split - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "haskoin-core"; - version = "0.3.1"; - sha256 = "3257afb81053b70a4740fb483653ce23bf6d7824d2eafc4f6747dfaf2aa9f32b"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary byteable bytestring conduit - containers cryptohash deepseq either entropy largeword mtl murmur3 - network pbkdf QuickCheck secp256k1 split string-conversions text - time vector - ]; - testHaskellDepends = [ - aeson base binary bytestring containers HUnit largeword mtl - QuickCheck safe scientific secp256k1 split string-conversions - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - doCheck = false; - homepage = "http://github.com/haskoin/haskoin"; - description = "Implementation of the core Bitcoin protocol features"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskoin-core_0_4_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable , bytestring, cereal, conduit, containers, cryptohash, deepseq , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf @@ -82394,16 +79796,14 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.2"; - sha256 = "92c7742ff50527dd5ff45cf65c2009f364b06e17bdc4e41874a75bbf0c1f75fc"; + version = "0.69.2.1"; + sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath json unix utf8-string ]; - executableHaskellDepends = [ - base bytestring directory filepath HUnit json unix utf8-string - ]; + executableHaskellDepends = [ base directory filepath unix ]; testHaskellDepends = [ base bytestring directory filepath HUnit json unix utf8-string ]; @@ -82472,7 +79872,7 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) aspell;}; - "hasql_0_19_14" = callPackage + "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras , data-default-class, dlist, either, hashable, hashtables, loch-th @@ -82483,8 +79883,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.19.14"; - sha256 = "e30cfa9d2d037927937ffabf489acef88412f30e3b122de6324e09503c957a35"; + version = "0.19.15"; + sha256 = "cbcec81cdd852325dddf3b9cbf830b94f63d4037adf5b9b84ac683384614b4e3"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -82496,14 +79896,12 @@ self: { data-default-class QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql" = callPackage + "hasql_0_19_15_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras , data-default-class, dlist, either, hashable, hashtables, loch-th @@ -82514,8 +79912,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.19.15"; - sha256 = "cbcec81cdd852325dddf3b9cbf830b94f63d4037adf5b9b84ac683384614b4e3"; + version = "0.19.15.1"; + sha256 = "5285147d09d044dea3fa1e9579e436ce8347f41a8b3d3c8da5d2e5d1f7c21421"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -82527,10 +79925,10 @@ self: { data-default-class QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; - description = "A very efficient PostgreSQL driver and a flexible mapping API"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -82756,7 +80154,6 @@ self: { base bytestring directory HUnit mtl syb text ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; license = stdenv.lib.licenses.bsd3; @@ -83172,28 +80569,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr_3000_11_1_6" = callPackage - ({ mkDerivation, array, base, base-compat, base64-bytestring - , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams - , http-types, io-streams, mtl, mtl-compat, network, network-uri - , old-locale, old-time, template-haskell, time, utf8-string - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.1.6"; - sha256 = "25b758d83061f35e90a07ad296f827762b61639a5eb81e60326a9de96d63351d"; - libraryHaskellDepends = [ - array base base-compat base64-bytestring blaze-builder bytestring - HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat - network network-uri old-locale old-time template-haskell time - utf8-string - ]; - homepage = "http://www.haskell.org/haskellwiki/HaXR"; - description = "XML-RPC client and server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haxr" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams @@ -83684,24 +81059,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {bluetooth = null; inherit (pkgs) cwiid;}; - "hdaemonize_0_5_0_2" = callPackage - ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog - , mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; - version = "0.5.0.2"; - sha256 = "55cd4ff1dd4ca4fd00f450db3964639c5cc5e98f33f1b3d45c8c3f2d485953ae"; - libraryHaskellDepends = [ - base extensible-exceptions filepath hsyslog mtl unix - ]; - jailbreak = true; - homepage = "http://github.com/greydot/hdaemonize"; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdaemonize" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, filepath , hsyslog, mtl, unix @@ -83902,27 +81259,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools_0_1_3_2" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc - , ghc-boot, ghc-paths, network, process, syb, time, transformers - , unix - }: - mkDerivation { - pname = "hdevtools"; - version = "0.1.3.2"; - sha256 = "f35932f3846badcd06a98beb62533bce20518b2ba52c0898ba120d46b32f9c48"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths - network process syb time transformers unix - ]; - homepage = "https://github.com/hdevtools/hdevtools/"; - description = "Persistent GHC powered background server for FAST haskell development tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdevtools" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc , ghc-boot, ghc-paths, network, process, syb, time, transformers @@ -84195,7 +81531,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; @@ -84265,30 +81600,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hedis_0_6_10" = callPackage - ({ mkDerivation, attoparsec, base, BoundedChan, bytestring - , bytestring-lexing, HUnit, mtl, network, resource-pool - , test-framework, test-framework-hunit, time, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.6.10"; - sha256 = "31974bfd8e891a4b54a444dcc86dfdac83875e0c3c5933648884230db72a895d"; - libraryHaskellDepends = [ - attoparsec base BoundedChan bytestring bytestring-lexing mtl - network resource-pool time vector - ]; - testHaskellDepends = [ - base bytestring HUnit mtl test-framework test-framework-hunit time - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, HUnit, mtl, network, resource-pool, scanner @@ -84307,7 +81618,6 @@ self: { async base bytestring HUnit mtl slave-thread stm test-framework test-framework-hunit text time ]; - doCheck = false; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; @@ -84461,30 +81771,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "heist_0_14_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, containers, directory, directory-tree, dlist, either - , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl - , process, random, text, time, transformers, unordered-containers - , vector, xmlhtml - }: - mkDerivation { - pname = "heist"; - version = "0.14.1.4"; - sha256 = "debf008e68310d7e494560ebf7226693e5bc6820be39b6dae91f965805cf5fc9"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - containers directory directory-tree dlist either filepath hashable - map-syntax MonadCatchIO-transformers mtl process random text time - transformers unordered-containers vector xmlhtml - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "An Haskell template system supporting both HTML5 and XML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder , blaze-html, bytestring, containers, criterion, directory @@ -85499,8 +82785,8 @@ self: { ({ mkDerivation, base, containers, text, unordered-containers }: mkDerivation { pname = "hext"; - version = "0.1.0.3"; - sha256 = "76e2cd8d655fead634401f65d698f2ef03617dae2bd2a6287e9f461f11861588"; + version = "0.1.0.4"; + sha256 = "a2e76f7f25853d5533dcec2819c6c1e267d53828088498861be3d493ee6b1451"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85617,8 +82903,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.0.2.2"; - sha256 = "36610511a051f13e8b604f090eff467ff88bf40d2edc809d99d7246b9ac22d5f"; + version = "0.0.2.3"; + sha256 = "22ced71f926ecece0ab3b33fdfabd004fb1812eaab1f2234280e012cbf2aba98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85631,6 +82917,7 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/danstiner/hfmt"; description = "Haskell source code formatter"; license = stdenv.lib.licenses.mit; @@ -86159,7 +83446,8 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) systemd;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: @@ -86403,6 +83691,29 @@ self: { license = "GPL"; }) {}; + "highlighting-kate_0_6_3" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers, Diff + , directory, filepath, mtl, parsec, pcre-light, process + , utf8-string + }: + mkDerivation { + pname = "highlighting-kate"; + version = "0.6.3"; + sha256 = "71dab85c49b038053b90062ed882e486233cbaa2b762d017224d06482075840d"; + configureFlags = [ "-fpcre-light" ]; + libraryHaskellDepends = [ + base blaze-html bytestring containers mtl parsec pcre-light + utf8-string + ]; + testHaskellDepends = [ + base blaze-html containers Diff directory filepath process + ]; + homepage = "http://github.com/jgm/highlighting-kate"; + description = "Syntax highlighting"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hills" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath , optparse-applicative, text, transformers @@ -86511,10 +83822,10 @@ self: { testHaskellDepends = [ base directory haskell-src-exts hspec monad-loops mtl text ]; - doCheck = false; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hindent_5_2_1" = callPackage @@ -86709,28 +84020,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hint_0_5_2" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-paths, HUnit, mtl, random, unix - }: - mkDerivation { - pname = "hint"; - version = "0.5.2"; - sha256 = "b988ddf97c01dcfe21d3db97e4de94f8a9eeed645cc89ed0471f977b1fa22c0f"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-paths mtl random unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/mvdan/hint"; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hint" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions , filepath, ghc, ghc-paths, HUnit, mtl, random, unix @@ -87214,29 +84503,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsmin_0_2_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , language-javascript, optparse-applicative, text - }: - mkDerivation { - pname = "hjsmin"; - version = "0.2.0.1"; - sha256 = "333e13cfd2b00f0ebeddf08aa9f0ed5ca689dcc21224cd0d9e6416e50fe1acae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers language-javascript text - ]; - executableHaskellDepends = [ - base blaze-builder bytestring containers language-javascript - optparse-applicative text - ]; - homepage = "http://github.com/erikd/hjsmin"; - description = "Haskell implementation of a javascript minifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hjsmin" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , language-javascript, optparse-applicative, text @@ -87425,48 +84691,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hledger_0_27" = callPackage - ({ mkDerivation, base, base-compat, cmdargs, containers, csv - , directory, filepath, haskeline, hledger-lib, HUnit, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, terminfo, test-framework - , test-framework-hunit, text, time, unordered-containers - , utf8-string, wizards - }: - mkDerivation { - pname = "hledger"; - version = "0.27"; - sha256 = "0aecdf586a46c24d6d67659157d1edbfc0d78afb50ea7cfbec1a01bf86b792b0"; - revision = "2"; - editedCabalFile = "11f159f1c15ef44a6989491ab9fb921163fdf6107ef5f2dd6046ee143a42909a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger" = callPackage ({ mkDerivation, base, base-compat, cmdargs, containers, csv , directory, filepath, haskeline, hledger-lib, HUnit, mtl @@ -87575,37 +84799,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hledger-lib_0_27" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, Decimal, deepseq, directory, filepath - , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , safe, split, test-framework, test-framework-hunit, time - , transformers, uglymemo, utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "0.27"; - sha256 = "77c47900106e65411743097cd0855b5484e1439b0de4c5ee6d2a0c5748672606"; - revision = "3"; - editedCabalFile = "6b734f07bdc0e658c035d982fdbb6fc2e8cf27b76fdf52485c230f146e51feb1"; - libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split time transformers - uglymemo utf8-string - ]; - testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit time transformers uglymemo utf8-string - ]; - homepage = "http://hledger.org"; - description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-lib" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, Decimal, deepseq, directory, filepath @@ -87634,31 +84827,6 @@ self: { license = "GPL"; }) {}; - "hledger-ui_0_27_4" = callPackage - ({ mkDerivation, base, base-compat, brick, cmdargs, containers - , data-default, filepath, hledger, hledger-lib, HUnit, lens - , pretty-show, safe, split, time, transformers, vector, vty - }: - mkDerivation { - pname = "hledger-ui"; - version = "0.27.4"; - sha256 = "c99544721f630fb561f5f44e9b0295db991b59a6222b66f38696fef90fec377d"; - revision = "1"; - editedCabalFile = "81550a378ff933ffa25d68417b3d62f895197c7b36b363a0e95fb25bf35dbdcd"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base base-compat brick cmdargs containers data-default filepath - hledger hledger-lib HUnit lens pretty-show safe split time - transformers vector vty - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-ui" = callPackage ({ mkDerivation, base, base-compat, brick, cmdargs, containers , data-default, filepath, hledger, hledger-lib, HUnit, lens @@ -88665,8 +85833,6 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; testSystemDepends = [ ocilib ]; - doHaddock = false; - doCheck = false; homepage = "https://github.com/fpinsight/hocilib"; description = "FFI binding to OCILIB"; license = stdenv.lib.licenses.bsd3; @@ -89292,7 +86458,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; - doCheck = false; + testTarget = "--test-option=--no-net"; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -89303,32 +86469,35 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network, network-uri, old-locale, process - , QuickCheck, resourcet, tar, template-haskell, text, time - , transformers, uniplate, utf8-string, vector, wai, wai-logger - , warp, warp-tls, zlib + , js-jquery, mmap, network, network-uri, network-uri-flag + , old-locale, process, QuickCheck, resourcet, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; version = "5.0.1"; sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e"; + revision = "1"; + editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri old-locale process QuickCheck resourcet tar - template-haskell text time transformers uniplate utf8-string vector - wai wai-logger warp warp-tls zlib + network network-uri network-uri-flag old-locale process QuickCheck + resourcet tar template-haskell text time transformers uniplate + utf8-string vector wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_5_0_3" = callPackage + "hoogle_5_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -89339,8 +86508,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.3"; - sha256 = "76bda66fd5be7d0ad79da1c512a4e60caf3be15d988a40e8274f16cd7df3815b"; + version = "5.0.4"; + sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89353,6 +86522,7 @@ self: { ]; executableHaskellDepends = [ base ]; jailbreak = true; + testTarget = "--test-option=--no-net"; homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -89479,38 +86649,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {OpenCL = null;}; - "hopenpgp-tools_0_18" = callPackage + "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash - , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed - , lens, monad-loops, openpgp-asciiarmor, optparse-applicative - , resourcet, text, time, time-locale-compat, transformers - , unordered-containers, wl-pprint-extras, wl-pprint-terminfo, yaml + , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client + , http-client-tls, http-types, ixset-typed, lens, monad-loops + , openpgp-asciiarmor, optparse-applicative, resourcet, text, time + , time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, wl-pprint-terminfo, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.18"; - sha256 = "e13fa9cbf0f725f026e781c8d4d83b05a5b4bd126d276085152adc0a88c93f76"; + version = "0.19.2"; + sha256 = "6bcc067bfc2b54c0c47ea7169f3741ec8f64abee9bd8c398191a0b35520fa39c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-wl-pprint array attoparsec base base16-bytestring binary binary-conduit bytestring conduit conduit-extra containers crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP - ixset-typed lens monad-loops openpgp-asciiarmor - optparse-applicative resourcet text time time-locale-compat - transformers unordered-containers wl-pprint-extras - wl-pprint-terminfo yaml + http-client http-client-tls http-types ixset-typed lens monad-loops + openpgp-asciiarmor optparse-applicative resourcet text time + time-locale-compat transformers unordered-containers + wl-pprint-extras wl-pprint-terminfo yaml ]; executableToolDepends = [ alex happy ]; homepage = "http://floss.scru.org/hopenpgp-tools"; description = "hOpenPGP-based command-line tools"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hopenpgp-tools" = callPackage + "hopenpgp-tools_0_19_3" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash @@ -89522,8 +86692,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.19.2"; - sha256 = "6bcc067bfc2b54c0c47ea7169f3741ec8f64abee9bd8c398191a0b35520fa39c"; + version = "0.19.3"; + sha256 = "4f1b7ce4fa6f1efa39fd0388204d24d82b9293e8cf1087b2790013a350bbd26f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89539,6 +86709,7 @@ self: { homepage = "http://floss.scru.org/hopenpgp-tools"; description = "hOpenPGP-based command-line tools"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hopenssl" = callPackage @@ -90299,33 +87470,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc-coveralls_1_0_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs - , containers, curl, directory, directory-tree, hpc, HUnit, process - , pureMD5, regex-posix, retry, safe, split, transformers - }: - mkDerivation { - pname = "hpc-coveralls"; - version = "1.0.4"; - sha256 = "32f3f4104044a8ec16efe0a0846baf6eba48672eb9302e6dd9463e94b522fe00"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 retry safe split transformers - ]; - executableHaskellDepends = [ - aeson async base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 regex-posix retry safe split - transformers - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; - description = "Coveralls.io support for Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -90546,36 +87690,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hprotoc_2_2_0" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; - version = "2.2.0"; - sha256 = "12461b7b11b90486f7b40cd21d3839f089695341e090eeac3a6fb85e715b50be"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hprotoc" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -90837,8 +87951,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.4.1"; - sha256 = "97407042cf3dc2a7c9310c4040a5ab599e03709ad70cc5d2bcfcf866a6120be6"; + version = "0.3.4.2"; + sha256 = "4e7afc76770d5a9f887f574c8ce69d8c23a39b9df369d7ca263fd88c73b59a28"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -90958,6 +88072,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-di" = callPackage + ({ mkDerivation, base, compose-ltr, hspec, MissingH, QuickCheck + , template-haskell, time + }: + mkDerivation { + pname = "hs-di"; + version = "0.2.2"; + sha256 = "103128607f0303625dccb039d78d3de5790088a4f5b7bedae7e45e488ee53901"; + libraryHaskellDepends = [ base compose-ltr template-haskell ]; + testHaskellDepends = [ + base compose-ltr hspec MissingH QuickCheck template-haskell time + ]; + homepage = "https://github.com/Wizek/hs-di#readme"; + description = "Dependency Injection library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-dotnet" = callPackage ({ mkDerivation, base, ghc-prim, ole32, oleaut32 }: mkDerivation { @@ -92216,8 +89347,6 @@ self: { aeson aeson-lens async base containers data-default deepseq directory filepath hformat hspec lens mtl text ]; - doHaddock = false; - doCheck = false; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; @@ -92589,14 +89718,13 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.4.2"; - sha256 = "b98aa37900b03403bf8bcb40d300ef539a8dc50476a219e8f19c41ff057379fe"; + version = "0.5.0"; + sha256 = "d1c2075b6d35c2139db86ba6c514b8855f97f03acfde121cd6a9065ba5ebb499"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th ]; - jailbreak = true; description = "Package for user configuration files (INI)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93074,6 +90202,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_2_4" = callPackage + ({ mkDerivation, base, directory, hspec-core, hspec-discover + , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder + , transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.2.4"; + sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations HUnit QuickCheck + transformers + ]; + testHaskellDepends = [ + base directory hspec-core hspec-discover hspec-expectations + hspec-meta HUnit QuickCheck stringbuilder transformers + ]; + jailbreak = true; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -93142,6 +90294,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_2_4" = callPackage + ({ mkDerivation, ansi-terminal, async, base, deepseq + , hspec-expectations, hspec-meta, HUnit, process, QuickCheck + , quickcheck-io, random, setenv, silently, tf-random, time + , transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.2.4"; + sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475"; + libraryHaskellDepends = [ + ansi-terminal async base deepseq hspec-expectations HUnit + QuickCheck quickcheck-io random setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal async base deepseq hspec-expectations hspec-meta + HUnit process QuickCheck quickcheck-io random setenv silently + tf-random time transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { @@ -93158,6 +90335,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_2_4" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta }: + mkDerivation { + pname = "hspec-discover"; + version = "2.2.4"; + sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ base directory filepath hspec-meta ]; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -93230,10 +90424,10 @@ self: { ansi-terminal base Diff hscolour HUnit nicify-lib text ]; testHaskellDepends = [ aeson base hspec HUnit text ]; - doCheck = false; homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -93314,23 +90508,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-megaparsec_0_1_1" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.1.1"; - sha256 = "4ff4683bdff9a3b0ba8a6ee1adfce01f30f8515f9db487b062e5e00e5a2795c5"; - revision = "1"; - editedCabalFile = "b5268defe9e8230440bef693c63fb7a22e1ff53b39373a040fb511714056cfb8"; - libraryHaskellDepends = [ base hspec-expectations megaparsec ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - jailbreak = true; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec @@ -93493,31 +90670,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-snap_0_4_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , digestive-functors, directory, HandsomeSoup, hspec, hspec-core - , hxt, lens, mtl, snap, snap-core, text, transformers - }: - mkDerivation { - pname = "hspec-snap"; - version = "0.4.0.1"; - sha256 = "42fead47290131c3072453aee3883b7c4a7a34d5dde989ca6e0b9df8b3e08d3a"; - libraryHaskellDepends = [ - aeson base bytestring containers digestive-functors HandsomeSoup - hspec hspec-core hxt lens mtl snap snap-core text transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers digestive-functors directory - HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text - transformers - ]; - jailbreak = true; - homepage = "https://github.com/dbp/hspec-snap"; - description = "A library for testing with Hspec and the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -93652,25 +90804,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-webdriver_1_1_0" = callPackage - ({ mkDerivation, base, data-default, hashable, hspec, hspec-core - , HUnit, lifted-base, stm, text, transformers, unordered-containers - , webdriver - }: - mkDerivation { - pname = "hspec-webdriver"; - version = "1.1.0"; - sha256 = "42c890d5f5c20f1e4eb7c21a5c33cab13adcc609e17f71495a136710186a6e69"; - libraryHaskellDepends = [ - base data-default hashable hspec hspec-core HUnit lifted-base stm - text transformers unordered-containers webdriver - ]; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Write end2end web application tests using webdriver and hspec"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-webdriver" = callPackage ({ mkDerivation, aeson, base, data-default, hashable, hspec , hspec-core, HUnit, lifted-base, stm, text, transformers @@ -94400,21 +91533,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hsyslog_2_0" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "hsyslog"; - version = "2.0"; - sha256 = "f80e8cbab80388941588836e58dbb355898eb44f3f628867dc6b109b1f4a660b"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/peti/hsyslog"; - description = "FFI interface to syslog(3) from POSIX.1-2001"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - "hsyslog" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -94460,18 +91578,16 @@ self: { }) {com_err = null; zephyr = null;}; "htaglib" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, HUnit - , taglib, test-framework, test-framework-hunit, text + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , taglib, text }: mkDerivation { pname = "htaglib"; - version = "1.0.3"; - sha256 = "b6e1a3d8e93c01fc626dea3a020b5ad4418eb8dede2210491eee43a85a99ea9b"; + version = "1.0.4"; + sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; - testHaskellDepends = [ - base directory filepath HUnit test-framework test-framework-hunit - ]; + testHaskellDepends = [ base directory filepath hspec ]; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; @@ -94940,37 +92056,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client_0_4_31" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31"; - sha256 = "3f3693508bd4099159f183d6bb8432d6b7a654f1d7ddf9b167a3372a91463b74"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -95001,7 +92086,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_1" = callPackage + "http-client_0_5_3_2" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95010,8 +92095,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.1"; - sha256 = "0d012a1278b2f2014f0198e38b658fb414e5dafd37388008198ac7a553f84d96"; + version = "0.5.3.2"; + sha256 = "cda16be6802d2b65b410090225e5143e4516527e4732b3664dd416297aef5292"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95110,6 +92195,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_2_0_4" = callPackage + ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types + , network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.2.0.4"; + sha256 = "28dddd694ed91174c2544dd388d3550df5c79d5cc4be7e4b260a825ebde1afed"; + libraryHaskellDepends = [ base HsOpenSSL http-client network ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-request-modifiers" = callPackage ({ mkDerivation, base, bytestring, exceptions, http-client , http-media, http-types, network, network-uri @@ -95170,6 +92274,8 @@ self: { pname = "http-client-tls"; version = "0.2.4.1"; sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3"; + revision = "1"; + editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c"; libraryHaskellDepends = [ base bytestring connection data-default-class http-client network tls @@ -95181,17 +92287,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls + "http-client-tls_0_3_3" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, connection + , cryptonite, data-default-class, exceptions, hspec, http-client + , http-types, memory, network, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.0"; - sha256 = "811b30a53156dc12e3eb34f8921778f081521ef388b7f4d7ce6c59d086cb3358"; + version = "0.3.3"; + sha256 = "ec1c676989aa7a53aa414d4bf2613573a8766dcf81db826365bdf20ce981a064"; libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls + base bytestring case-insensitive connection cryptonite + data-default-class exceptions http-client http-types memory network + tls transformers ]; testHaskellDepends = [ base hspec http-client http-types ]; jailbreak = true; @@ -95250,7 +92358,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit_2_2_0_1" = callPackage + "http-conduit_2_2_2" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -95260,8 +92368,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.0.1"; - sha256 = "54e7d2a3346e45f3785dc14b98f534c931236db20a1ea20335893ada922558a7"; + version = "2.2.2"; + sha256 = "220fd5f41fa8b91479ed9480402a4cf92cd2ae569811f2b8ac81cb11e2808f04"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -95451,28 +92559,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-link-header_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text - }: - mkDerivation { - pname = "http-link-header"; - version = "1.0.1"; - sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors network-uri - text - ]; - testHaskellDepends = [ - base hspec hspec-attoparsec QuickCheck text - ]; - homepage = "https://github.com/myfreeweb/http-link-header"; - description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-link-header" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec @@ -95549,6 +92635,63 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-pony" = callPackage + ({ mkDerivation, base, bytestring, network, pipes, pipes-network + , pipes-safe, transformers + }: + mkDerivation { + pname = "http-pony"; + version = "0.1.0.2"; + sha256 = "0158da9e0796d2f7b4969c7ea2bbbe38991304e58d47a80f0816ded1d0b89a7b"; + libraryHaskellDepends = [ + base bytestring network pipes pipes-network pipes-safe transformers + ]; + homepage = "https://github.com/nfjinjing/http-pony"; + description = "A type unsafe http library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-serve-wai" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, http-types, network, pipes, pipes-bytestring + , transformers, wai + }: + mkDerivation { + pname = "http-pony-serve-wai"; + version = "0.1.0.0"; + sha256 = "7ead2939a5e4408996fd6a4d64075f4118446ebde4972112dd60e3a621a3425f"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring case-insensitive + http-types network pipes pipes-bytestring transformers wai + ]; + description = "Serve a WAI application with http-pony"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-transformer-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, lens, profunctors }: + mkDerivation { + pname = "http-pony-transformer-case-insensitive"; + version = "0.1.0.0"; + sha256 = "5e43b3ee6caefb5ffda5abc056c9c4a4519a8af4cf5dd1d04e851838ef883206"; + libraryHaskellDepends = [ base case-insensitive lens profunctors ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-transformer-http" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, pipes + , pipes-attoparsec, transformers + }: + mkDerivation { + pname = "http-pony-transformer-http"; + version = "0.1.0.0"; + sha256 = "645623db8c4bf92746358fbbc0cf4e7d19392565f4c019f9dc8d1df515efeba3"; + libraryHaskellDepends = [ + attoparsec base bytestring pipes pipes-attoparsec transformers + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-proxy" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , bytestring-lexing, case-insensitive, conduit, conduit-extra @@ -95616,34 +92759,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-reverse-proxy_0_4_3" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, containers - , data-default-class, hspec, http-client, http-conduit, http-types - , lifted-base, monad-control, network, resourcet, streaming-commons - , text, transformers, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.4.3"; - sha256 = "4776b8bc59dfc889ce932223f07f236be89840c3c47cb91b7fd3fb47d1cddf45"; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra containers data-default-class http-client http-types - lifted-base monad-control network resourcet streaming-commons text - transformers wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types lifted-base network resourcet - streaming-commons transformers wai warp - ]; - homepage = "https://github.com/fpco/http-reverse-proxy"; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-reverse-proxy" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers @@ -95699,40 +92814,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-streams_0_8_3_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, MonadCatchIO-transformers, mtl - , network, network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.3.3"; - sha256 = "3f4597936490ab1ca12af71578a7c6fe6c4aa9f3d0936de88c7f83475593e232"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams - MonadCatchIO-transformers mtl network network-uri openssl-streams - snap-core snap-server system-fileio system-filepath text - transformers unordered-containers - ]; - jailbreak = true; - homepage = "http://research.operationaldynamics.com/projects/http-streams/"; - description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-streams" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive @@ -95840,30 +92921,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2_1_6_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, directory - , doctest, filepath, Glob, hex, hspec, psqueues, stm, text - , unordered-containers, vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.1"; - sha256 = "0f69321514c5de49a0a796dcf40decc5781bcb4d53618f4e977be4eb05a88055"; - libraryHaskellDepends = [ - array base bytestring bytestring-builder case-insensitive - containers psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory doctest filepath Glob hex - hspec psqueues stm text unordered-containers vector word8 - ]; - description = "HTTP/2.0 library including frames and HPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory @@ -96056,6 +93113,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "huff" = callPackage + ({ mkDerivation, alex, alex-tools, array, base, containers + , hashable, heaps, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "huff"; + version = "0.1.0.1"; + sha256 = "ff2e9051fb45d4694bf2e1a0a84452943856b043cf58cbcb1755ac424212ca3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alex-tools array base containers hashable heaps template-haskell + text unordered-containers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/elliottt/huff"; + description = "A fast-foward-based planner"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "huffman" = callPackage ({ mkDerivation, base, containers, fingertree }: mkDerivation { @@ -96178,8 +93256,8 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.3.0.1"; - sha256 = "77fbda0fe00b5463fcc59fb3402169679294aab30fa8a57d57e667fefa64eb33"; + version = "0.3.0.2"; + sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -96473,27 +93551,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hw-bits_0_0_0_6" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.0.0.6"; - sha256 = "8cfe76cdfe568fb392abe90e1f362c340d32729baa47c113d027657c85ef6c37"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; - executableHaskellDepends = [ - base criterion mmap resourcet vector - ]; - testHaskellDepends = [ base hspec QuickCheck vector ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap , parsec, QuickCheck, resourcet, vector @@ -96538,23 +93595,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-diagnostics_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.2"; - sha256 = "f90d28865ebd4fd0116270a47ed13f6b2a91255b8ec71c6d04a1cd5675237569"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-diagnostics" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -96571,37 +93611,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_0_0_2" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , containers, criterion, hspec, hw-bits, hw-conduit, hw-diagnostics - , hw-parser, hw-prim, hw-rankselect, mmap, mono-traversable, parsec - , QuickCheck, resourcet, text, transformers, vector, word8 - }: - mkDerivation { - pname = "hw-json"; - version = "0.0.0.2"; - sha256 = "b1205920d0b1ef4046a0d5ff4513d9d6b4ca952e080b7608b9de85b67d38b3fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array attoparsec base bytestring conduit containers hw-bits - hw-conduit hw-parser hw-prim hw-rankselect mono-traversable - resourcet text vector word8 - ]; - executableHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics - hw-prim hw-rankselect mmap resourcet vector - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit hspec hw-bits hw-conduit hw-prim - hw-rankselect mmap parsec QuickCheck resourcet transformers vector - ]; - homepage = "http://github.com/haskell-works/hw-json#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, errors, hspec @@ -96667,27 +93676,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_0_0_10" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, random - , vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.0.0.10"; - sha256 = "641a1da0488664d12438f396f08577e02f9ca43b53a6f00e52085f63a5ab776e"; - revision = "1"; - editedCabalFile = "6d483e45f5a7b11173cfe33c92acfd22e54c715378d7bd56ccf509b9110ac6f4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-prim" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck , random, vector @@ -96708,26 +93696,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.0.0.2"; - sha256 = "ad79b1fca42093c3db8c7196ab144a2a618c22e4368cc5ccf0d548a15fdc186a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hw-bits hw-prim vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-rankselect" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector }: @@ -96820,10 +93788,10 @@ self: { aeson attoparsec base bytestring hedis hspec hspec-contrib HUnit text time uuid ]; - doCheck = false; homepage = "http://github.com/dbp/hworker"; description = "A reliable at-least-once job queue built on top of redis"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker-ses" = callPackage @@ -96841,6 +93809,7 @@ self: { homepage = "http://github.com/dbp/hworker-ses"; description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hws" = callPackage @@ -97035,19 +94004,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hxt-css_0_1_0_2" = callPackage - ({ mkDerivation, base, hxt, parsec, split }: - mkDerivation { - pname = "hxt-css"; - version = "0.1.0.2"; - sha256 = "c3adfe73846b1274249835c142174dfc88167029be350761ec46cd97dc39c672"; - libraryHaskellDepends = [ base hxt parsec split ]; - homepage = "https://github.com/redneb/hxt-css"; - description = "CSS selectors for HXT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hxt-css" = callPackage ({ mkDerivation, base, hxt, parsec, split }: mkDerivation { @@ -97185,13 +94141,12 @@ self: { }: mkDerivation { pname = "hxt-tagsoup"; - version = "9.1.3"; - sha256 = "e7601d375af58c5a806002a61c1e077f60e70ab04e708fbbeb090e6e644ae4e6"; + version = "9.1.4"; + sha256 = "d77b290d63acf0ac8e5a07c5c69753f9984b97e0c9d2c0befadd7dd5b144b283"; libraryHaskellDepends = [ base hxt hxt-charproperties hxt-unicode tagsoup ]; - jailbreak = true; - homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + homepage = "https://github.com/UweSchmidt/hxt"; description = "TagSoup parser for HXT"; license = "unknown"; }) {}; @@ -97788,7 +94743,6 @@ self: { base containers directory doctest filepath unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; @@ -97897,6 +94851,8 @@ self: { pname = "i18n"; version = "0.4.0.0"; sha256 = "7e0df375883fb3428b0cd20aac1163ea38de80fd3499ec3007979b36fe2f93fa"; + revision = "1"; + editedCabalFile = "af77b0f384e54fb72e7c4e757cff397ab4b6743c982c6f2349e2844aac8bb1eb"; libraryHaskellDepends = [ base containers directory filepath mtl parsec text transformers ]; @@ -98078,7 +95034,6 @@ self: { test-framework test-framework-hunit text unix utf8-string ]; jailbreak = true; - doCheck = false; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -98301,31 +95256,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "idris_0_11_2" = callPackage + "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, async, base, base64-bytestring, binary + , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, cheapskate, containers , deepseq, directory, filepath, fingertree, fsnotify, gmp , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, safe, split, terminal-size, text, time + , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty + , tasty-golden, tasty-rerun, terminal-size, text, time , transformers, transformers-compat, trifecta, uniplate, unix , unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.11.2"; - sha256 = "4120eec85e07dc9e96835fc5226f4d8044b2401c0c007987465d906db7773fad"; + version = "0.12.2"; + sha256 = "7df31d4eae5aabdd11b6940aeed89693f9c49f01826e7355bf80133da8947562"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint async base - base64-bytestring binary blaze-html blaze-markup bytestring + aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async + base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process safe split terminal-size text time - transformers transformers-compat trifecta uniplate unix + parsers pretty process regex-tdfa safe split terminal-size text + time transformers transformers-compat trifecta uniplate unix unordered-containers utf8-string vector vector-binary-instances zip-archive ]; @@ -98334,18 +95290,16 @@ self: { base directory filepath haskeline transformers ]; testHaskellDepends = [ - base containers directory filepath haskeline process time - transformers + base bytestring containers directory filepath haskeline + optparse-applicative process tagged tasty tasty-golden tasty-rerun + time transformers ]; - jailbreak = true; - doCheck = false; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; - "idris" = callPackage + "idris_0_12_3" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, cheapskate, containers @@ -98359,8 +95313,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.12.2"; - sha256 = "7df31d4eae5aabdd11b6940aeed89693f9c49f01826e7355bf80133da8947562"; + version = "0.12.3"; + sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -98383,10 +95337,10 @@ self: { optparse-applicative process tagged tasty tasty-golden tasty-rerun time transformers ]; - doCheck = false; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -98492,30 +95446,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ig_0_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, crypto-api, cryptohash - , cryptohash-cryptoapi, data-default, http-conduit, http-types - , lifted-base, monad-control, resourcet, text, time, transformers - , transformers-base, unordered-containers - }: - mkDerivation { - pname = "ig"; - version = "0.7"; - sha256 = "31763aae55c9cfa47a8f3f8e04ba0b91adb4b6aa5f92e3401208205b873d5c55"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - crypto-api cryptohash cryptohash-cryptoapi data-default - http-conduit http-types lifted-base monad-control resourcet text - time transformers transformers-base unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/prowdsponsor/ig"; - description = "Bindings to Instagram's API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ig" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, crypto-api, cryptohash @@ -98649,7 +95579,6 @@ self: { utf8-string uuid vector ]; jailbreak = true; - doCheck = false; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -99274,8 +96203,10 @@ self: { ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { pname = "implicit-logging"; - version = "0.1.0.0"; - sha256 = "98032042eee95714c2f0e0c1a25a03f15e75223bacc85b9857b1d66d639805c0"; + version = "0.2.0.0"; + sha256 = "81b1c538b50963067410e7cbb6d60f42c0e90f068518d20505cc942e633ec3e3"; + revision = "1"; + editedCabalFile = "da2dc77f11f48a07772f4528408f90fad91d0c413d4bf855f14670df5765a60b"; libraryHaskellDepends = [ base mtl time transformers ]; jailbreak = true; homepage = "https://github.com/revnull/implicit-logging"; @@ -99611,8 +96542,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "indexed"; - version = "0.1"; - sha256 = "2274650021b803c6e55828f18b27a08d7b7b95767c306804154dea5ba2bfa5b7"; + version = "0.1.3"; + sha256 = "ef84090ec6bf79e7dc6e9d570fc370c9eea6cd251d3c023979f6e1f8d3fbf5c2"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/reinerp/indexed"; description = "Haskell98 indexed functors, monads, comonads"; @@ -99974,7 +96905,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "inline-c_0_5_5_5" = callPackage + "inline-c" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix @@ -99982,8 +96913,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.5.5"; - sha256 = "f3d142647eaa89b6fc4833fbb5722172ab950f6ef17f186659e947b1958c7230"; + version = "0.5.5.7"; + sha256 = "b7a0561c37eed9441548baa8bf815bc3fb121504ff5ae4c8f2297ba80c7c54b9"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -99996,10 +96927,9 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-c" = callPackage + "inline-c_0_5_5_9" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix @@ -100007,8 +96937,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.5.7"; - sha256 = "b7a0561c37eed9441548baa8bf815bc3fb121504ff5ae4c8f2297ba80c7c54b9"; + version = "0.5.5.9"; + sha256 = "2e48cae75fe1e4fd9f7c0ab4e7a4cbb4dcb9d2e9075d40adc33ac9038297fe22"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -100021,6 +96951,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-cpp" = callPackage @@ -100071,38 +97002,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {jvm = null;}; - "inline-r_0_8_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, mtl, pretty, primitive, process, quickcheck-assertions - , R, reflection, setenv, silently, singletons, strict, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, th-lift - , th-orphans, transformers, unix, vector - }: - mkDerivation { - pname = "inline-r"; - version = "0.8.0.1"; - sha256 = "4ce2363046cb3173e00e1f60fe666e539d88ab61a4a3d5eb06d550dba0f41e61"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default-class deepseq - exceptions mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector - ]; - libraryPkgconfigDepends = [ R ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process - quickcheck-assertions silently singletons strict tasty - tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text unix vector - ]; - description = "Seamlessly call R from Haskell and vice versa. No FFI required."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) R;}; - "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, c2hs, containers , data-default-class, deepseq, directory, exceptions, filepath @@ -100184,6 +97083,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.0.0"; sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; + revision = "1"; + editedCabalFile = "2775fc971c86a62caa0590f0f8c5ea74c3c4b59c96f9c45b0bcbc1760bc438e7"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -100230,6 +97131,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inspector-wrecker" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , connection, data-default, http-client, http-client-tls + , http-types, optparse-applicative, text, time, wrecker + }: + mkDerivation { + pname = "inspector-wrecker"; + version = "0.1.0.0"; + sha256 = "71bcfb62046ae519c66e8eefd71a77753512d06b2fa73e523bcdb3585fda42ed"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive connection data-default + http-client http-client-tls http-types optparse-applicative text + time wrecker + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/skedgeme/inspector-wrecker#readme"; + description = "Create benchmarks from the HAR files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "instance-control" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -100514,13 +97440,12 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.5"; - sha256 = "23243eb47b718de5e49c3b5db730b874607793a47cfe37efba1ea284b5cd5578"; + version = "0.1.0.6"; + sha256 = "d2871aaf50275fc6ecf17e151e181d30c1619048b693574fbfddb6b211548acf"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; - jailbreak = true; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -100779,28 +97704,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant_0_3_1" = callPackage - ({ mkDerivation, array, base, bifunctors, containers, contravariant - , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar - , stm, tagged, template-haskell, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.3.1"; - sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff"; - libraryHaskellDepends = [ - array base bifunctors containers contravariant ghc-prim profunctors - semigroups StateVar stm tagged template-haskell transformers - transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/nfrisby/invariant-functors"; - description = "Haskell 98 invariant functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, profunctors, QuickCheck @@ -101150,6 +98053,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip6addr_0_5_1_3" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "0.5.1.3"; + sha256 = "4edd17f9cf77b0e6ae59c9016d5dc72b3467959bd779264783a4fe7c02aa9340"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + homepage = "https://github.com/MichelBoucey/ip6addr"; + description = "Commandline tool to generate IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipatch" = callPackage ({ mkDerivation, base, bytestring, darcs, directory, filepath , hashed-storage, process, unix @@ -101348,25 +98266,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-client_0_3_0_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, data-default-class - , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time - , transformers - }: - mkDerivation { - pname = "irc-client"; - version = "0.3.0.0"; - sha256 = "ddc97ede9d741130d9ee0ff5128550ae9a5f6f4a04f4cb3b0d5c05c887314e0c"; - libraryHaskellDepends = [ - base bytestring conduit data-default-class irc-conduit irc-ctcp - old-locale stm stm-conduit text time transformers - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-client" = callPackage ({ mkDerivation, base, bytestring, conduit, irc-conduit, irc-ctcp , old-locale, stm, stm-conduit, text, time, transformers @@ -101395,25 +98294,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-conduit_0_1_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.1.2.0"; - sha256 = "77aea49a8efdbd8dc405d8a9ed4afddb11c906136bd3c8ec3bd32e981d0a84d7"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls @@ -101438,13 +98318,13 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.1.1.1"; - sha256 = "73f5a1ced86966659bad47f2e6a04419aac16319500cae4784361430751b808a"; + version = "2.2.0.0"; + sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834"; libraryHaskellDepends = [ attoparsec base bytestring hashable memory primitive text time vector ]; - testHaskellDepends = [ base HUnit text ]; + testHaskellDepends = [ base hashable HUnit text ]; homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; @@ -101462,31 +98342,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-dcc_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, errors - , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path - , tasty, tasty-hspec, transformers, utf8-string - }: - mkDerivation { - pname = "irc-dcc"; - version = "1.2.1"; - sha256 = "b348e0b921c27e2f29188b5604e0185cec9b0f0da36e24cad920ec1a33f5c512"; - revision = "1"; - editedCabalFile = "cf27bbf57c87862fc6c854c916815a72633983daf6405a77abe8979704a4e76b"; - libraryHaskellDepends = [ - attoparsec base binary bytestring errors io-streams iproute - irc-ctcp network path transformers utf8-string - ]; - testHaskellDepends = [ - attoparsec base binary bytestring hspec-attoparsec iproute irc-ctcp - network path tasty tasty-hspec utf8-string - ]; - homepage = "https://github.com/JanGe/irc-dcc"; - description = "A DCC message parsing and helper library for IRC clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-dcc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, errors , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network @@ -102418,7 +99273,6 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103050,6 +99904,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_4_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, byteable, bytestring, cryptonite, data-default-class + , hspec, lens, memory, mtl, network-uri, QuickCheck + , quickcheck-instances, safe, semigroups, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.4.0.3"; + sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bifunctors byteable + bytestring cryptonite data-default-class lens memory mtl + network-uri QuickCheck quickcheck-instances safe semigroups + template-haskell text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bifunctors byteable + bytestring cryptonite data-default-class hspec lens memory mtl + network-uri QuickCheck quickcheck-instances safe semigroups tasty + tasty-hspec tasty-quickcheck template-haskell text time + unordered-containers vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, cereal , containers, cryptonite, doctest, either, hspec, HUnit, memory @@ -103069,7 +99954,6 @@ self: { aeson aeson-qq base bytestring cryptonite doctest either hspec HUnit memory mtl QuickCheck text unordered-containers vector ]; - doCheck = false; homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; @@ -103112,21 +99996,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "js-jquery_1_12_4" = callPackage - ({ mkDerivation, base, HTTP }: - mkDerivation { - pname = "js-jquery"; - version = "1.12.4"; - sha256 = "6038b72113932bec21c89293fb5f7e23621d03e315596986d9feab34a159ffdb"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HTTP ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/js-jquery#readme"; - description = "Obtain minified jQuery code"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "js-jquery" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { @@ -103141,30 +100010,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jsaddle_0_3_0_3" = callPackage - ({ mkDerivation, base, doctest, glib, gtk3, lens, QuickCheck - , template-haskell, text, transformers, vector, webkitgtk3 - , webkitgtk3-javascriptcore - }: - mkDerivation { - pname = "jsaddle"; - version = "0.3.0.3"; - sha256 = "8dcb54c32c281409da90e7d155913bfae5da1a2f4c71b409f70290c5f5ba2c89"; - libraryHaskellDepends = [ - base glib gtk3 lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; - testHaskellDepends = [ - base doctest glib gtk3 QuickCheck text vector webkitgtk3 - webkitgtk3-javascriptcore - ]; - jailbreak = true; - doCheck = false; - description = "High level interface for webkit-javascriptcore"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "jsaddle" = callPackage ({ mkDerivation, base, doctest, gi-glib, gi-gtk, gi-javascriptcore , gi-webkit, haskell-gi-base, lens, QuickCheck, template-haskell @@ -104078,8 +100923,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.7"; - sha256 = "7b52f0890ed569f5962fbbb3fa9a340496711b4ca13fb4ab6bb843aea64828ab"; + version = "0.2.9"; + sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104186,7 +101031,6 @@ self: { scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th text time unordered-containers vector ]; - doCheck = false; homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; description = "JSON Web Token (JWT) decoding and encoding"; license = stdenv.lib.licenses.mit; @@ -104259,26 +101103,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kan-extensions_4_2_3" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, mtl, semigroupoids, tagged - , transformers - }: - mkDerivation { - pname = "kan-extensions"; - version = "4.2.3"; - sha256 = "334f0edbbf08ebf93c9f7db5473086dcababc6a72d75fa9d8e43237f9b5adc47"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free mtl semigroupoids tagged transformers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/kan-extensions/"; - description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, mtl, semigroupoids, tagged @@ -104453,38 +101277,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_2_0_0" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, containers - , directory, either, exceptions, hostname, microlens, microlens-th - , monad-control, mtl, old-locale, quickcheck-instances - , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.2.0.0"; - sha256 = "bd947874e92da876603c1cbb3bc521e8f33cd08a59c2714d0e35e8dd15ad53b9"; - libraryHaskellDepends = [ - aeson auto-update base bytestring containers either exceptions - hostname microlens microlens-th monad-control mtl old-locale - resourcet string-conv template-haskell text time time-locale-compat - transformers transformers-base transformers-compat unix - unordered-containers - ]; - testHaskellDepends = [ - aeson base directory quickcheck-instances regex-tdfa-rc tasty - tasty-hunit tasty-quickcheck template-haskell temporary text time - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip" = callPackage ({ mkDerivation, aeson, auto-update, base, bytestring, containers , directory, either, exceptions, hostname, microlens, microlens-th @@ -104516,34 +101308,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "katip-elasticsearch_0_2_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, containers - , enclosed-exceptions, exceptions, http-client, http-types, katip - , lens, lens-aeson, quickcheck-instances, retry, scientific, stm - , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "katip-elasticsearch"; - version = "0.2.1.0"; - sha256 = "e00a3d10cf1b7ed9f2f4346c59a992bc5955d1da90d4cc93f9edacc56ccce984"; - libraryHaskellDepends = [ - aeson async base bloodhound enclosed-exceptions exceptions - http-client http-types katip retry scientific stm stm-chans text - time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound containers http-client http-types katip lens - lens-aeson quickcheck-instances scientific stm tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , enclosed-exceptions, exceptions, http-client, http-types, katip @@ -104645,15 +101409,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "kawhi_0_2_0" = callPackage + "kawhi_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text }: mkDerivation { pname = "kawhi"; - version = "0.2.0"; - sha256 = "cbabf52a49d6f323445d9db536382fb43471a8a1065671f9d5b2073c42d53871"; + version = "0.2.1"; + sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-conduit http-types mtl safe scientific text @@ -105126,44 +101890,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keter_1_4_3_1" = callPackage - ({ mkDerivation, aeson, array, async, attoparsec, base - , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default, directory, filepath - , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, tar, template-haskell, text, time, transformers - , unix, unix-compat, unordered-containers, vector, wai - , wai-app-static, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "keter"; - version = "1.4.3.1"; - sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f"; - revision = "2"; - editedCabalFile = "aebe235523c4b1c4a4c3bf091ba46349881fcc3ca5d69d3304dc395542b82adb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async attoparsec base blaze-builder bytestring - case-insensitive conduit conduit-extra containers data-default - directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm tar template-haskell text time transformers - unix unix-compat unordered-containers vector wai wai-app-static - wai-extra warp warp-tls yaml zlib - ]; - executableHaskellDepends = [ base data-default filepath ]; - testHaskellDepends = [ - base bytestring conduit hspec HUnit transformers unix - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Web application deployment manager, focusing on Haskell web frameworks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -105219,21 +101945,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keycode_0_2" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "keycode"; - version = "0.2"; - sha256 = "93f09542fa79993e46a263ff11c3a3c5368c00aa5a11e53bdccf7fbe885459ae"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - homepage = "https://github.com/RyanGlScott/keycode"; - description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keycode" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { @@ -105296,24 +102007,29 @@ self: { }) {}; "keysafe" = callPackage - ({ mkDerivation, aeson, argon2, base, binary, bytestring - , containers, deepseq, directory, filepath, http-client, network - , optparse-applicative, process, raaz, random, readline - , secret-sharing, servant, servant-client, servant-server, socks - , split, stm, text, time, transformers, unix, utf8-string, wai - , warp, zxcvbn-c + ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter + , bytestring, containers, crypto-random, deepseq, directory + , disk-free-space, fast-logger, filepath, http-client, lifted-base + , network, optparse-applicative, process, raaz, random, readline + , SafeSemaphore, secret-sharing, servant, servant-client + , servant-server, socks, split, stm, text, time, token-bucket + , transformers, unbounded-delays, unix, utf8-string, wai, warp + , zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20160831"; - sha256 = "bee8f0cd5ff26505b5856185a02baa9b1ca8245b09d59ef7dcb9d0c5b42f8bd9"; + version = "0.20160914"; + sha256 = "b8e77394b553997e9e6ca90cc44bd4e79a6e8a4b021d596419c9345cb451eb87"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers deepseq directory filepath - http-client network optparse-applicative process raaz random - readline secret-sharing servant servant-client servant-server socks - split stm text time transformers unix utf8-string wai warp zxcvbn-c + aeson async base binary bloomfilter bytestring containers + crypto-random deepseq directory disk-free-space fast-logger + filepath http-client lifted-base network optparse-applicative + process raaz random readline SafeSemaphore secret-sharing servant + servant-client servant-server socks split stm text time + token-bucket transformers unbounded-delays unix utf8-string wai + warp zxcvbn-c ]; executableSystemDepends = [ argon2 ]; jailbreak = true; @@ -105988,30 +102704,13 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.3.2"; - sha256 = "0da7478ee80d29eb96efaf8d3df9acc24f037b062c743a6c987765d00abf84e1"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base servant tasty tasty-hspec text ]; - homepage = "https://github.com/tfausak/lackey#readme"; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_0_4_0" = callPackage - ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec - , text - }: - mkDerivation { - pname = "lackey"; version = "0.4.0"; sha256 = "34fa0c06eac9c6039aa704e7f64bfd0ed058e36088bef338459b4118e21a7fbb"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; - jailbreak = true; homepage = "https://github.com/tfausak/lackey#readme"; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lagrangian" = callPackage @@ -106738,6 +103437,7 @@ self: { ]; description = "Fpga bus core and serialization for RedPitaya"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdiff" = callPackage @@ -106885,32 +103585,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote_0_11_6_2" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.11.6.2"; - sha256 = "bcfe78f7debd225d8a24e369fa593a8670d6c6db782e753fd3aa4cb72130a1ce"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - homepage = "http://www.drexel.edu/~mainland/"; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-c-quote" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy @@ -106940,10 +103614,9 @@ self: { ({ mkDerivation, base, bool-extras }: mkDerivation { pname = "language-cil"; - version = "0.2.2"; - sha256 = "caf1a739da2681f6fd5c2c6825081a2dc0cefe8f33957554ec8aaf51ec557e2c"; + version = "0.4.0"; + sha256 = "20c46cc14d63a752a6c20e71a58c590a4405bd158e1f5155edee273be177a084"; libraryHaskellDepends = [ base bool-extras ]; - jailbreak = true; homepage = "https://github.com/tomlokhorst/language-cil"; description = "Manipulating Common Intermediate Language AST"; license = stdenv.lib.licenses.bsd3; @@ -107445,51 +104118,6 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hslua, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.2"; - sha256 = "c093b8c4586c6d8b63aa02ed905c74f4238cae9c6d32b0140ba47fefff1cda48"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hslua hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process random regex-pcre-builtin - scientific semigroups servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "language-puppet_1_3_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec , memory, mtl, operational, optparse-applicative, parallel-io @@ -107500,8 +104128,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.1"; - sha256 = "8aa7558b51825ba3e4b00c92a74f2d98b55430f2d7333501572f491554862ad2"; + version = "1.3.1.1"; + sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107524,11 +104152,10 @@ self: { megaparsec mtl scientific strict-base-types temporary text transformers unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -107673,27 +104300,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-thrift_0_8_0_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover - , megaparsec, QuickCheck, text, transformers - }: - mkDerivation { - pname = "language-thrift"; - version = "0.8.0.1"; - sha256 = "defc67a406403425a6fcdb4fcdd735e2bc6309ec1a999debdf3139cd04e0bcb6"; - libraryHaskellDepends = [ - ansi-wl-pprint base megaparsec text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text - ]; - jailbreak = true; - homepage = "https://github.com/abhinav/language-thrift#readme"; - description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-thrift" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups @@ -108060,6 +104666,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lazy-io-streams" = callPackage + ({ mkDerivation, base, bytestring, io-streams }: + mkDerivation { + pname = "lazy-io-streams"; + version = "0.1.0.0"; + sha256 = "beef343b717030f28fabb7e55bbf687d96769b16081ff8c0bd5bb73da3065d08"; + libraryHaskellDepends = [ base bytestring io-streams ]; + description = "Get lazy with your io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -108321,16 +104938,16 @@ self: { "learn-physics" = callPackage ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss - , polynomial, spatial-math, vector-space + , spatial-math, vector-space }: mkDerivation { pname = "learn-physics"; - version = "0.6.0.1"; - sha256 = "c45787f96c1645a75063694d2fa71baf9a30c5568026ea7c54d5690fd25bc107"; + version = "0.6.0.2"; + sha256 = "0aa998b401ff2f4acbf611861e95e30340da594f4a4e8bbd6070bd30c9c5ccae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base gloss gnuplot hmatrix linear not-gloss polynomial spatial-math + base gloss gnuplot hmatrix linear not-gloss spatial-math vector-space ]; executableHaskellDepends = [ @@ -108520,45 +105137,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens_4_13" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, deepseq, directory - , distributive, doctest, exceptions, filepath, free - , generic-deriving, ghc-prim, hashable, hlint, HUnit - , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-compat, unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.13"; - sha256 = "3556e7bf69d13fca0e73c5e429c8d25a876931c24ae5aa1f4755acac67078f3c"; - revision = "1"; - editedCabalFile = "4e3ac486c3ffd2166eb8affe3b28e7cd86437031c7e3c72018377871b6c02a1f"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lens" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , comonad, containers, contravariant, distributive, exceptions @@ -108675,22 +105253,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-family-th_0_4_1_0" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "lens-family-th"; - version = "0.4.1.0"; - sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20"; - revision = "2"; - editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - homepage = "http://github.com/DanBurton/lens-family-th#readme"; - description = "Generate lens-family style lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lens-family-th" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -108862,32 +105424,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lentil_0_1_12_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip - , filepath, hspec, natural-sort, optparse-applicative, parsec - , regex-tdfa - }: - mkDerivation { - pname = "lentil"; - version = "0.1.12.0"; - sha256 = "a49c806f024ba30197a85f043c84d8ad1ca5aaca3b6d96ebb8727a4e438380fb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath natural-sort - optparse-applicative parsec regex-tdfa - ]; - testHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath hspec - natural-sort optparse-applicative parsec regex-tdfa - ]; - jailbreak = true; - homepage = "http://www.ariis.it/static/articles/lentil/page.html"; - description = "frugal issue tracker"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lentil" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec @@ -109465,10 +106001,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "libltdl"; - version = "0.1.0.3"; - sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415"; + version = "0.1.1"; + sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; libraryHaskellDepends = [ base ]; - homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi"; + homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109496,19 +106032,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "libnotify_0_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: - mkDerivation { - pname = "libnotify"; - version = "0.1.1.0"; - sha256 = "206ff7bb29530cd1cfabd417a9ae1aa38bf9f1a834a0f8db914d3d45c24e81f1"; - libraryHaskellDepends = [ base bytestring glib gtk ]; - librarySystemDepends = [ libnotify ]; - description = "Bindings to libnotify library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libnotify;}; - "libnotify" = callPackage ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { @@ -109741,7 +106264,8 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) systemd;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: @@ -109875,16 +106399,20 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, HTTP, process + ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers + , directory, http-conduit, process }: mkDerivation { pname = "licensor"; - version = "0.1.0"; - sha256 = "3fd79e5758020abbb0b9c583c5ec9f3e324ad4edd471f320478469600e4ef099"; - isLibrary = false; + version = "0.2.0"; + sha256 = "87ec4cbc25e9efa51d4bf5d7904db62169807c164041995dacc77c165d3071e5"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-conduit process + ]; executableHaskellDepends = [ - base Cabal containers directory HTTP process + base Cabal cmdargs containers directory ]; homepage = "https://github.com/jpvillaisaza/licensor"; description = "A license compatibility helper"; @@ -109959,7 +106487,6 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; - doCheck = false; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -110213,7 +106740,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - doCheck = false; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -110345,6 +106871,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linearmap-category" = callPackage + ({ mkDerivation, base, constrained-categories, containers + , free-vector-spaces, ieee754, lens, linear, semigroups, vector + , vector-space + }: + mkDerivation { + pname = "linearmap-category"; + version = "0.1.0.0"; + sha256 = "965294deb7e4e15d11126e84ee7a5f158312f15d07c8e3adc0514b9143e3173f"; + libraryHaskellDepends = [ + base constrained-categories containers free-vector-spaces ieee754 + lens linear semigroups vector vector-space + ]; + jailbreak = true; + homepage = "https://github.com/leftaroundabout/linearmap-family"; + description = "Native, complete, matrix-free linear algebra"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linearscan" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { @@ -111034,26 +107580,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "list-t_0_4_7" = callPackage - ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control - , mtl, mtl-prelude, transformers, transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "0.4.7"; - sha256 = "6b5900d4570bef59b5ebdc25317a032314f738adacc742d19d9c5078bb48a6c9"; - libraryHaskellDepends = [ - base base-prelude mmorph monad-control mtl transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/list-t"; - description = "ListT done right"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "list-t" = callPackage ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control , mtl, mtl-prelude, transformers, transformers-base @@ -111685,8 +108211,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1"; - sha256 = "e5f7cf1a9bd2c4726718ee7606664f4d16a863c339012cae9da29c1cd54b687c"; + version = "3.1.0.1"; + sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty storable-record tfp transformers utility-ht @@ -112185,6 +108711,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logic-TPTP" = callPackage @@ -112212,8 +108739,8 @@ self: { }: mkDerivation { pname = "logic-classes"; - version = "1.7"; - sha256 = "6af3404b06900e7e2f5a56b96182af2bf7764fe0ab680b9611cd34ff52a82f11"; + version = "1.7.1"; + sha256 = "4c403e8b8487d7d4843c76ad3982a2661eff4fc687bb7e8c507f9114008e6550"; libraryHaskellDepends = [ applicative-extras atp-haskell base containers HUnit mtl parsec pretty PropLogic safe safecopy set-extra syb template-haskell @@ -112854,33 +109381,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ltext_0_0_2_1" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, deepseq - , directory, hspec, mtl, mtl-compat, optparse-applicative, parsec - , pretty, template-haskell, text, transformers, yaml - }: - mkDerivation { - pname = "ltext"; - version = "0.0.2.1"; - sha256 = "2e0d10a71d59a59218f7e501fc53d6de05ee4e123c2e89bed2f12f4df34d2937"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers deepseq mtl mtl-compat parsec pretty - template-haskell text transformers - ]; - executableHaskellDepends = [ - aeson base containers data-default deepseq directory mtl mtl-compat - optparse-applicative parsec pretty template-haskell text - transformers yaml - ]; - testHaskellDepends = [ base hspec mtl ]; - jailbreak = true; - description = "Higher-order file applicator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ltext" = callPackage ({ mkDerivation, attoparsec, base, directory, exceptions, extra , mtl, optparse-applicative, pretty, QuickCheck @@ -113047,28 +109547,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid_2_9_5" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.5"; - sha256 = "ae73ed5490f11f23252e98b3b8c4aa4b86acc0019370e1a54e5957ebf948cbb8"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text @@ -113106,22 +109584,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid-svg_0_6_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: - mkDerivation { - pname = "lucid-svg"; - version = "0.6.0.1"; - sha256 = "a8cff758914de95defca5640a1f6c3ddf995078063fb8553da02249510db67cc"; - libraryHaskellDepends = [ - base blaze-builder lucid text transformers - ]; - jailbreak = true; - homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; - description = "DSL for SVG using lucid for HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -113216,25 +109678,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; - "luminance_0_11_0_2" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.11.0.2"; - sha256 = "615050be1e296178ca22d13a5ad6787d648aa75760a24ce0b4c9bd9c679e506b"; - libraryHaskellDepends = [ - base containers contravariant dlist gl linear mtl resourcet - semigroups transformers vector void - ]; - jailbreak = true; - homepage = "https://github.com/phaazon/luminance"; - description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "luminance" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void @@ -113596,30 +110039,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "machines_0_5_1" = callPackage - ({ mkDerivation, base, comonad, containers, directory, doctest - , filepath, free, mtl, pointed, profunctors, semigroups - , transformers, void - }: - mkDerivation { - pname = "machines"; - version = "0.5.1"; - sha256 = "6229f4ff600fe2db87f43220d42089abd64dc0a0d959e15c5010a7ed81f7dbb7"; - revision = "1"; - editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d"; - libraryHaskellDepends = [ - base comonad containers free mtl pointed profunctors semigroups - transformers void - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/machines/"; - description = "Networked stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "machines" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers, directory , distributive, doctest, filepath, free, mtl, pointed, profunctors @@ -113645,10 +110064,9 @@ self: { ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { pname = "machines-binary"; - version = "0.3.0.2"; - sha256 = "c0c6c1a3869b3890d1b003a4adf4e91a5ae0921e775a9bfc126aa11bee663726"; + version = "0.3.0.3"; + sha256 = "60ff456d658ea1a427f32ee5ae1c726e2e7703942bd33edf28b457d753c20652"; libraryHaskellDepends = [ base binary bytestring machines ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-binary"; description = "Binary utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113660,12 +110078,11 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.8"; - sha256 = "65b712af8b3ecbd91618233e811170d9d7537982440005e3cc8e00284ecda4db"; + version = "0.2.0.9"; + sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113677,12 +110094,11 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.12"; - sha256 = "375cf1c4529df84a085cb9c5d2625805e1d947cf4d444c3eeb66e7d0ffbd617d"; + version = "0.2.0.13"; + sha256 = "4d579d5e9e94fafcfca91322734263498999d2e2af45c40ff0d1db78f4a8f5d4"; libraryHaskellDepends = [ base bytestring chunked-data machines transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113693,12 +110109,11 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.6"; - sha256 = "2a51ffae469eda92ccd7a8d2d1301b0b756ec0c0672346b92572d58909a15831"; + version = "0.2.0.8"; + sha256 = "7a159328a70756acc36940a3f3f5430187ecf7a4d4f01b2b92b119d3e14ffa2d"; libraryHaskellDepends = [ base chunked-data machines machines-io process ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113902,6 +110317,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mailchimp" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client + , http-client-tls, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "mailchimp"; + version = "0.1.0"; + sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-client http-client-tls + servant servant-client text transformers + ]; + jailbreak = true; + homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; + description = "Bindings for the MailChimp API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mailchimp-subscribe" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, reflection, scotty, text, transformers, wai-extra @@ -114455,31 +110889,6 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "mandrill_0_5_2_2" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers - }: - mkDerivation { - pname = "mandrill"; - version = "0.5.2.2"; - sha256 = "99031db2a5406c4fe2f3523af6220d793d57f3e75d106e75bfa1bdac9eb77582"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mandrill" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client @@ -114579,18 +110988,20 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers - , trivial-constraint, vector, vector-space, void + , deepseq, hmatrix, MemoTrie, microlens, microlens-th, semigroups + , tagged, transformers, trivial-constraint, vector, vector-space + , void }: mkDerivation { pname = "manifolds"; - version = "0.2.2.0"; - sha256 = "95bfb764205c8d2038ec1dacbe30ca89a4bb85d19292dd55e77274f75e71fbc1"; + version = "0.2.3.0"; + sha256 = "ae9bcf5eb972acee8eaec5f4180fb634466e6bc76849edd83d3c28cf20fdfa3e"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq hmatrix - MemoTrie semigroups tagged transformers trivial-constraint vector - vector-space void + MemoTrie microlens microlens-th semigroups tagged transformers + trivial-constraint vector vector-space void ]; + jailbreak = true; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; @@ -114612,26 +111023,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "map-syntax_0_2" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "map-syntax"; - version = "0.2"; - sha256 = "395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b"; - libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ - base containers deepseq HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 transformers - ]; - jailbreak = true; - description = "Syntax sugar for defining maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "map-syntax" = callPackage ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl , QuickCheck, transformers @@ -115064,43 +111455,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; - "math-functions_0_1_7_0" = callPackage + "math-functions" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.1.7.0"; - sha256 = "f3faa070947829fb56a5563f474bfe41237b4b5e8c88c37cac42d208f4a6bea6"; + version = "0.2.0.1"; + sha256 = "ac165116d981d879b4ea4f387d40140515d75823d8d60295514c41dbf4cac641"; revision = "1"; - editedCabalFile = "c7e7287e2206d4bc8020141fc9a2b2f1ee09dd8c11f4e2eacbd24e68b99852f5"; + editedCabalFile = "3722814c83e907f40959812ff4209a704e27d53be667c98b83815b222e073f27"; libraryHaskellDepends = [ - base deepseq erf primitive vector vector-th-unbox + base deepseq primitive vector vector-th-unbox ]; testHaskellDepends = [ base deepseq erf HUnit primitive QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector vector-th-unbox ]; - doCheck = false; homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "math-functions" = callPackage + "math-functions_0_2_0_2" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.2.0.1"; - sha256 = "ac165116d981d879b4ea4f387d40140515d75823d8d60295514c41dbf4cac641"; - revision = "1"; - editedCabalFile = "3722814c83e907f40959812ff4209a704e27d53be667c98b83815b222e073f27"; + version = "0.2.0.2"; + sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737"; libraryHaskellDepends = [ base deepseq primitive vector vector-th-unbox ]; @@ -115109,10 +111496,10 @@ self: { test-framework-hunit test-framework-quickcheck2 vector vector-th-unbox ]; - doCheck = false; homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -115767,26 +112154,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "megaparsec_4_4_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers - }: - mkDerivation { - pname = "megaparsec"; - version = "4.4.0"; - sha256 = "93addf2a1cf14cb88fd67ea9951d8dd76bcb75960936a517b13787ed0e26f310"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - base HUnit mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "megaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , HUnit, mtl, QuickCheck, scientific, test-framework @@ -115882,6 +112249,7 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; + jailbreak = true; homepage = "https://github.com/dhess/mellon/"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; @@ -116001,7 +112369,6 @@ self: { base bytestring data-default-class hspec HUnit network process ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -116063,21 +112430,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "memoize_0_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "memoize"; - version = "0.7"; - sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb"; - revision = "1"; - editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - description = "A memoization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "memoize" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -116190,26 +112542,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "messagepack_0_5_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - }: - mkDerivation { - pname = "messagepack"; - version = "0.5.1"; - sha256 = "e12c22991bd4265e3a52642d0e5970182ecd931afdf8552088d49a524c49625d"; - libraryHaskellDepends = [ base bytestring cereal containers ]; - testHaskellDepends = [ - base bytestring cereal containers QuickCheck test-framework - test-framework-quickcheck2 test-framework-th - ]; - doCheck = false; - homepage = "https://github.com/rodrigosetti/messagepack"; - description = "Serialize instance for Message Pack Object"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "messagepack" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th @@ -116223,7 +112555,6 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - doCheck = false; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; @@ -116385,9 +112716,9 @@ self: { testHaskellDepends = [ async base lens mwc-random primitive QuickCheck unix ]; - doHaddock = false; description = "High-performance application metric tracking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metricsd-client" = callPackage @@ -116523,6 +112854,45 @@ self: { homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microformats2-parser_1_0_1_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , base-compat, blaze-html, blaze-markup, bytestring, containers + , data-default, either, errors, hspec + , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl + , network, network-uri, options, pcre-heavy, raw-strings-qq, safe + , scotty, streaming-commons, tagsoup, template-haskell, text, time + , transformers, unordered-containers, vector, wai-extra, warp + , xml-lens, xss-sanitize + }: + mkDerivation { + pname = "microformats2-parser"; + version = "1.0.1.6"; + sha256 = "9937ae3658bf1bfbb34f03cc8f0fcd1c236f72cd52f5845cfbd19f02a3ed33f8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base base-compat blaze-markup bytestring + containers data-default either errors html-conduit lens-aeson + network-uri pcre-heavy safe tagsoup text time transformers + unordered-containers vector xml-lens xss-sanitize + ]; + executableHaskellDepends = [ + aeson aeson-pretty base base-compat blaze-html blaze-markup + data-default network network-uri options scotty streaming-commons + text wai-extra warp + ]; + testHaskellDepends = [ + aeson-qq base base-compat bytestring data-default hspec + hspec-expectations-pretty-diff html-conduit mtl network-uri + raw-strings-qq template-haskell text time xml-lens + ]; + homepage = "https://github.com/myfreeweb/microformats2-parser"; + description = "A Microformats 2 parser"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -116542,19 +112912,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens_0_4_5_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.5.0"; - sha256 = "93cbdb35aa3a653aaee6ec39f895a5c12a663adc120ecb4978b31b034fd69e19"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/aelve/microlens"; - description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116567,29 +112924,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-aeson_2_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, directory - , doctest, filepath, generic-deriving, microlens, scientific - , semigroups, simple-reflect, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.1.1"; - sha256 = "5b43bcdc52d4b86b8c74040f754209efa95f5983d5d114d2af6709949614acda"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/fosskers/microlens-aeson/"; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -116638,24 +112972,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-ghc_0_4_5_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.5.0"; - sha256 = "331c1851cfb398faf67e6956a64cf7dc06c85d95ccd4638e3d2ae5c59199212a"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-ghc" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers @@ -116672,23 +112988,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-mtl_0_1_9_0" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.9.0"; - sha256 = "cf6dfd8c069eed3361952e8db75a065ab94072c430ed2a43a7a7383344726ac8"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -116705,25 +113004,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-platform_0_3_3_0" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.3.3.0"; - sha256 = "174c87afcb0d3004e52b4283773aa16d2a6f0a3b819b362a36f75d7e72433ca8"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector @@ -116741,21 +113021,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_0_0" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.0.0"; - sha256 = "66972dfd673bce055e22487fde172471b50659125068438330d54732cfc2c1ce"; - libraryHaskellDepends = [ - base containers microlens template-haskell - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { @@ -116776,8 +113041,8 @@ self: { }: mkDerivation { pname = "micrologger"; - version = "0.3.1.0"; - sha256 = "d0371c5056b7f68bb2b1f1157c162b2d084fa8d6e316b005b1e75200edbd9d96"; + version = "0.3.1.1"; + sha256 = "6c523c9c967dffa3024f0160c78aa56b8d1cadc37d6065912bad0b98a59e01e7"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; @@ -116813,30 +113078,29 @@ self: { "mida" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, HCodecs, megaparsec, mtl - , optparse-applicative, path, path-io, process, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, HCodecs, hspec + , megaparsec, mtl, optparse-applicative, path, path-io, process + , QuickCheck, random, text, tf-random, transformers, yaml }: mkDerivation { pname = "mida"; - version = "1.0.1"; - sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859"; + version = "1.0.2"; + sha256 = "902ce590e9fb57138676eacc4bdcb4ed536f54df054f4c606a4c6c71b6f475f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline HCodecs megaparsec mtl random - text tf-random transformers + base containers exceptions haskeline HCodecs megaparsec mtl + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline HCodecs megaparsec mtl optparse-applicative path path-io - process random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline HCodecs megaparsec mtl optparse-applicative + path path-io process QuickCheck random text tf-random transformers + yaml ]; testHaskellDepends = [ - base containers HCodecs megaparsec mtl QuickCheck random - test-framework test-framework-quickcheck2 text tf-random - transformers + base containers HCodecs hspec megaparsec mtl QuickCheck random text + tf-random transformers ]; homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; @@ -117071,6 +113335,24 @@ self: { license = "LGPL"; }) {}; + "mikrokosmos" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit + , mtl, multimap, parsec + }: + mkDerivation { + pname = "mikrokosmos"; + version = "0.1.0"; + sha256 = "49547246b9a22a9d2037424d99017d09823a2f321a9d0f6cec3309b85c5880a4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base containers haskeline HUnit mtl multimap parsec + ]; + homepage = "https://github.com/M42/mikrokosmos"; + description = "Lambda calculus interpreter"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "miku" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , containers, filepath, http-types, mtl, wai, wai-extra @@ -117178,6 +113460,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-mail-ses_0_3_2_3" = callPackage + ({ mkDerivation, base, base64-bytestring, byteable, bytestring + , conduit, cryptohash, http-client, http-conduit, http-types + , mime-mail, old-locale, text, time, transformers, xml-conduit + , xml-types + }: + mkDerivation { + pname = "mime-mail-ses"; + version = "0.3.2.3"; + sha256 = "03f977386c2cdf122097a0327509e4151eb10e320d8cec1791d259aa067f4d4c"; + libraryHaskellDepends = [ + base base64-bytestring byteable bytestring conduit cryptohash + http-client http-conduit http-types mime-mail old-locale text time + transformers xml-conduit xml-types + ]; + homepage = "http://github.com/snoyberg/mime-mail"; + description = "Send mime-mail messages via Amazon SES"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl , network, old-time @@ -117512,21 +113815,15 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc-prim, primitive - , vector - }: + ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { pname = "mios"; - version = "1.3.0"; - sha256 = "975fa3ce06cdbd03956dbd238f344f71cd4021b8e4eacd615cf1898013eb157e"; + version = "1.4.0"; + sha256 = "3cc891fd9849f2853ce2f19325fac3eb7c6adb2b684aa4922c2ae66638ac3c2d"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; - executableHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; + libraryHaskellDepends = [ base bytestring ghc-prim vector ]; + executableHaskellDepends = [ base bytestring ghc-prim vector ]; homepage = "https://github.com/shnarazk/mios"; description = "A Minisat-based SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -118487,7 +114784,6 @@ self: { transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; - doCheck = false; homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; @@ -119291,30 +115587,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mongoDB_2_0_10" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, containers, cryptohash, hashtables - , hspec, lifted-base, monad-control, mtl, network, nonce - , old-locale, parsec, random, random-shuffle, text, time - , transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.0.10"; - sha256 = "8986956648874ce70c0bc4682d7856ea20c1477895405c532e6de34573f5b0df"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, containers, cryptohash @@ -119333,10 +115605,10 @@ self: { random-shuffle text tls transformers-base ]; testHaskellDepends = [ base hspec mtl old-locale text time ]; - doCheck = false; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -119432,20 +115704,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mono-traversable_0_10_2" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck - , semigroupoids, semigroups, split, text, transformers - , unordered-containers, vector, vector-algorithms, vector-instances + "mono-traversable" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , hspec, HUnit, QuickCheck, semigroups, split, text, transformers + , unordered-containers, vector, vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "0.10.2"; - sha256 = "379ee5a7f9fc2a5c4fb11522fe28654d130c044265643122c8b3163e8e0452b8"; + version = "1.0.0.1"; + sha256 = "001d1fba5e3da63c46784a621d1430937e9537b38c0a74876e489ff4d7d3828a"; + revision = "1"; + editedCabalFile = "1c3e3ffbdd7dc77b065afc67e2d6d581bc43a7818d96f5bace88caf6e28106aa"; libraryHaskellDepends = [ - base bytestring comonad containers dlist dlist-instances hashable - semigroupoids semigroups split text transformers - unordered-containers vector vector-algorithms vector-instances + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms ]; testHaskellDepends = [ base bytestring containers foldl hspec HUnit QuickCheck semigroups @@ -119454,20 +115726,17 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mono-traversable" = callPackage + "mono-traversable_1_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , hspec, HUnit, QuickCheck, semigroups, split, text, transformers , unordered-containers, vector, vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "1.0.0.1"; - sha256 = "001d1fba5e3da63c46784a621d1430937e9537b38c0a74876e489ff4d7d3828a"; - revision = "1"; - editedCabalFile = "1c3e3ffbdd7dc77b065afc67e2d6d581bc43a7818d96f5bace88caf6e28106aa"; + version = "1.0.1"; + sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -119479,6 +115748,7 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -119558,27 +115828,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoid-subclasses_0_4_2" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.2"; - sha256 = "38257132ebd3dca4d1d95252a928ca183171ae0ba3aefd133f3c564fa3bfee2b"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoid-subclasses" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector @@ -119610,23 +115859,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_1_2_5" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , unordered-containers - }: - mkDerivation { - pname = "monoidal-containers"; - version = "0.1.2.5"; - sha256 = "c82124b1e867a271bafeffb6fb8fb1febb1887154bf28225b174180babc9d438"; - libraryHaskellDepends = [ - base containers deepseq hashable lens newtype unordered-containers - ]; - homepage = "http://github.com/bgamari/monoidal-containers"; - description = "Containers with monoidal accumulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoidal-containers" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype , unordered-containers @@ -119884,35 +116116,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_6_1" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , Earley, http-client, http-client-tls, microlens, microlens-mtl - , mtl, optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.1"; - sha256 = "84874884eda53f75ba1b9ab8ed85151839c41de54e9ab999de429f00d319a703"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , Earley, http-client, http-client-tls, microlens, microlens-mtl @@ -120762,6 +116965,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multifile" = callPackage + ({ mkDerivation, base, HaXml }: + mkDerivation { + pname = "multifile"; + version = "0.1.0.0"; + sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base HaXml ]; + homepage = "xy30.com"; + description = "create many files from one"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multifocal" = callPackage ({ mkDerivation, array, base, containers, haskell-src-exts, HaXml , hxt, hxt-xpath, mtl, parsec, pointless-haskell, pointless-lenses @@ -121417,37 +117634,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mustache_1_0_2" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, mtl - , parsec, process, scientific, temporary, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "mustache"; - version = "1.0.2"; - sha256 = "77d43c251883fc5dd5afdd05ea3b6757f37b7c4aa76950418386b8e9098d0927"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-unicode-symbols bytestring containers directory - either filepath mtl parsec scientific text unordered-containers - vector - ]; - executableHaskellDepends = [ - aeson base base-unicode-symbols bytestring cmdargs filepath text - yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols directory filepath hspec process - temporary text unordered-containers yaml - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mustache" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens @@ -122562,6 +118748,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ndjson-conduit_0_1_0_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }: + mkDerivation { + pname = "ndjson-conduit"; + version = "0.1.0.5"; + sha256 = "c037b8f7c47b146f1384585541ae8a4f9218bc4456f428935f973ae07da49db1"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit + ]; + homepage = "https://github.com/srijs/haskell-ndjson-conduit"; + description = "Conduit-based parsing and serialization for newline delimited JSON"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "neat" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -122795,48 +118996,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nested-routes_7_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, composition-extra - , errors, exceptions, hashable, hspec, hspec-wai, http-types, mtl - , poly-arity, pred-trie, regex-compat, semigroups, text - , transformers, tries, unordered-containers - , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers - }: - mkDerivation { - pname = "nested-routes"; - version = "7.0.0"; - sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2"; - libraryHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable mtl poly-arity pred-trie regex-compat semigroups text - transformers tries unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hspec hspec-wai http-types mtl poly-arity pred-trie - regex-compat semigroups text transformers tries - unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - description = "Declarative, compositional Wai responses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "nested-routes" = callPackage ({ mkDerivation, attoparsec, base, bytestring, composition-extra , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat - , semigroups, text, transformers, tries, unordered-containers - , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers + , semigroups, tasty, tasty-hspec, text, transformers, tries + , unordered-containers, wai-middleware-content-type + , wai-middleware-verbs, wai-transformers }: mkDerivation { pname = "nested-routes"; - version = "7.2.1"; - sha256 = "f2a813bccfb40ea242c2787ee85ab02fed43a2a7d2644509066c66fc939472ed"; + version = "7.2.2"; + sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9"; libraryHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables mtl poly-arity pred-set pred-trie regex-compat @@ -122846,8 +119017,8 @@ self: { testHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity - pred-set pred-trie regex-compat semigroups text transformers tries - unordered-containers wai-middleware-content-type + pred-set pred-trie regex-compat semigroups tasty tasty-hspec text + transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; description = "Declarative, compositional Wai responses"; @@ -123111,7 +119282,6 @@ self: { QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; - doCheck = false; homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; @@ -123213,25 +119383,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "network_2_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, HUnit, test-framework - , test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.2.1"; - sha256 = "a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - ]; - doCheck = false; - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -123244,7 +119395,6 @@ self: { testHaskellDepends = [ base bytestring doctest HUnit test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; @@ -123286,10 +119436,10 @@ self: { attoparsec base bytestring exceptions hspec hspec-attoparsec hspec-expectations mtl network network-simple transformers uuid ]; - doCheck = false; homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-anonymous-tor" = callPackage @@ -124009,7 +120159,6 @@ self: { testHaskellDepends = [ base network network-transport network-transport-tests ]; - doCheck = false; homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; @@ -124274,7 +120423,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; jailbreak = true; - doCheck = false; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124309,6 +120457,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "next-ref" = callPackage + ({ mkDerivation, base, hspec, stm }: + mkDerivation { + pname = "next-ref"; + version = "0.1.0.1"; + sha256 = "2db4b4e501c17ccb4db473787ef2e305c940b101dcd30de1e95c0c5b9c41e709"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ base hspec ]; + jailbreak = true; + description = "A concurrency primitive for a slow consumer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nextstep-plist" = callPackage ({ mkDerivation, base, parsec, pretty, QuickCheck }: mkDerivation { @@ -125127,7 +121288,6 @@ self: { testHaskellDepends = [ base directory process transformers uniplate ]; - doCheck = false; homepage = "https://github.com/ndmitchell/nsis#readme"; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; @@ -125807,43 +121967,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "octane_0_4_24" = callPackage - ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary - , binary-bits, bytestring, containers, data-binary-ieee754, deepseq - , newtype-generics, tasty, tasty-hspec, text + "octane" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, binary-bits + , bytestring, containers, data-binary-ieee754, data-default-class + , deepseq, file-embed, http-client, http-client-tls + , overloaded-records, regex-compat, tasty, tasty-hspec + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "octane"; - version = "0.4.24"; - sha256 = "2c74c33a03f90c141da3ffc94c5434e24b6c7cf8c426927480ce0f278eb6802a"; + version = "0.16.1"; + sha256 = "8b42c80e4274d8e9677eec6a349a3c7d337b129fa4194d05a288ac91ad3406ec"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty autoexporter base binary binary-bits bytestring - containers data-binary-ieee754 deepseq newtype-generics text + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 data-default-class deepseq file-embed + overloaded-records regex-compat text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - base binary bytestring containers tasty tasty-hspec + base binary binary-bits bytestring containers tasty tasty-hspec + tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "octane" = callPackage + "octane_0_16_3" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, data-default-class , deepseq, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec, text - , unordered-containers, vector + , overloaded-records, regex-compat, tasty, tasty-hspec + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "octane"; - version = "0.15.0"; - sha256 = "f5e89b98315efa4a62e0a07595dfecda52604bade45216def1eb23adbfc8218c"; + version = "0.16.3"; + sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125854,10 +122018,14 @@ self: { executableHaskellDepends = [ aeson base binary bytestring http-client http-client-tls ]; - testHaskellDepends = [ base tasty tasty-hspec ]; + testHaskellDepends = [ + base binary binary-bits bytestring containers tasty tasty-hspec + tasty-quickcheck text + ]; homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -125933,7 +122101,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; + inherit (pkgs) mesa; ovr = null; systemd = null;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -126302,24 +122470,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "once_0_1_0_0" = callPackage - ({ mkDerivation, base, containers, hashable, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "once"; - version = "0.1.0.0"; - sha256 = "9a59a79946079ea2d00469f9c4a6a319ad96425f38f4b90093789109c268a7ab"; - libraryHaskellDepends = [ - base containers hashable template-haskell unordered-containers - ]; - jailbreak = true; - homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-once.git"; - description = "memoization for IO actions and functions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "once" = callPackage ({ mkDerivation, base, containers, hashable, template-haskell , unordered-containers @@ -126434,37 +122584,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "opaleye_0_4_2_0" = 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.4.2.0"; - sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20"; - revision = "7"; - editedCabalFile = "b3d11eb291ac042615847b8ce614cfa31d54055f7344e44a8f21b3556d92fa93"; - 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 = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time - ]; - jailbreak = true; - doCheck = false; - 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" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset @@ -126474,10 +122593,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.0.0"; - sha256 = "8fa68edc8e322f624c704526acbf2c813903bf73beab829849f515a7854415b5"; - revision = "2"; - editedCabalFile = "43d127c37fe4ff98db79dfb9c44cbc111aa77e6cbe9f449ef652e7a449b39b03"; + version = "0.5.1.1"; + sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -126485,10 +122602,9 @@ self: { uuid void ]; testHaskellDepends = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time ]; - doCheck = false; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -126590,6 +122706,7 @@ self: { jailbreak = true; description = "Open haddock HTML documentation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-pandoc" = callPackage @@ -127244,22 +123361,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "operational_0_2_3_2" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.2"; - sha256 = "ed02d521b86b6791104a489b6225baf92f8a1641e6fa8ac1022990ef239443aa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ random ]; - homepage = "http://haskell.org/haskellwiki/Operational"; - description = "Implementation of difficult monads made easy with operational semantics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -127489,7 +123590,6 @@ self: { testHaskellDepends = [ base chell chell-quickcheck containers monads-tf transformers ]; - doCheck = false; homepage = "https://john-millikin.com/software/haskell-options/"; description = "A powerful and easy-to-use command-line option parser"; license = stdenv.lib.licenses.mit; @@ -128381,6 +124481,32 @@ self: { license = "unknown"; }) {}; + "pagerduty_0_0_8" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , bytestring-conversion, conduit, data-default-class, exceptions + , generics-sop, http-client, http-types, lens, lens-aeson, mmorph + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pagerduty"; + version = "0.0.8"; + sha256 = "2f8f9ef70a672dd9160beb1e87d9b88d8cbd6f137637f4aed98df756ea270463"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring bytestring-conversion conduit + data-default-class exceptions generics-sop http-client http-types + lens lens-aeson mmorph monad-control mtl template-haskell text time + time-locale-compat transformers transformers-base + transformers-compat unordered-containers + ]; + jailbreak = true; + homepage = "http://github.com/brendanhay/pagerduty"; + description = "Client library for PagerDuty Integration and REST APIs"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagination" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: mkDerivation { @@ -128410,19 +124536,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "palette_0_1_0_3" = callPackage - ({ mkDerivation, array, base, colour, containers }: - mkDerivation { - pname = "palette"; - version = "0.1.0.3"; - sha256 = "f75a713245af54d86cd34ce79f2b6d2d8c35aa7d56c28c07e33465227cdedea1"; - libraryHaskellDepends = [ array base colour containers ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Utilities for choosing and creating color schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -128580,40 +124693,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc-citeproc_0_9_1_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.9.1.1"; - sha256 = "15c89a9aa6bce4efd6b728ea16151eb6390cad0495eb82c50cbac490591c8f86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl @@ -128674,6 +124753,8 @@ self: { pname = "pandoc-crossref"; version = "0.2.3.0"; sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e"; + revision = "1"; + editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128804,23 +124885,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types_1_16_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, syb - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.16.1"; - sha256 = "846054157d7072ca3f7260b988a6752536b42bbd32c051400e55f46229b8179e"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim syb - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb @@ -128851,25 +124915,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pango_0_13_1_1" = callPackage - ({ mkDerivation, array, base, cairo, containers, directory, glib - , gtk2hs-buildtools, mtl, pango, pretty, process, text - }: - mkDerivation { - pname = "pango"; - version = "0.13.1.1"; - sha256 = "3c22f339fe2e30cb6d6cbc5906e1064c5fdabfbc56d2a2c015ac70b4aa5165ad"; - libraryHaskellDepends = [ - array base cairo containers directory glib mtl pretty process text - ]; - libraryPkgconfigDepends = [ pango ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; - "pango" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process @@ -128887,17 +124932,19 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-lens - , papa-prelude, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, papa-base + , papa-include, papa-prelude, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.0.1"; - sha256 = "066d3e396e227d3775ab4d636e8c71c67ad2b883053ae593a1f4f7eb128491b3"; - libraryHaskellDepends = [ base papa-lens papa-prelude ]; + version = "0.1.0"; + sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730"; + libraryHaskellDepends = [ + base papa-base papa-include papa-prelude + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -128907,6 +124954,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "papa-base" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base"; + version = "0.1.0"; + sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-include" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, semigroupoids, semigroups, template-haskell + }: + mkDerivation { + pname = "papa-include"; + version = "0.1.0"; + sha256 = "d39ff3c7bdfe065878f53f1722c9852db6bc1d8a0ea3c6152f759e1fa65a14ff"; + libraryHaskellDepends = [ base lens semigroupoids semigroups ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-include"; + description = "Third party libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-lens" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, template-haskell @@ -128925,22 +125006,17 @@ self: { }) {}; "papa-prelude" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-prelude-core, papa-prelude-lens, papa-prelude-semigroupoids - , papa-prelude-semigroups, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell }: mkDerivation { pname = "papa-prelude"; - version = "0.0.1"; - sha256 = "6336946e1164a30f1bb0b21e5b7f316a06488b2b329db7ef9ebb892168b2fc99"; - libraryHaskellDepends = [ - base papa-prelude-core papa-prelude-lens papa-prelude-semigroupoids - papa-prelude-semigroups - ]; + version = "0.1.1"; + sha256 = "5af67b6e0a8e49b36dd1bfdf7a9daeec1459ab4a6688f04fb87c4fd54e8f5ef1"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; @@ -129374,7 +125450,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -129650,7 +125725,6 @@ self: { attoparsec base bytestring containers directory doctest filepath parsec QuickCheck quickcheck-instances ]; - doCheck = false; homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; @@ -129769,6 +125843,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "partial-order" = callPackage + ({ mkDerivation, base, containers, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "partial-order"; + version = "0.1.2"; + sha256 = "9a343b7206ddd717d9a1bb5562052fb503a33ebef8434d8f7f5e1eea04cef5d1"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/mtesseract/haskell-partial-order"; + description = "Provides typeclass suitable for types admitting a partial order"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "partial-uri" = callPackage ({ mkDerivation, base, network-uri }: mkDerivation { @@ -129929,29 +126021,11 @@ self: { base criterion doctest hspec QuickCheck vector ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/patches-vector"; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; }) {}; - "path_0_5_8" = callPackage - ({ mkDerivation, aeson, base, deepseq, exceptions, filepath, hspec - , HUnit, mtl, template-haskell - }: - mkDerivation { - pname = "path"; - version = "0.5.8"; - sha256 = "aa85f40a40ce8c96de260481501b1884c0d86c37ad58505bda011b803fdcefd8"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath template-haskell - ]; - testHaskellDepends = [ aeson base hspec HUnit mtl ]; - description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, hspec, HUnit, mtl, template-haskell @@ -129979,24 +126053,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_1_0" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath, hspec, path - , temporary, time, transformers - }: - mkDerivation { - pname = "path-io"; - version = "1.1.0"; - sha256 = "b94af45683e0c39d259fac8cad906957b97991a3cdac45e067fd1dc9baebe59f"; - libraryHaskellDepends = [ - base directory exceptions filepath path temporary time transformers - ]; - testHaskellDepends = [ base exceptions hspec path ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "path-io" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat @@ -131097,6 +127153,7 @@ self: { ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-cereal" = callPackage @@ -131209,27 +127266,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-mongoDB_2_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal - , conduit, containers, http-api-data, monad-control, mongoDB - , network, path-pieces, persistent, resource-pool, resourcet, text - , time, transformers - }: - mkDerivation { - pname = "persistent-mongoDB"; - version = "2.1.4"; - sha256 = "06b9d86c6f6b68025a86bd9cc62595bda303007f4da721764241d160f23766a2"; - libraryHaskellDepends = [ - aeson attoparsec base bson bytestring cereal conduit containers - http-api-data monad-control mongoDB network path-pieces persistent - resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using mongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal , conduit, containers, http-api-data, monad-control, mongoDB @@ -131248,25 +127284,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql_2_3_0_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.3.0.2"; - sha256 = "7e1c21ee07df97172528c83709a4435040e477e46e1d558f3dd5bcda84c4f033"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent resourcet - text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131323,28 +127340,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistent-postgresql_2_2_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resourcet, text, time - , transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.2.2"; - sha256 = "7ec31242349f8ea7da149991fbe3366a6a83f3e3915392c997b3c34fc27671cd"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "persistent-postgresql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent @@ -131419,7 +127414,6 @@ self: { monad-control mtl path-pieces persistent persistent-template scientific template-haskell text time transformers utf8-string ]; - doCheck = false; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ psibi ]; @@ -131762,23 +127756,22 @@ self: { }) {}; "pg-store" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec - , postgresql-libpq, QuickCheck, template-haskell, text - , transformers + ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl + , postgresql-libpq, QuickCheck, template-haskell, text, time }: mkDerivation { pname = "pg-store"; - version = "0.0.1"; - sha256 = "27032e33207c53c65452bfc3ea3d90620069850297e3edb5aa3e9274e6130c7f"; + version = "0.1.1"; + sha256 = "5f8d688811e4e59accce33f43fe2168adb9a4809b794d6e27db028af605298af"; libraryHaskellDepends = [ - attoparsec base bytestring postgresql-libpq template-haskell text - transformers + attoparsec base bytestring mtl postgresql-libpq template-haskell + text time ]; testHaskellDepends = [ - base bytestring hspec postgresql-libpq QuickCheck text + base bytestring hspec mtl postgresql-libpq QuickCheck text ]; homepage = "https://github.com/vapourismo/pg-store"; - description = "Dead simple storage interface to PostgreSQL"; + description = "Simple storage interface to PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131806,6 +127799,7 @@ self: { jailbreak = true; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -131980,8 +127974,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.8.0"; - sha256 = "da086d093e31f1277d7a3f5876d57122f9f5517747399a3f001986e3f05854e8"; + version = "0.0.9.0"; + sha256 = "6161c3b669536f6701aa1e5a03745ab5d2aaf06ce45e463282a027a177f7cde7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132372,29 +128366,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pinch_0_2_0_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pinch"; - version = "0.2.0.2"; - sha256 = "be722c513c696845e2a04758639b661b065cd821d4e5f608fc1ec74fe18a0e0f"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck text - unordered-containers vector - ]; - homepage = "https://github.com/abhinav/pinch#readme"; - description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -132417,24 +128388,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pinchot_0_18_2_0" = callPackage - ({ mkDerivation, base, containers, Earley, lens, ListLike - , semigroups, template-haskell, transformers - }: - mkDerivation { - pname = "pinchot"; - version = "0.18.2.0"; - sha256 = "a32dfa0aff4761bca3c9d99755814a3acc2962197dff5b07b565c77e90bb4ed6"; - libraryHaskellDepends = [ - base containers Earley lens ListLike semigroups template-haskell - transformers - ]; - homepage = "http://www.github.com/massysett/pinchot"; - description = "Write grammars, not parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinchot" = callPackage ({ mkDerivation, base, containers, Earley, lens, ListLike , non-empty-sequence, pretty-show, semigroups, template-haskell @@ -132535,6 +128488,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-aeson_0_4_1_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-aeson"; + version = "0.4.1.7"; + sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring pipes pipes-attoparsec + pipes-bytestring pipes-parse transformers + ]; + homepage = "https://github.com/k0001/pipes-aeson"; + description = "Encode and decode JSON streams using Aeson and Pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-async" = callPackage ({ mkDerivation, base, hspec, lifted-async, lifted-base , monad-control, pipes, pipes-safe, stm, transformers-base @@ -132674,20 +128645,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; - "pipes-cacophony_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.2.1"; - sha256 = "c112376b75e744e15006b81ecd9b60bee10be6a54cca6c2fd6b7f5f7e8d99041"; - libraryHaskellDepends = [ base bytestring cacophony pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cacophony" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: mkDerivation { @@ -132762,23 +128719,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-cliff_0_10_0_4" = callPackage - ({ mkDerivation, async, base, bytestring, pipes, pipes-safe - , process, stm - }: - mkDerivation { - pname = "pipes-cliff"; - version = "0.10.0.4"; - sha256 = "3d92b54e773e98996cbc1c753892e7400540d925f913d187b940e7425dfdef33"; - libraryHaskellDepends = [ - async base bytestring pipes pipes-safe process stm - ]; - homepage = "http://www.github.com/massysett/pipes-cliff"; - description = "Streaming to and from subprocesses using Pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cliff" = callPackage ({ mkDerivation, async, base, bytestring, pipes, pipes-safe , process, stm, unix @@ -132989,22 +128929,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-http_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, http-client, http-client-tls - , pipes - }: - mkDerivation { - pname = "pipes-http"; - version = "1.0.3"; - sha256 = "a8a2f0babb5348e6cb6bde375e7af47ebe808d4e333e0dd5c7e0ace3c600d58a"; - libraryHaskellDepends = [ - base bytestring http-client http-client-tls pipes - ]; - description = "HTTP client with pipes interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -133115,7 +129039,6 @@ self: { sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340"; libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; - doCheck = false; homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; @@ -134117,27 +130040,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pointed_4_2_0_2" = callPackage - ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pointed"; - version = "4.2.0.2"; - sha256 = "4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a"; - libraryHaskellDepends = [ - base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/pointed/"; - description = "Pointed and copointed data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged @@ -134848,7 +130750,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; - inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; + inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -134958,14 +130860,13 @@ self: { }: mkDerivation { pname = "posix-acl"; - version = "0.2.0.0"; - sha256 = "3b1f8858ae8acb6d3c50a3900406b0b7b018709447c4c17aee8d2f83f12a38e2"; + version = "0.2.0.1"; + sha256 = "e3e56ee3a8cc9e84c255a17593289b86c685b167d98fee0281481509454671d2"; libraryHaskellDepends = [ base bytestring containers lifted-base monad-control transformers transformers-base unix ]; librarySystemDepends = [ acl ]; - jailbreak = true; homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; @@ -135123,37 +131024,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-binary_0_9_0_1" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, conversion, conversion-bytestring, conversion-text - , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rebase, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time - , transformers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.9.0.1"; - sha256 = "77f4dcf7b09961b5db11d3db753e27a5116d27d3e88661a58e6e742de94b5cf7"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring foldl loch-th - placeholders scientific text time transformers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring conversion conversion-bytestring - conversion-text either json-ast loch-th placeholders - postgresql-libpq QuickCheck quickcheck-instances rebase scientific - tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time - transformers uuid vector - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/postgresql-binary"; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text @@ -135178,7 +131048,6 @@ self: { transformers uuid vector ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -135254,20 +131123,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-libpq_0_9_1_1" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: - mkDerivation { - pname = "postgresql-libpq"; - version = "0.9.1.1"; - sha256 = "e483aed7fe8628cee17342a1bd0a315d998488609ad08a833c01785a88785871"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ postgresql ]; - homepage = "http://github.com/lpsmith/postgresql-libpq"; - description = "low-level binding to libpq"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - "postgresql-libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { @@ -135334,10 +131189,10 @@ self: { quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; - doCheck = false; homepage = "https://bitbucket.org/s9gf4ult/postgresql-query"; description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-schema" = callPackage @@ -135382,7 +131237,6 @@ self: { aeson base base16-bytestring bytestring containers cryptohash filepath HUnit tasty tasty-golden tasty-hunit text time vector ]; - doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136358,6 +132212,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types_0_2_3_1" = callPackage + ({ mkDerivation, base, hspec, mtl, tagged }: + mkDerivation { + pname = "pretty-types"; + version = "0.2.3.1"; + sha256 = "e56c49d1099aaeafe0b982ef9e60cb7194fd987c4b659a8d7bcde380d3b8784f"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; + homepage = "https://github.com/sheyll/pretty-types#readme"; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -136553,10 +132421,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "printf-safe"; - version = "0.1.0.0"; - sha256 = "492389dad3146efa2ab91fb2518c47c5dc6f94c993098e8e346cc5a77e3b5ed3"; + version = "0.1.0.1"; + sha256 = "54c6aadd6b084064cd2dfdddd80eec7fc03ccf0cb91ec544c82641836eff6a9d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Type safe interface for Text.Printf"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136640,12 +132507,11 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5"; - sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0"; + version = "0.2.5.1"; + sha256 = "d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; @@ -136731,23 +132597,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "process-extras_0_3_3_8" = callPackage - ({ mkDerivation, base, bytestring, deepseq, generic-deriving - , ListLike, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.3.3.8"; - sha256 = "d9e26f829d5eab2e2df113383b814bf71c835ff874fdecdc5a125115da485ec3"; - libraryHaskellDepends = [ - base bytestring deepseq generic-deriving ListLike process text - ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "process-extras" = callPackage ({ mkDerivation, base, bytestring, deepseq, generic-deriving , ListLike, process, text @@ -137110,6 +132959,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "progress-reporting" = callPackage + ({ mkDerivation, base, deepseq, mtl, time }: + mkDerivation { + pname = "progress-reporting"; + version = "1.0.0"; + sha256 = "8dddfbd5007871c47e53d01ad3366605679107504f23de568ccde0ed73a633f8"; + libraryHaskellDepends = [ base deepseq mtl time ]; + description = "Functionality for reporting function progress"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "progressbar" = callPackage ({ mkDerivation, base, io-reactive }: mkDerivation { @@ -137415,8 +133275,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.1.2"; - sha256 = "a6baace79c8dd9782985836304494bf3cc4159ae6df398c9ee9d613a418a8e47"; + version = "3.2.0"; + sha256 = "6fac41cf8b4cb5a6eab97afe583f27810f6bce89b78ab0985bb11114725cd9e9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137699,27 +133559,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "protocol-buffers_2_2_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.2.0"; - sha256 = "069a9ded2e9f7840ec51aef66eaabcdb428ceed8eee2b913590d5ee245506967"; - revision = "1"; - editedCabalFile = "23ebda7ea74075546a5ab75c567f97efe8ef0b6c0d7d994196e7286351659ee4"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -137737,22 +133576,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers-descriptor_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.2.0"; - sha256 = "62b6d996c8ee7e11fad73744b3267c92b60ec4ddb59f4c37a53b97ce9836c09a"; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -137802,24 +133625,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protolude_0_1_6" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , ghc-prim, mtl, safe, stm, text, transformers - }: - mkDerivation { - pname = "protolude"; - version = "0.1.6"; - sha256 = "daddf3511ec1a971f53aecc4b198c008e89ab035736dbb453440d1d2b0733cbd"; - libraryHaskellDepends = [ - async base bytestring containers deepseq ghc-prim mtl safe stm text - transformers - ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A sensible set of defaults for writing custom Preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protolude" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , ghc-prim, mtl, safe, stm, text, transformers @@ -137996,6 +133801,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psi" = callPackage + ({ mkDerivation, base, bytestring, deepseq, semigroups, text }: + mkDerivation { + pname = "psi"; + version = "0.1.0.0"; + sha256 = "c8f6a8bf9359362817ae4f1f3464cb20bd70429eb2366039fba71b7828e30831"; + libraryHaskellDepends = [ + base bytestring deepseq semigroups text + ]; + description = "Yet another custom Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "psql-helpers" = callPackage ({ mkDerivation, base, postgresql-simple }: mkDerivation { @@ -138008,25 +133826,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "psqueues_0_2_2_1" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.2.1"; - sha256 = "1428771180a34c2258bc9ca0f0c12f1df530be018e870c91348975cc7d33ae9b"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "psqueues" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -138082,21 +133881,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "publicsuffix_0_20160522" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20160522"; - sha256 = "1ae1ae02b3c317d421de31490cbd4b83a306f6be53103a5b1438aa170703f529"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - jailbreak = true; - homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "publicsuffix" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { @@ -138532,52 +134316,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "purescript_0_8_5_0" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base - , base-compat, bower-json, boxes, bytestring, containers, directory - , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript - , lifted-base, monad-control, monad-logger, mtl, network - , optparse-applicative, parallel, parsec, pattern-arrows, pipes - , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap - , spdx, split, stm, syb, text, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "purescript"; - version = "0.8.5.0"; - sha256 = "75a253d113b33e79abceff9d280988c1a4cb46eb84547a82eda1ec4bdad60d04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory dlist edit-distance filepath - fsnotify Glob http-types language-javascript lifted-base - monad-control monad-logger mtl parallel parsec pattern-arrows pipes - pipes-http process regex-tdfa safe semigroups sourcemap spdx split - stm syb text time transformers transformers-base - transformers-compat unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base base-compat boxes bytestring containers - directory filepath Glob haskeline monad-logger mtl network - optparse-applicative parsec process split stm text time - transformers transformers-compat utf8-string - ]; - testHaskellDepends = [ - aeson aeson-better-errors base base-compat boxes bytestring - containers directory filepath Glob haskeline hspec hspec-discover - HUnit mtl optparse-applicative parsec process 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring @@ -138620,7 +134358,6 @@ 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; @@ -138644,6 +134381,7 @@ self: { ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -138765,38 +134503,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_0_3_0_2" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , containers, cryptohash, hashable, hspec, http-client, http-types - , mtl, QuickCheck, snap-core, snap-server, text, time, transformers - , unordered-containers, yaml - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "0.3.0.2"; - sha256 = "72ce2a76a802d6c866ea0630fde7711b0298929113609998e0ec1dd733fb8098"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptohash hashable - http-client http-types mtl QuickCheck text time transformers - unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring containers mtl snap-core snap-server text - transformers unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types mtl QuickCheck - text transformers unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pusher-http-haskell" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptohash, hashable, hspec, http-client, http-types, QuickCheck @@ -138804,8 +134510,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.1.0.0"; - sha256 = "2938607770675541738af018e086b365e34fab98f389110ec34abb4fef79ca69"; + version = "1.1.0.2"; + sha256 = "bbd8ad5f868b9a5f94ee193bdb07c3c1eae8faca55fe876594e04d8746703689"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types QuickCheck text time transformers @@ -138815,10 +134521,10 @@ self: { aeson base bytestring hspec http-client http-types QuickCheck text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -139380,8 +135086,8 @@ self: { }: mkDerivation { pname = "quantum-random"; - version = "0.6.1"; - sha256 = "ebaeac863914541fd39d82073ce2223fe4583faa046bafb8632162d3b8790d2f"; + version = "0.6.3"; + sha256 = "ef14cb9adf4e05ed71d1707ebb773dc8be9ffd1bd8a54016f1c1f9b5c0def714"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140922,26 +136628,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ratel_0_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-client-tls, http-types, tasty - , tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "0.1.3"; - sha256 = "49fee52e108c70551438f75f997b8c0a3053ee15476422c77509918bfb3ca9b3"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-client, http-client-tls, http-types, tasty @@ -140961,24 +136647,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel-wai_0_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "0.1.2"; - sha256 = "f8aad4c4f57e58bda51edc56521e095e03810c825ef2333069e9151f51e1468e"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - jailbreak = true; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -141115,6 +136783,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "raz" = callPackage + ({ mkDerivation, base, deepseq, MonadRandom }: + mkDerivation { + pname = "raz"; + version = "0.1.0.0"; + sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215"; + libraryHaskellDepends = [ base deepseq MonadRandom ]; + testHaskellDepends = [ base MonadRandom ]; + homepage = "https://github.com/Lysxia/raz.haskell"; + description = "Random Access Zippers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "razom-text-util" = callPackage ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin, text , text-position @@ -141206,20 +136888,19 @@ self: { "rdf4h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, fgl, hashable, hgal, HTTP, HUnit, hxt, network - , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, text-binary, unordered-containers - , utf8-string + , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri + , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck + , text, text-binary, unordered-containers, utf8-string }: mkDerivation { pname = "rdf4h"; - version = "2.0.0"; - sha256 = "2c6eb2a15590931e0646731c688b010d75186a2d1ce38eabb27fdbc19647a23a"; + version = "3.0.0"; + sha256 = "aa50b95e37655e3abdfb4f83679096bd6c188750a8cb3a61132e2e8399e928db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory fgl hashable - hgal HTTP hxt network network-uri parsec text text-binary + base binary bytestring containers deepseq directory hashable hgal + HTTP hxt network network-uri parsec text text-binary unordered-containers utf8-string ]; executableHaskellDepends = [ @@ -141654,20 +137335,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "read-env-var_0_1_0_0" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "read-env-var"; - version = "0.1.0.0"; - sha256 = "fb70be65ea0889032ac0cef9890370a7c4229602744c1cb67482cfd0dc6b4e5d"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/read-env-var#readme"; - description = "Functions for safely reading environment variables"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "read-env-var" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -141967,13 +137634,16 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, comonad, free, transformers }: + ({ mkDerivation, base, bifunctors, comonad, free, transformers + , transformers-compat + }: mkDerivation { pname = "recursion-schemes"; - version = "4.1.2"; - sha256 = "36fd1357a577e23640c2948a1b00afd38e4527e4972551042bf6b88781c8c4fc"; - libraryHaskellDepends = [ base comonad free transformers ]; - jailbreak = true; + version = "5"; + sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc"; + libraryHaskellDepends = [ + base bifunctors comonad free transformers transformers-compat + ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; @@ -142091,7 +137761,6 @@ self: { async base bytestring bytestring-conversion containers redis-resp tasty tasty-hunit tinylog transformers ]; - doCheck = false; homepage = "https://gitlab.com/twittner/redis-io/"; description = "Yet another redis client"; license = stdenv.lib.licenses.mpl20; @@ -142424,8 +138093,8 @@ self: { pname = "reflex"; version = "0.4.0"; sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; - revision = "1"; - editedCabalFile = "5d0a189f2906a9172bee253fa9763c490f92f7ab4b71461401260321bb103b56"; + revision = "2"; + editedCabalFile = "e88ff0200373c04d57ff4b3232ada2a6965f61a23d99a8ef6bcbf96603c9d992"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -142435,7 +138104,7 @@ self: { base containers dependent-map MemoTrie mtl ref-tf ]; jailbreak = true; - homepage = "https://github.com/ryantrinkle/reflex"; + homepage = "https://github.com/reflex-frp/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142470,8 +138139,8 @@ self: { pname = "reflex-dom"; version = "0.3"; sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; - revision = "1"; - editedCabalFile = "908cf399bc1af34e18674cad421c0046b667ee8172254fce6e59dae83ce96a6a"; + revision = "2"; + editedCabalFile = "b569e2b08dac72a37173f680be5eaeb9ad57900c08301bf7b958f1cf52ac6055"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -143486,30 +139155,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_8_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.8.3.0"; - sha256 = "8935e9b1f9dfbc7f7c34737db669ebfcbe352beac00ddc45a8b67420f93001ee"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-query" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words @@ -143553,24 +139198,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-record_0_1_5_0" = callPackage - ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.5.0"; - sha256 = "dab27172c9307773eaf27c49c969670828998aa469279572e1873aeadaff7a6e"; - libraryHaskellDepends = [ - base persistable-types-HDBC-pg relational-query - relational-query-HDBC - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-record" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC @@ -143693,7 +139320,6 @@ self: { sha256 = "f996de29c0e7a47484a16113129166f7df12567d3ca3ea24c5c97e98a8225c51"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; - doCheck = false; description = "A simple api for matchers"; license = stdenv.lib.licenses.mit; }) {}; @@ -144420,28 +140046,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "reroute_0_3_1_0" = callPackage - ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect - , mtl, path-pieces, regex-compat, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "reroute"; - version = "0.3.1.0"; - sha256 = "5e31044f054305e119f80aa2625ecd4b7453e383d67dc44b8fdd9d64fa476fe9"; - libraryHaskellDepends = [ - base deepseq graph-core hashable hvect mtl path-pieces regex-compat - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hvect mtl text unordered-containers vector - ]; - homepage = "http://github.com/agrafix/reroute"; - description = "abstract implementation of typed and untyped web routing"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "reroute" = callPackage ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl , path-pieces, text, unordered-containers, vector @@ -144625,26 +140229,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet_1_1_7_4" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.7.4"; - sha256 = "a757d3a4d17373dc48a7072c2d98574934a53eb0ac98a32642952beb751e8f85"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "resourcet" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base @@ -144980,8 +140564,8 @@ self: { }: mkDerivation { pname = "result"; - version = "0.2.4.0"; - sha256 = "043012086322e95b7b8a1f44e1603363b017a3348aa03115237b50e2baf2dec2"; + version = "0.2.5.0"; + sha256 = "92a488febc3d847a84a7d500613a0fa58450530c6c6ca64a94784023a4412c2d"; libraryHaskellDepends = [ base bifunctors keys mtl semigroups transformers ]; @@ -144991,6 +140575,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "result_0_2_5_1" = callPackage + ({ mkDerivation, base, bifunctors, keys, mtl, transformers }: + mkDerivation { + pname = "result"; + version = "0.2.5.1"; + sha256 = "090a6c4e797ff408df1fcbd55877f1e94749beb3b65dc4260e75ef9c3a576b18"; + libraryHaskellDepends = [ base bifunctors keys mtl transformers ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/srijs/haskell-result"; + description = "Encode success or at least one error"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resumable-exceptions" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -145019,41 +140617,11 @@ self: { utf8-string vector ]; testHaskellDepends = [ base doctest ]; - doCheck = false; homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; }) {}; - "rethinkdb-client-driver_0_0_22" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , hashable, hspec, hspec-smallcheck, mtl, network, old-locale - , scientific, smallcheck, stm, template-haskell, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "rethinkdb-client-driver"; - version = "0.0.22"; - sha256 = "4a192e989e1f1b60398123ad2c74701203b66a33a220f1b5c47ad495e98575bb"; - revision = "1"; - editedCabalFile = "cd3c49b103352e43c82641e8d61f7ea048e3b5e2308274024d421739b1180a46"; - libraryHaskellDepends = [ - aeson base binary bytestring containers hashable mtl network - old-locale scientific stm template-haskell text time - unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hspec-smallcheck smallcheck text time - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; - description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale @@ -145075,10 +140643,10 @@ self: { base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-model" = callPackage @@ -145134,7 +140702,6 @@ self: { base data-default-class exceptions ghc-prim hspec HUnit mtl QuickCheck random stm time transformers ]; - doCheck = false; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -145343,39 +140910,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "riak_1_0_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder - , bytestring, containers, data-default-class, deepseq - , enclosed-exceptions, exceptions, hashable, HUnit - , mersenne-random-pure64, monad-control, mtl, network - , protocol-buffers, pureMD5, QuickCheck, random, random-shuffle - , resource-pool, riak-protobuf, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "riak"; - version = "1.0.1.1"; - sha256 = "d35e67fdcb397eedd3cddeae13dcbfa397b3ce36e7e76bb0c49d5a74f8bfc13f"; - libraryHaskellDepends = [ - aeson attoparsec base binary blaze-builder bytestring containers - data-default-class deepseq enclosed-exceptions exceptions hashable - mersenne-random-pure64 monad-control network protocol-buffers - pureMD5 random random-shuffle resource-pool riak-protobuf - semigroups text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers data-default-class HUnit mtl QuickCheck - semigroups tasty tasty-hunit tasty-quickcheck text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "A Haskell client for the Riak decentralized data store"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "riak" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder , bytestring, containers, data-default-class, deepseq @@ -145407,24 +140941,6 @@ self: { license = "unknown"; }) {}; - "riak-protobuf_0_21_0_0" = callPackage - ({ mkDerivation, array, base, parsec, protocol-buffers - , protocol-buffers-descriptor - }: - mkDerivation { - pname = "riak-protobuf"; - version = "0.21.0.0"; - sha256 = "cfa49952f54a80ebb4fdc9cc35190b8226b01b0a21b50c9da309548fa367e39a"; - libraryHaskellDepends = [ - array base parsec protocol-buffers protocol-buffers-descriptor - ]; - jailbreak = true; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "Haskell types for the Riak protocol buffer API"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "riak-protobuf" = callPackage ({ mkDerivation, array, base, parsec, protocol-buffers , protocol-buffers-descriptor @@ -145992,6 +141508,7 @@ self: { homepage = "https://github.com/docmunch/rollbar-haskell"; description = "error tracking through rollbar.com"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roller" = callPackage @@ -146193,6 +141710,63 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rosmsg" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , data-default-class, lens-family-core, pureMD5, template-haskell + , text + }: + mkDerivation { + pname = "rosmsg"; + version = "0.5.1.0"; + sha256 = "982a2cfb16d2882c1914ed1c3f03696423e72adb9adba8c530ecfbe8affe9ef7"; + libraryHaskellDepends = [ + attoparsec base binary bytestring data-default-class + lens-family-core pureMD5 template-haskell text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg#readme"; + description = "ROS message parser, render, TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rosmsg-bin" = callPackage + ({ mkDerivation, base, filepath, monad-logger, rosmsg, rospkg + , stack, temporary, text + }: + mkDerivation { + pname = "rosmsg-bin"; + version = "0.1.0.0"; + sha256 = "74552be16ec2c8b261b09e494fe08cc4b212c6514015b4e56b573c91f4a12524"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath monad-logger rosmsg rospkg stack temporary text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme"; + description = "ROS message management tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rospkg" = callPackage + ({ mkDerivation, async, base, bytestring, directory, fast-tagsoup + , filepath, split, tagsoup, text + }: + mkDerivation { + pname = "rospkg"; + version = "0.2.3.0"; + sha256 = "237ffd07b77f4a832e1e0a553de19ba372ca0adee80bfca099564152f39d8d8a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring directory fast-tagsoup filepath split tagsoup + text + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RoboticsHS/rospkg#readme"; + description = "ROS package system information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosso" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -147141,7 +142715,6 @@ self: { quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; - doCheck = false; homepage = "http://acid-state.seize.it/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; @@ -147529,25 +143102,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sandi_0_3_6" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit - , tasty, tasty-hunit, tasty-quickcheck, tasty-th - }: - mkDerivation { - pname = "sandi"; - version = "0.3.6"; - sha256 = "fafcb3501b8a17238de44239ef62c3051f9a33010424ef91dd76057257bf2284"; - libraryHaskellDepends = [ base bytestring conduit exceptions ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th - ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/sandi"; - description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sandi" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th @@ -147849,34 +143403,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sbv_5_11" = callPackage - ({ mkDerivation, array, async, base, base-compat, containers - , crackNum, data-binary-ieee754, deepseq, directory, filepath - , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb - }: - mkDerivation { - pname = "sbv"; - version = "5.11"; - sha256 = "9ede93f41cdbdfb73638f25eec9c201190d049163ad503202ebefa2d18cfc90d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat containers crackNum - data-binary-ieee754 deepseq directory filepath mtl old-time pretty - process QuickCheck random syb - ]; - executableHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit process syb - ]; - testHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit syb - ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sbv" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc @@ -148992,24 +144518,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "sdl2_2_1_2_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.1.2.1"; - sha256 = "a30a40495313cc40efd88d72f89e17c18354090fa1764e8217b8ee4d9884d439"; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.2)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2;}; - "sdl2" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector @@ -149140,6 +144648,7 @@ self: { description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seacat" = callPackage @@ -149559,30 +145068,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semigroupoids_5_0_1" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , containers, contravariant, directory, distributive, doctest - , filepath, semigroups, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.0.1"; - sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616"; - revision = "1"; - editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive semigroups tagged transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , containers, contravariant, directory, distributive, doctest @@ -149625,21 +145110,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "semigroups_0_18_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; - version = "0.18.1"; - sha256 = "ae7607fb2b497a53192c378dc84c00b45610fdc5de0ac8c1ac3234ec7acee807"; - revision = "1"; - editedCabalFile = "7dd2b3dcc9517705391c1c6a0b51eba1da605b554f9817255c4a1a1df4d4ae3d"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroups" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -150136,7 +145606,6 @@ self: { sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; - doCheck = false; homepage = "https://github.com/jputcu/serialport"; description = "Cross platform serial port library"; license = stdenv.lib.licenses.bsd3; @@ -150212,32 +145681,6 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.7.1"; - sha256 = "e4e847df340f76172f719d7570cbf2cc59e4045aa994bb764f0ca5fd11c6126c"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring bytestring-conversion - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri string-conversions text vault - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring directory doctest filemanip - filepath hspec QuickCheck quickcheck-instances string-conversions - text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_8_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , bytestring-conversion, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , string-conversions, text, url, vault - }: - mkDerivation { - pname = "servant"; version = "0.8.1"; sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1"; libraryHaskellDepends = [ @@ -150253,7 +145696,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -150337,6 +145779,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_3_2" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html + , blaze-markup, bytestring, cereal, cookie, cryptonite + , data-default, deepseq, exceptions, hspec, http-media, http-types + , memory, mtl, QuickCheck, servant, servant-blaze, servant-server + , text, time, transformers, wai, warp + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.3.2"; + sha256 = "c77ba7d3fb289c792aa99f6691c7d2b53f3e5dd4a2bc9ea9ebae41a3addf8080"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-types memory mtl servant + servant-server time transformers wai + ]; + executableHaskellDepends = [ + base blaze-html blaze-markup bytestring cereal cryptonite + data-default http-media mtl servant servant-blaze servant-server + text wai warp + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-hmac" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, case-insensitive, cereal @@ -150368,6 +145842,7 @@ self: { hspec-wai http-types random servant servant-server string-class time transformers wai wai-extra with-location ]; + jailbreak = true; description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150427,21 +145902,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-cassava_0_7_1" = callPackage - ({ mkDerivation, base, cassava, http-media, servant, vector }: - mkDerivation { - pname = "servant-cassava"; - version = "0.7.1"; - sha256 = "385bf6187f86c0fb9ba39578eb132118d2ada5dd17f1d0abd6235e4e9113623d"; - revision = "2"; - editedCabalFile = "1bbf4a02f60f2b0d01fa94b6570ff75c1391562f13ea1a1418bd2a1227e9e37a"; - libraryHaskellDepends = [ base cassava http-media servant vector ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Servant CSV content-type for cassava"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-cassava" = callPackage ({ mkDerivation, base, cassava, http-media, servant, vector }: mkDerivation { @@ -150464,36 +145924,6 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.7.1"; - sha256 = "1aecf3d0d573900bc0b20e3ecadd0561d8cbaaf461efb40b213341d36396661d"; - revision = "1"; - editedCabalFile = "2e5c2301bb98e655edb4e6be3a9b9a814330fcd559faba130a2798bf229800c3"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring exceptions - http-api-data http-client http-client-tls http-media http-types - network-uri safe servant string-conversions text transformers - transformers-compat - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hspec http-client http-media - http-types HUnit network QuickCheck servant servant-server text - transformers transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_8_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, deepseq, exceptions, hspec, http-api-data - , http-client, http-client-tls, http-media, http-types, HUnit - , network, network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, transformers-compat, wai - , warp - }: - mkDerivation { - pname = "servant-client"; version = "0.8.1"; sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a"; libraryHaskellDepends = [ @@ -150507,11 +145937,9 @@ self: { http-types HUnit network QuickCheck servant servant-server text transformers transformers-compat wai warp ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -150544,36 +145972,6 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.7.1"; - sha256 = "cd1a9fbcba479a9086fb562ad5c5d5921d2e4d1d079f7922ef0f3d2c75701964"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-conversion - case-insensitive control-monad-omega hashable http-media http-types - lens servant string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring-conversion lens servant string-conversions - text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-docs_0_8_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , bytestring-conversion, case-insensitive, control-monad-omega - , hashable, hspec, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; version = "0.8.1"; sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d"; isLibrary = true; @@ -150590,7 +145988,6 @@ self: { testHaskellDepends = [ aeson base hspec lens servant string-conversions ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; @@ -150604,10 +146001,8 @@ self: { }: mkDerivation { pname = "servant-ede"; - version = "0.5.1"; - sha256 = "54e929c1c77acb04e808aabc485cf80f19724330e233ae5b6255d41d45ac957c"; - revision = "2"; - editedCabalFile = "7145131abeb7f67475bf1c11bcf95cafff1483b370d7c53f10c49c8a29c7e519"; + version = "0.6"; + sha256 = "a091b69bf4c5762ab90d9d8a31ed88eb88baa23c4586356e11717f334a24ce28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150616,7 +146011,7 @@ self: { xss-sanitize ]; executableHaskellDepends = [ - base ede http-media servant-server warp + base ede http-media servant-server text unordered-containers warp ]; homepage = "http://github.com/alpmestan/servant-ede"; description = "Combinators for rendering EDE templates in servant web applications"; @@ -150673,26 +146068,12 @@ self: { ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.7.1"; - sha256 = "93ee994eeb20b28a00fea5092ec34223c4826c4db6da71f4150d8a91950fb578"; - libraryHaskellDepends = [ base http-types lens servant text ]; - testHaskellDepends = [ base hspec ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_8_1" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: - mkDerivation { - pname = "servant-foreign"; version = "0.8.1"; sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-github" = callPackage @@ -150717,6 +146098,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-github-webhook" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto + , github, http-types, servant, servant-server, string-conversions + , text, wai, warp + }: + mkDerivation { + pname = "servant-github-webhook"; + version = "0.2.0.1"; + sha256 = "cbb483255f179414e2131492067f4e9b2177ff778280ed35153e09a07c03ed9b"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring Crypto github http-types + servant servant-server string-conversions text wai + ]; + testHaskellDepends = [ + aeson base bytestring servant-server wai warp + ]; + jailbreak = true; + homepage = "https://github.com/tsani/servant-github-webhook"; + description = "Servant combinators to facilitate writing GitHub webhooks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -150773,27 +146177,6 @@ self: { }: mkDerivation { pname = "servant-js"; - version = "0.7.1"; - sha256 = "15f4f26ffe2e9613defe30c028c43bc685f1582a6a0d97186dea5867c5cd5e89"; - libraryHaskellDepends = [ - base base-compat charset lens servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_8_1" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; version = "0.8.1"; sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363"; libraryHaskellDepends = [ @@ -150803,11 +146186,9 @@ self: { base base-compat hspec hspec-expectations language-ecmascript lens servant text ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -150816,8 +146197,8 @@ self: { pname = "servant-lucid"; version = "0.7.1"; sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "1"; - editedCabalFile = "1fd84dbff6493df7e55bb6f4f6bc194f48ad7e9f63b404669139b1dd231d1cc2"; + revision = "2"; + editedCabalFile = "77b212213098519d9d45d87a3a86b47a8be46b7ca631b54844d2fc19f90c0dc1"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -150851,33 +146232,6 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.7.1"; - sha256 = "e9bec220198a9c9ae67782d88870ea4002562ad20eb6302b5f5a4d6f9752a169"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-types QuickCheck servant servant-server - transformers wai - ]; - executableHaskellDepends = [ - aeson base QuickCheck servant-server warp - ]; - testHaskellDepends = [ - aeson base bytestring-conversion hspec hspec-wai QuickCheck servant - servant-server wai - ]; - homepage = "http://github.com/haskell-servant/servant"; - description = "Derive a mock server for free from your servant API types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-mock_0_8_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp - }: - mkDerivation { - pname = "servant-mock"; version = "0.8.1"; sha256 = "eb4a6a488ca70c2448b61c6ca373eaf97f4399c75d4e51ccefff502a0f6ba4fb"; isLibrary = true; @@ -150893,11 +146247,9 @@ self: { aeson base bytestring-conversion hspec hspec-wai QuickCheck servant servant-server wai ]; - jailbreak = true; homepage = "http://github.com/haskell-servant/servant"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pandoc" = callPackage @@ -150960,8 +146312,33 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.3.1.4"; - sha256 = "3453c63c53bdea6476df27486d207efb382a5ffcb4efd5cbb739c373a5cd380a"; + version = "0.3.1.5"; + sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath http-types lens + mainland-pretty purescript-bridge servant servant-foreign + servant-server servant-subscriber text + ]; + testHaskellDepends = [ + aeson base containers lens mainland-pretty purescript-bridge + servant servant-foreign servant-subscriber text + ]; + homepage = "https://github.com/eskimor/servant-purescript#readme"; + description = "Generate PureScript accessor functions for you servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-purescript_0_4_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text + }: + mkDerivation { + pname = "servant-purescript"; + version = "0.4.0.1"; + sha256 = "614d9813e7c96b23ae5955c0a91b5f5637c1c0e89bdf61a18f1fcdb80955ef5c"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -150987,8 +146364,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.1.1"; - sha256 = "e200e569feb68818c3a3cf64b3e9279e50b7ac3ead8e1702be866e4140d69673"; + version = "0.0.2.0"; + sha256 = "27ea056c0193268a987e7a07700afe754d5bf2027a71244988c2b125b308a055"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive data-default-class hspec http-client http-media http-types mtl @@ -151000,7 +146377,6 @@ self: { quickcheck-io servant servant-client servant-server transformers warp ]; - jailbreak = true; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151034,6 +146410,7 @@ self: { testHaskellDepends = [ base blaze-html servant servant-blaze servant-server warp ]; + jailbreak = true; homepage = "https://github.com/ElvishJerricco/servant-router"; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; @@ -151072,41 +146449,6 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.7.1"; - sha256 = "ba4f10cc14c216cf27e08cae7e7cbb717930400e46dbecc9b8354751584909eb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring - bytestring-conversion directory doctest exceptions filemanip - filepath hspec hspec-wai http-types mtl network parsec QuickCheck - safe servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_8_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, bytestring-conversion, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, mtl, network, network-uri - , parsec, QuickCheck, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, temporary, text - , transformers, transformers-compat, wai, wai-app-static, wai-extra - , warp, word8 - }: - mkDerivation { - pname = "servant-server"; version = "0.8.1"; sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2"; isLibrary = true; @@ -151125,11 +146467,9 @@ self: { safe servant should-not-typecheck string-conversions temporary text transformers transformers-compat wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-smsc-ru" = callPackage @@ -151184,32 +146524,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-swagger_1_0_3" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob - , hspec, http-media, lens, QuickCheck, servant, swagger2, text - , time, unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.0.3"; - sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597"; - revision = "2"; - editedCabalFile = "9277b2e27decd3ec1b02132a8963a70dd8c3624087bf1a7bbad42da95030f85b"; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media lens QuickCheck servant - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base doctest Glob hspec lens QuickCheck servant - swagger2 text time - ]; - jailbreak = true; - homepage = "https://github.com/haskell-servant/servant-swagger"; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-swagger" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory , doctest, filepath, hspec, http-media, insert-ordered-containers @@ -151218,8 +146532,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.1"; - sha256 = "c6d8a62e495cd72a42f2ae600c4e523cf3337bb3cd24426f4cc54141a9600445"; + version = "1.1.2"; + sha256 = "1aa55cdf092189fed02e5d5bddf052eafafd23df54e0671ec32adc5ac4c8c47e"; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -151271,8 +146585,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "8"; - editedCabalFile = "134f4bb4d23eb291360e897c9f83e74f22de17918452b6de79b2044c97197c6b"; + revision = "10"; + editedCabalFile = "a310660af1ba68dc6b337878852bc27aad6d444c16c64864a6aea22584bd2611"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -151392,7 +146706,6 @@ self: { transformers unordered-containers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; @@ -151681,6 +146994,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sets_0_0_5_2" = callPackage + ({ mkDerivation, base, commutative, composition, containers + , contravariant, hashable, keys, mtl, QuickCheck + , quickcheck-instances, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, transformers, transformers-base + , unordered-containers, witherable + }: + mkDerivation { + pname = "sets"; + version = "0.0.5.2"; + sha256 = "be20d5b7b4a5770b7089879f3ef7226c485f4d5bb17e87f979f3bb6475e48713"; + libraryHaskellDepends = [ + base commutative composition containers contravariant hashable keys + mtl QuickCheck semigroupoids semigroups transformers + transformers-base unordered-containers witherable + ]; + testHaskellDepends = [ + base commutative containers contravariant QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck + unordered-containers + ]; + description = "Ducktyped set interface for Haskell containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setters" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -152030,7 +147369,6 @@ self: { js-flot js-jquery process QuickCheck random time transformers unix unordered-containers utf8-string ]; - doCheck = false; homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; @@ -152071,26 +147409,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shake-language-c_0_9_1" = callPackage - ({ mkDerivation, base, data-default-class, directory, doctest - , fclabels, hspec, process, shake, split, unordered-containers - }: - mkDerivation { - pname = "shake-language-c"; - version = "0.9.1"; - sha256 = "827d4225d9c52ab784793831a41f5f594ece21113ad0e5da540505a42842db70"; - libraryHaskellDepends = [ - base data-default-class fclabels process shake split - unordered-containers - ]; - testHaskellDepends = [ base directory doctest hspec shake ]; - doCheck = false; - homepage = "https://github.com/samplecount/shake-language-c"; - description = "Utilities for cross-compiling with Shake"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "shake-language-c" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers @@ -152188,33 +147506,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shakespeare_2_0_9" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.9"; - sha256 = "d3ba75e105a367781d22e75826e07eddd4d0074e9db325722e92bdcaead48d45"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec @@ -152659,7 +147950,6 @@ self: { transformers-base unix-compat ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -153567,7 +148857,6 @@ self: { base bytestring conduit conduit-extra directory hspec HUnit network process resourcet unix ]; - doCheck = false; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153761,10 +149050,10 @@ self: { base bytestring connection containers network old-locale time ]; testHaskellDepends = [ base bytestring hspec HUnit knob ]; - doCheck = false; homepage = "http://github.com/dom96/SimpleIRC"; description = "Simple IRC Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simpleirc-lens" = callPackage @@ -153777,6 +149066,7 @@ self: { homepage = "https://github.com/relrod/simpleirc-lens"; description = "Lenses for simpleirc types"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simplenote" = callPackage @@ -153981,28 +149271,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_0_1" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, th-desugar - }: - mkDerivation { - pname = "singletons"; - version = "2.0.1"; - sha256 = "fd149d3da367eebe81728a7a61389f18bb18b3cddd611b7aed6c0b265110ba41"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-desugar - ]; - testHaskellDepends = [ - base Cabal directory filepath process tasty tasty-golden - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.github.com/goldfirere/singletons"; - description = "A framework for generating singleton types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "singletons" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, th-desugar @@ -154017,7 +149285,6 @@ self: { testHaskellDepends = [ base Cabal directory filepath process tasty tasty-golden ]; - doCheck = false; homepage = "http://www.github.com/goldfirere/singletons"; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; @@ -154105,6 +149372,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sixfiguregroup" = callPackage + ({ mkDerivation, base, digit, directory, doctest, filepath, lens + , parsec, parsers, QuickCheck, template-haskell + }: + mkDerivation { + pname = "sixfiguregroup"; + version = "0.0.1"; + sha256 = "d98c0de2dfa1d15adc1db96284359aea3954f1cd735eafda9bf9b9ce687c14d0"; + libraryHaskellDepends = [ base digit lens parsers ]; + testHaskellDepends = [ + base directory doctest filepath parsec QuickCheck template-haskell + ]; + jailbreak = true; + homepage = "https://github.com/data61/sixfiguregroup"; + description = "A six figure group of time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "size-based" = callPackage ({ mkDerivation, base, dictionary-sharing, template-haskell , testing-type-modifiers @@ -154231,7 +149516,6 @@ self: { testHaskellDepends = [ base bytestring cereal crypto-api filepath hspec tagged ]; - doCheck = false; homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = stdenv.lib.licenses.bsd3; @@ -154426,30 +149710,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "slave-thread_1_0_1_1" = callPackage - ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph - , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore - , stm-containers, transformers - }: - mkDerivation { - pname = "slave-thread"; - version = "1.0.1.1"; - sha256 = "2ebab4f5f49b75fb41cfe9514e1ad5de2c118125dd549e6d7ce318e425d4575f"; - libraryHaskellDepends = [ - base base-prelude list-t mmorph partial-handler stm-containers - transformers - ]; - testHaskellDepends = [ - base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/slave-thread"; - description = "A principal solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -154590,27 +149850,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "slug_0_1_4" = callPackage - ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent - , QuickCheck, test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "slug"; - version = "0.1.4"; - sha256 = "1a9635014b4310bfa8ed75edd4a5d34d708ec72be5aa33358fbd2fce5e68c461"; - libraryHaskellDepends = [ - aeson base exceptions path-pieces persistent text - ]; - testHaskellDepends = [ - base exceptions path-pieces QuickCheck test-framework - test-framework-quickcheck2 text - ]; - homepage = "https://github.com/mrkkrp/slug"; - description = "Type-safe slugs for Yesod ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slug" = callPackage ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent , QuickCheck, test-framework, test-framework-quickcheck2, text @@ -154879,19 +150118,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie_0_4_2_2" = callPackage - ({ mkDerivation, aeson, base, linear, text, vector }: - mkDerivation { - pname = "smoothie"; - version = "0.4.2.2"; - sha256 = "be4f9b24ca5a1dc99165b2a1f5484b48b6baf16e5700514689875dbb2a0e4133"; - libraryHaskellDepends = [ aeson base linear text vector ]; - homepage = "https://github.com/phaazon/smoothie"; - description = "Smooth curves via several interpolation modes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { @@ -155066,40 +150292,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap_0_14_0_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , clientsession, comonad, configurator, containers, directory - , directory-tree, dlist, either, filepath, hashable, heist, lens - , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time - , pwstore-fast, regex-posix, snap-core, snap-server, stm - , template-haskell, text, time, transformers, unordered-containers - , vector, vector-algorithms, xmlhtml - }: - mkDerivation { - pname = "snap"; - version = "0.14.0.7"; - sha256 = "98c853d2efa8104f89567a69ad271196e034b30ec13dd71051e6ce6119d15709"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clientsession comonad - configurator containers directory directory-tree dlist either - filepath hashable heist lens logict MonadCatchIO-transformers mtl - mwc-random pwstore-fast regex-posix snap-core snap-server stm text - time transformers unordered-containers vector vector-algorithms - xmlhtml - ]; - executableHaskellDepends = [ - base bytestring containers directory directory-tree filepath - hashable old-time snap-server template-haskell text - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Top-level package for the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory @@ -155223,33 +150415,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "snap-core_0_9_8_0" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , bytestring-mmap, case-insensitive, containers, deepseq, directory - , enumerator, filepath, hashable, HUnit, MonadCatchIO-transformers - , mtl, old-locale, random, regex-posix, text, time, unix - , unix-compat, unordered-containers, vector, zlib-enum - }: - mkDerivation { - pname = "snap-core"; - version = "0.9.8.0"; - sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db"; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring bytestring-mmap - case-insensitive containers deepseq directory enumerator filepath - hashable HUnit MonadCatchIO-transformers mtl old-locale random - regex-posix text time unix unix-compat unordered-containers vector - zlib-enum - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath @@ -155278,7 +150443,6 @@ self: { test-framework-quickcheck2 text time transformers transformers-base unix-compat unordered-containers vector zlib ]; - doCheck = false; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -155459,33 +150623,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap-server_0_9_5_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , case-insensitive, containers, enumerator, HsOpenSSL - , MonadCatchIO-transformers, mtl, network, old-locale, snap-core - , text, time, unix, unix-compat - }: - mkDerivation { - pname = "snap-server"; - version = "0.9.5.1"; - sha256 = "af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3"; - revision = "1"; - editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring case-insensitive containers - enumerator HsOpenSSL MonadCatchIO-transformers mtl network - old-locale snap-core text time unix unix-compat - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap-server" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock @@ -156559,6 +151696,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snorkels" = callPackage + ({ mkDerivation, ansi-terminal, base, bimap, containers + , monad-loops, optparse-applicative, parsec, random + }: + mkDerivation { + pname = "snorkels"; + version = "0.2.0.0"; + sha256 = "3b9d7f7c50279153dbb6b9f066d88a32178dc52e30ad95293cfbf965a7a6c251"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + executableHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + jailbreak = true; + description = "Strategic board game of medium complexity"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "snow-white" = callPackage ({ mkDerivation, base, binary, bytestring, mps }: mkDerivation { @@ -156604,6 +151764,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "snowflake-core" = callPackage + ({ mkDerivation, base, QuickCheck, time-exts }: + mkDerivation { + pname = "snowflake-core"; + version = "0.1.0.1"; + sha256 = "442427fa86bee84c422c3c14e02e0f33f1d04504172dfd2620c50b3aa2ef8954"; + libraryHaskellDepends = [ base time-exts ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/jiakai0419/snowflake#readme"; + description = "twitter's snowflake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snowflake-server" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, random + , snap-core, snap-server, snowflake-core + }: + mkDerivation { + pname = "snowflake-server"; + version = "0.1.0.0"; + sha256 = "af3baefdf4c9c51c7c0eb1441b24af8d9185ef41fae3890f961effbdca789c1c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers mtl random snap-core snap-server + snowflake-core + ]; + description = "snowflake http server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snowglobe" = callPackage ({ mkDerivation, base, bytestring, containers, gl-capture, GLUT , OpenGL, OpenGLRaw, random @@ -156622,31 +151813,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "soap_0_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.0"; - sha256 = "9d249967e3e6394749397a89c70c9aba5e5454ea4c2592ffd00aaa0ca2e98fd1"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "soap" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit @@ -156736,20 +151902,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "socket_0_6_0_1" = callPackage - ({ mkDerivation, async, base, bytestring }: - mkDerivation { - pname = "socket"; - version = "0.6.0.1"; - sha256 = "d6b2a2bbb331997314a4b94a21530ea36d00888cbc86ab59c9a33e8ed1f03d20"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "socket" = callPackage ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: mkDerivation { @@ -157058,19 +152210,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sorted-list_0_1_6_1" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "sorted-list"; - version = "0.1.6.1"; - sha256 = "07eda22facb55bd2c135a8a2ada96e5d7f0a2d86f471cdeb4eb3fd3ab37ce0b4"; - libraryHaskellDepends = [ base deepseq ]; - homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; - description = "Type-enforced sorted lists and related functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sorted-list" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -157189,7 +152328,6 @@ self: { testHaskellDepends = [ aeson base bytestring process text unordered-containers utf8-string ]; - doCheck = false; description = "Implementation of source maps as proposed by Google and Mozilla"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157502,7 +152640,6 @@ self: { editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; @@ -157747,7 +152884,7 @@ self: { description = "Experimental web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "spine" = callPackage ({ mkDerivation, base }: @@ -158132,8 +153269,8 @@ self: { }: mkDerivation { pname = "spy"; - version = "0.10"; - sha256 = "f0020bed11e5e8c42dab4e2f04f00bb0f19a2251738596eca1fcd704408776ac"; + version = "0.14"; + sha256 = "c257084e554d50bc1bf76029e292ae61af6a73f922320f7cf2bac306ac0565f5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158663,6 +153800,8 @@ self: { pname = "stache"; version = "0.1.6"; sha256 = "078e223a2549f08ee48b2c9d40f7242992b5870e02eef2f9ef1ea8d542ff4e36"; + revision = "1"; + editedCabalFile = "3c023b0738484069b7515bfe80d3b3c9c4a64406d36aef82f9f893068198d862"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -158745,6 +153884,80 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "stack_1_2_0" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async + , attoparsec, base, base-compat, base16-bytestring + , base64-bytestring, binary, binary-tagged, blaze-builder, byteable + , bytestring, Cabal, clock, conduit, conduit-extra, containers + , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance + , either, enclosed-exceptions, errors, exceptions, extra + , fast-logger, filelock, filepath, fsnotify, generic-deriving + , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client + , http-client-tls, http-conduit, http-types, lifted-async + , lifted-base, microlens, monad-control, monad-logger, monad-unlift + , mono-traversable, mtl, neat-interpolation, open-browser + , optparse-applicative, optparse-simple, path, path-io, persistent + , persistent-sqlite, persistent-template, pretty, process + , project-template, QuickCheck, regex-applicative-text, resourcet + , retry, safe, semigroups, smallcheck, split, stm, store + , streaming-commons, tar, template-haskell, temporary, text + , text-binary, th-reify-many, time, tls, transformers + , transformers-base, unicode-transforms, unix, unix-compat + , unordered-containers, vector, vector-binary-instances, yaml + , zip-archive, zlib + }: + mkDerivation { + pname = "stack"; + version = "1.2.0"; + sha256 = "6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base-compat base16-bytestring base64-bytestring binary + binary-tagged blaze-builder byteable bytestring Cabal clock conduit + conduit-extra containers cryptohash cryptohash-conduit deepseq + directory edit-distance either enclosed-exceptions errors + exceptions extra fast-logger filelock filepath fsnotify + generic-deriving hashable hastache hit hpack hpc http-client + http-client-tls http-conduit http-types lifted-async lifted-base + microlens monad-control monad-logger monad-unlift mtl open-browser + optparse-applicative path path-io persistent persistent-sqlite + persistent-template pretty process project-template + regex-applicative-text resourcet retry safe semigroups split stm + store streaming-commons tar template-haskell temporary text + text-binary time tls transformers transformers-base + unicode-transforms unix unix-compat unordered-containers vector + vector-binary-instances yaml zip-archive zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory either filelock filepath + gitrev hpack http-client lifted-base microlens monad-control + monad-logger mtl optparse-applicative optparse-simple path path-io + text transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger mono-traversable neat-interpolation path path-io + QuickCheck resourcet retry smallcheck store template-haskell + temporary text th-reify-many transformers vector + ]; + jailbreak = true; + doCheck = false; + preCheck = "export HOME=$TMPDIR"; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "http://haskellstack.org"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib @@ -158852,7 +154065,6 @@ self: { stackage-install stackage-sandbox stackage-setup stackage-update stackage-upload ]; - doCheck = false; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; @@ -158926,55 +154138,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-curator_0_14_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, binary, binary-orphans, binary-tagged - , blaze-html, byteable, bytestring, Cabal, classy-prelude-conduit - , conduit, conduit-extra, containers, cryptohash - , cryptohash-conduit, data-default-class, directory, exceptions - , filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stackage-cli, stackage-install, stm - , streaming-commons, syb, system-fileio, system-filepath, tar - , temporary, text, time, transformers, unix-compat - , unordered-containers, utf8-string, vector, xml-conduit, xml-types - , yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.0"; - sha256 = "13ad2b94821402f533d0e5b4ac38ea1107fa015ab1a5d997f03f0ae05d38fa67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring binary binary-orphans binary-tagged blaze-html - byteable bytestring Cabal classy-prelude-conduit conduit - conduit-extra containers cryptohash cryptohash-conduit - data-default-class directory exceptions filepath hashable - html-conduit http-client http-client-tls http-conduit lucid - mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stackage-install stm - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple stackage-cli system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-curator" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal @@ -159147,30 +154310,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-upload_0_1_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , http-client, http-client-tls, http-types, optparse-applicative - , process, stackage-cli, temporary, text - }: - mkDerivation { - pname = "stackage-upload"; - version = "0.1.0.5"; - sha256 = "f1353781fc12b09682620c6629ee4edeca3c8ca16001109080d7d0fb3dd3b33b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory filepath http-client - http-client-tls http-types process temporary text - ]; - executableHaskellDepends = [ - base optparse-applicative stackage-cli - ]; - homepage = "https://github.com/fpco/stackage-upload"; - description = "A more secure version of cabal upload which uses HTTPS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-upload" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-client, http-client-tls, http-types, optparse-applicative @@ -159522,7 +154661,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector vector-algorithms ]; - doCheck = false; homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd3; @@ -159629,13 +154767,12 @@ self: { }: mkDerivation { pname = "statsd-client"; - version = "0.2.0.1"; - sha256 = "7ef148b3909594fe4e845a1ebc49041af5cacaf1c557b4460f117a35a59457a5"; + version = "0.3.0.0"; + sha256 = "540cfad1006bad0f38e2ebb4550c7508f3dd7c21fd4711f87371fbe03d35df06"; libraryHaskellDepends = [ base byteable bytestring crypto-api cryptohash digest-pure DRBG network network-uri old-time random time-units ]; - jailbreak = true; homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; @@ -159911,35 +155048,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-conduit_2_8_0" = callPackage - ({ mkDerivation, async, base, cereal, cereal-conduit, conduit - , conduit-combinators, conduit-extra, directory, doctest, ghc-prim - , HUnit, lifted-async, lifted-base, monad-control, monad-loops - , QuickCheck, resourcet, stm, stm-chans, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - , void - }: - mkDerivation { - pname = "stm-conduit"; - version = "2.8.0"; - sha256 = "0bad21541ac28765802468c71b61f464daf1fca4b2adf1c66bab006d0a7d3128"; - libraryHaskellDepends = [ - async base cereal cereal-conduit conduit conduit-combinators - conduit-extra directory ghc-prim lifted-async lifted-base - monad-control monad-loops resourcet stm stm-chans transformers void - ]; - testHaskellDepends = [ - base conduit conduit-combinators directory doctest HUnit QuickCheck - resourcet stm stm-chans test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - jailbreak = true; - homepage = "https://github.com/cgaebel/stm-conduit"; - description = "Introduces conduits to channels, and promotes using conduits concurrently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit , conduit-combinators, conduit-extra, directory, doctest, ghc-prim @@ -159967,31 +155075,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stm-containers_0_2_14" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers - }: - mkDerivation { - pname = "stm-containers"; - version = "0.2.14"; - sha256 = "6d415061d23cee818cd3c879c828809d177c28a1c4d36fdfc408867c3bbe8e6f"; - libraryHaskellDepends = [ - base base-prelude focus hashable list-t primitive transformers - ]; - testHaskellDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/stm-containers"; - description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-containers" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive @@ -160410,8 +155493,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.2.1.0"; - sha256 = "8f6724dc7fcf97af160106bc546d33b07ac290c81349a6c72b5db18dea6a8d6d"; + version = "0.2.1.2"; + sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad"; libraryHaskellDepends = [ array base base-orphans base64-bytestring bytestring conduit containers cryptohash deepseq directory fail filepath ghc-prim @@ -160443,8 +155526,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.2.0.0"; - sha256 = "52ef7fab49c7dbd6c287de92c2f852c78f25cb32a415e56b3f21ca6b9aa5bd0a"; + version = "0.2.0.2"; + sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e"; libraryHaskellDepends = [ base bytestring fail ghc-prim primitive text transformers ]; @@ -160471,35 +155554,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_1_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.1.2.1"; - sha256 = "70948036bc62ee5d77d01efa674fcfd762e2bf95d04a94e55dde1339940d471c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stratosphere" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hlint, lens, tasty, tasty-hspec, template-haskell, text @@ -160755,6 +155809,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_1_16" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.16"; + sha256 = "17fdf509823e72996265de9260eaf58e33350e746dea058a36392c843ea8106e"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-eversion" = callPackage ({ mkDerivation, base, doctest, foldl, microlens, pipes , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit @@ -160859,24 +155936,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "streams_3_2_1" = callPackage - ({ mkDerivation, adjunctions, base, comonad, distributive - , semigroupoids, semigroups - }: - mkDerivation { - pname = "streams"; - version = "3.2.1"; - sha256 = "44edcc8bda54c0c356e606896756af5e61dab0070c021df31dfbbc56cad2d9f7"; - libraryHaskellDepends = [ - adjunctions base comonad distributive semigroupoids semigroups - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/streams/issues"; - description = "Various Haskell 2010 stream comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "streams" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive , semigroupoids, semigroups @@ -161273,25 +156332,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stripe-core_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, mtl, text, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "stripe-core"; - version = "2.0.3"; - sha256 = "1c3d319ef29bb3e2863838e553a44a23449dafc8f244c62a7f3ffc7b8305e3a8"; - libraryHaskellDepends = [ - aeson base bytestring mtl text time transformers - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe-haskell"; - description = "Stripe API for Haskell - Pure Core"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -161309,20 +156349,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stripe-haskell_2_0_3" = callPackage - ({ mkDerivation, base, stripe-core, stripe-http-streams }: - mkDerivation { - pname = "stripe-haskell"; - version = "2.0.3"; - sha256 = "225b6b5671181a8349b952bf98a30c40bf0ee24ab53cc720f02d7979ad7cd5bb"; - libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe"; - description = "Stripe API for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stripe-haskell" = callPackage ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { @@ -161335,28 +156361,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stripe-http-streams_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec - , http-streams, io-streams, stripe-core, stripe-tests, text - }: - mkDerivation { - pname = "stripe-http-streams"; - version = "2.0.3"; - sha256 = "c6423451c388e3006012b01932b3fdd23d344a5d8dd73755ef00cb74b7c736f6"; - libraryHaskellDepends = [ - aeson base bytestring HsOpenSSL http-streams io-streams stripe-core - text - ]; - testHaskellDepends = [ - base free HsOpenSSL hspec http-streams stripe-core stripe-tests - ]; - jailbreak = true; - doCheck = false; - description = "Stripe API for Haskell - http-streams backend"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {stripe-tests = null;}; - "stripe-http-streams" = callPackage ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec , http-streams, io-streams, stripe-core, stripe-tests, text @@ -161378,27 +156382,6 @@ self: { license = stdenv.lib.licenses.mit; }) {stripe-tests = null;}; - "strive_2_2_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-conduit, http-types, markdown-unlit, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "2.2.2"; - sha256 = "cf1b8b89a234798947931c874e9a48598737fb41d8971e5c1eed87d9fb75beb0"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-conduit - http-types template-haskell text time transformers - ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - jailbreak = true; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit @@ -161594,36 +156577,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell_0_5_17_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.5.17.0"; - sha256 = "374ad1e8206ae9b41b94b95fef55ad8d439c006fa650e6315ef04eca38e53b78"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -162093,6 +157046,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "supermonad" = callPackage + ({ mkDerivation, base, containers, fgl, ghc, mtl, transformers }: + mkDerivation { + pname = "supermonad"; + version = "0.1"; + sha256 = "ed9647eae9e5b3431bf320db78c6878b6f21487ba659faf18a1f4597a91a8e62"; + libraryHaskellDepends = [ + base containers fgl ghc mtl transformers + ]; + description = "Plugin and base library to support supermonads in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -162182,8 +157149,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.5.1.1"; - sha256 = "cf75c195759bc114722e43aad05442ca002aa34a72aa2457c4444873945fab5e"; + version = "0.5.1.2"; + sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -162319,34 +157286,25 @@ self: { aeson base bytestring text time transformers ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; - doCheck = false; description = "Implementation of swagger data model"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "swagger2_2_0_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl - , network, QuickCheck, scientific, template-haskell, text, time - , transformers, unordered-containers, vector + "swagger_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text + , time, transformers }: mkDerivation { - pname = "swagger2"; - version = "2.0.2"; - sha256 = "a9d2d65793e2c6767e06effd8e947f0072b2d6dd414e85012b73a2574167649b"; + pname = "swagger"; + version = "0.3.0"; + sha256 = "c7144fb22a0d223eb2463a896200936eab665dc01f39affc103d2ee6a38f54d0"; libraryHaskellDepends = [ - aeson base base-compat containers hashable http-media lens mtl - network scientific template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers doctest Glob hashable - hspec HUnit lens mtl QuickCheck text time unordered-containers - vector + aeson base bytestring text time transformers ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "Implementation of swagger data model"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -162371,7 +157329,6 @@ self: { hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck text time unordered-containers vector ]; - doHaddock = false; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; @@ -162637,7 +157594,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; testSystemDepends = [ gmp gmpxx symengine ]; - doCheck = false; homepage = "http://github.com/symengine/symengine.hs#readme"; description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; @@ -162994,8 +157950,8 @@ self: { }: mkDerivation { pname = "synthesizer-alsa"; - version = "0.5.0.4"; - sha256 = "2a7966095f5195977c0c70575009ac57a604b16b1c625da4ac23811ef1e447e0"; + version = "0.5.0.5"; + sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26"; libraryHaskellDepends = [ alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa non-negative numeric-prelude old-time random sox storablevector @@ -163103,8 +158059,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.1"; - sha256 = "fa63abd89d8f87abe872ba9834ba7a204555b46deec823dfa0e87dd70dbf2e76"; + version = "0.8.1.1"; + sha256 = "5d826192a0ce80c07e535993492fb6e53160fb603ab7047ce7a12c48a4fee7ce"; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty non-negative numeric-prelude pathtype random sox storable-record @@ -163262,7 +158218,6 @@ self: { testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text ]; - doCheck = false; homepage = "https://github.com/fpco/haskell-filesystem"; description = "High-level, byte-based file and directory path manipulations (deprecated)"; license = stdenv.lib.licenses.mit; @@ -163284,8 +158239,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "system-info"; - version = "0.1.0.1"; - sha256 = "e037238c975acc226dc5d2d483267d5d2c09ada7a966f269d858a824e15f5c88"; + version = "0.1.0.2"; + sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -163458,13 +158413,12 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.0.2"; - sha256 = "5235db71cd2ed14a77003c2c659582dee64f504f4de1af9ceab72f00af4cc2aa"; + version = "1.0.5"; + sha256 = "6eda0e556aa555f031d82a075baed227c389a9f40df13c5a5632b94c6c5b4906"; libraryHaskellDepends = [ base bytestring network transformers unix ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/erebe/systemd"; description = "Systemd facilities (Socket activation, Notify)"; license = stdenv.lib.licenses.bsd3; @@ -163516,6 +158470,7 @@ self: { base containers haskell-src-exts haskell-src-meta lens mtl QuickCheck recursion-schemes template-haskell transformers ]; + jailbreak = true; description = "Matchers and grammars using tree regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163816,19 +158771,6 @@ self: { license = "GPL"; }) {}; - "tagged_0_8_4" = callPackage - ({ mkDerivation, base, deepseq, template-haskell }: - mkDerivation { - pname = "tagged"; - version = "0.8.4"; - sha256 = "20c861d299445ea810ba39d9d0529fb0b3862f4d0271a4fb168ccd493a234d5e"; - libraryHaskellDepends = [ base deepseq template-haskell ]; - homepage = "http://github.com/ekmett/tagged"; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagged" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers , transformers-compat @@ -164056,19 +158998,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tagsoup_0_13_10" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "tagsoup"; - version = "0.13.10"; - sha256 = "ac838eeed18118423220716855c2bfd71dcc4a7a455893d8c4ad627828f57d58"; - libraryHaskellDepends = [ base bytestring containers text ]; - homepage = "https://github.com/ndmitchell/tagsoup#readme"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagsoup" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { @@ -164137,6 +159066,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tagsoup-selection" = callPackage + ({ mkDerivation, base, containers, parsec, tagsoup }: + mkDerivation { + pname = "tagsoup-selection"; + version = "0.1.0.1"; + sha256 = "2d7159e2d8010b877983dbc3b106fabb19451eb00f65ed7a9bf9a3b7ca231c73"; + libraryHaskellDepends = [ base containers parsec tagsoup ]; + jailbreak = true; + description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tagstream-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, data-default, hspec @@ -164522,27 +159463,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_11_0_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays - }: - mkDerivation { - pname = "tasty"; - version = "0.11.0.3"; - sha256 = "ca51533c3b6fb36a63b7a6062d71024e3a823ae173779c1c81850959e29e7efa"; - revision = "1"; - editedCabalFile = "65ddea88e2f32a40483dc873704a8b6b684548b5c61400440c4dda1bdbcbd5f3"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays - ]; - homepage = "http://documentup.com/feuerbach/tasty"; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged @@ -164582,8 +159502,8 @@ self: { ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.3.0.1"; - sha256 = "9794201798e3afdfd84f22a6bd89fd869db3105ec33d406d6d4df742d5d0b683"; + version = "0.3.0.2"; + sha256 = "1f1d2ebbad76c763e036871ec481f40c532334f7692dc187a94b77519dbe2f5d"; libraryHaskellDepends = [ base dejafu tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -164619,30 +159539,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-golden_2_3_1" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary, temporary-rc - }: - mkDerivation { - pname = "tasty-golden"; - version = "2.3.1"; - sha256 = "f292a57dc63afdd5607cca82bcc5ad606c5e1c59bb6fabc7fe48a26d816dcbf1"; - revision = "1"; - editedCabalFile = "ecec40232352129f5e7cf7ec06a93800c7eb76ef42a7b9fa5439ab8434513860"; - libraryHaskellDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary-rc - ]; - homepage = "https://github.com/feuerbach/tasty-golden"; - description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-golden" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged @@ -164874,31 +159770,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-silver_3_1_8_1" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.1.8.1"; - sha256 = "0dc1bcced319abc9984aa8e61c4bb88c30279f1b87d4d4e0f368eade99525fb0"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - homepage = "https://github.com/phile314/tasty-silver"; - description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -165196,33 +160067,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "telegram-api_0_4_3_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either - , filepath, hjpath, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, mime-types - , optparse-applicative, servant, servant-client, string-conversions - , text, transformers, utf8-string - }: - mkDerivation { - pname = "telegram-api"; - version = "0.4.3.1"; - sha256 = "b51fa07d2dfa010a467a43b2a86dc56ec7a7adaf91b379528a97b6745771dfc8"; - libraryHaskellDepends = [ - aeson base bytestring either http-api-data http-client http-media - http-types mime-types servant servant-client string-conversions - text transformers - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string - ]; - homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; - description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "telegram-api" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either , filepath, hjpath, hspec, http-api-data, http-client @@ -165232,8 +160076,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.0.0"; - sha256 = "f971c4acd9101f4fd811a5e60b31ce2c85a09789a248e3a5473efa81d227ad93"; + version = "0.5.0.1"; + sha256 = "24eca611772e6810f837b372dca1b0fb7492cff8b72b68d66d886193da030ef3"; libraryHaskellDepends = [ aeson base bytestring either http-api-data http-client http-media http-types mime-types servant servant-client string-conversions @@ -165244,9 +160088,11 @@ self: { http-client-tls http-types optparse-applicative servant servant-client text transformers utf8-string ]; + jailbreak = true; homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teleport" = callPackage @@ -165702,7 +160548,6 @@ self: { base base-unicode-symbols HUnit test-framework test-framework-hunit ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; @@ -166390,28 +161235,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath_0_8_6_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.8.6.4"; - sha256 = "8ef75b8a82ba0d0002388b8a25148b40c06a7e4ea8033f6cc07c806dfa4c6c50"; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text @@ -166891,37 +161714,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "text-show_2_1_2" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, generic-deriving - , ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "2.1.2"; - sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d"; - revision = "2"; - editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3"; - libraryHaskellDepends = [ - array base base-compat bytestring bytestring-builder containers - generic-deriving ghc-prim integer-gmp nats semigroups tagged - template-haskell text transformers void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder generic-deriving ghc-prim hspec nats QuickCheck - quickcheck-instances tagged text transformers transformers-compat - void - ]; - jailbreak = true; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant @@ -167051,24 +161843,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-zipper_0_4" = callPackage - ({ mkDerivation, base, text, vector }: - mkDerivation { - pname = "text-zipper"; - version = "0.4"; - sha256 = "0a94fbdc2febc7656369b30c09fe4bcee1f9323547af40037a2adbee52a45d97"; - libraryHaskellDepends = [ base text vector ]; - description = "A text editor zipper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "text-zipper" = callPackage ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.7"; - sha256 = "7d1c215b0d244bcd947ecb9094eec845da22109502557a5dde2e931d06496c7c"; + version = "0.7.1"; + sha256 = "db24d7da5fbdacbf3ec774c3bc0fd574023f4b00e493267f3275d2dc673eeb45"; libraryHaskellDepends = [ base deepseq text vector ]; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; @@ -167337,30 +162117,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-desugar_1_5_5" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-lift, th-orphans - }: - mkDerivation { - pname = "th-desugar"; - version = "1.5.5"; - sha256 = "db8cfe15c2b1c5b5e6c2105a0a16f409c9eb9b359c2f2c18e440d5562c5d38a3"; - revision = "1"; - editedCabalFile = "6dffacc4a25cfaa78844eb30be50f7e0c9c502c808c84279577308cb1ec8d1b8"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-lift th-orphans - ]; - testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-lift - th-orphans - ]; - jailbreak = true; - homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; - description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -167369,6 +162125,8 @@ self: { pname = "th-desugar"; version = "1.6"; sha256 = "c8f8ece2bde9b12070ea50bc089fbc672f144659225d837478fbc793777f634f"; + revision = "1"; + editedCabalFile = "ba5a42169a8e996cf9d82fdb1a6a2faa1fab3f71f1c58e77f51cd655007d312d"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -167377,7 +162135,7 @@ self: { base containers hspec HUnit mtl syb template-haskell th-expand-syns th-lift th-orphans ]; - homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; + homepage = "https://github.com/goldfirere/th-desugar"; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167539,23 +162297,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-orphans_0_13_0" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.0"; - sha256 = "bdaeee2a3588e0622f2036481974dfe1bd135a3d71004393c94201d8d700be80"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-orphans" = callPackage ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift , th-lift-instances, th-reify-many @@ -167586,7 +162327,6 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - doCheck = false; homepage = "https://github.com/joelteon/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; @@ -167797,34 +162537,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "these_0_6_2_1" = callPackage - ({ mkDerivation, base, bifunctors, containers, data-default-class - , hashable, mtl, profunctors, QuickCheck, quickcheck-instances - , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers - , transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "these"; - version = "0.6.2.1"; - sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb"; - revision = "2"; - editedCabalFile = "3899efa5ea17e23cfb9acde7fa3316fa35183358b90d4540899b5d9d38d59a35"; - libraryHaskellDepends = [ - base bifunctors containers data-default-class hashable mtl - profunctors semigroupoids semigroups transformers - transformers-compat unordered-containers vector - ]; - testHaskellDepends = [ - base bifunctors containers hashable QuickCheck quickcheck-instances - tasty tasty-quickcheck transformers unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "these" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors @@ -167981,12 +162693,24 @@ self: { testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; license = stdenv.lib.licenses.bsd3; }) {}; + "threads-extras" = callPackage + ({ mkDerivation, base, stm, threads }: + mkDerivation { + pname = "threads-extras"; + version = "0.1.0.1"; + sha256 = "fc31c11c50e55f53578a46c3b9529729281c4256010caed89aba614d2cf086b3"; + libraryHaskellDepends = [ base stm threads ]; + testHaskellDepends = [ base ]; + jailbreak = true; + description = "Extends the threads package with a bounded thread group"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "threads-pool" = callPackage ({ mkDerivation, base, containers, mtl, stm }: mkDerivation { @@ -168065,15 +162789,14 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.6"; - sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d"; + version = "0.7.0.0"; + sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e"; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq filepath hashable network-uri safe snap-core snap-server stm template-haskell text transformers unordered-containers vault vector websockets websockets-snap ]; - jailbreak = true; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; @@ -168209,7 +162932,6 @@ self: { old-locale profunctors QuickCheck random system-posix-redirect text time vector-space ]; - doCheck = false; homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; license = stdenv.lib.licenses.bsd3; @@ -168294,28 +163016,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "tidal_0_7_1" = callPackage - ({ mkDerivation, base, binary, bytestring, colour, containers - , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec - , PortMidi, process, serialport, text, time, transformers - , websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.7.1"; - sha256 = "fce7b8e13e4fd0b520a68fa9733cf1a29dfaf6cbdeb37be463b3e6d4ed700314"; - libraryHaskellDepends = [ - base binary bytestring colour containers hashable hmt hosc - mersenne-random-pure64 mtl parsec PortMidi process serialport text - time transformers websockets - ]; - jailbreak = true; - homepage = "http://tidal.lurk.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tidal" = callPackage ({ mkDerivation, base, binary, bytestring, colour, containers , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process @@ -168689,10 +163389,8 @@ self: { }: mkDerivation { pname = "time-parsers"; - version = "0.1.0.0"; - sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; - revision = "4"; - editedCabalFile = "b245d40a3dd52af19e835fb9b0aaa9373dddd63cff13a3c298c97e02bca29e1e"; + version = "0.1.1.0"; + sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -169059,18 +163757,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timespan" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timespan"; + version = "0.1.0.0"; + sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/agrafix/timespan#readme"; + description = "Useful timespan datatype and functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage - ({ mkDerivation, base, bytestring, old-locale, process, split, time + ({ mkDerivation, base, bytestring, process, split, time , transformers }: mkDerivation { pname = "timestamp-subprocess-lines"; - version = "0.1.0.3"; - sha256 = "35aae25c87e8849d9eb9efe581aa94340da27c16f6f72c7ee5ea40b7d621c9ee"; + version = "0.1.0.4"; + sha256 = "2542b9977d1bf472ca8c929a6d390b223fdfff5cab940ca6bf1b632b31996bd1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring old-locale process split time transformers + base bytestring process split time transformers ]; homepage = "https://github.com/Peaker/timestamp-subprocess-lines"; description = "Run a command and timestamp its stdout/stderr lines"; @@ -169100,12 +163810,11 @@ self: { pname = "timezone-olson"; version = "0.1.7"; sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa"; - revision = "1"; - editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652"; + revision = "2"; + editedCabalFile = "2b056e050fea1cd6133901097f1c5338323f343b31f19bf042ded410ec8d44eb"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; @@ -169117,12 +163826,11 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.1"; - sha256 = "61eb1559bea5a5d5548a5ac0a915d741e6336eae0c3634b7f503583ed7221ef7"; + version = "0.1.0.2"; + sha256 = "5c8050daceec73b642a1ec85827d6914b2e0bfe32813b5c715a9200d0143ad76"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; - jailbreak = true; homepage = "http://github.com/jonpetterbergman/timezone-olson-th"; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; @@ -169132,10 +163840,9 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "timezone-series"; - version = "0.1.5.1"; - sha256 = "d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56"; + version = "0.1.6.1"; + sha256 = "65ea9a8c3b1143a0f1d154943ac8311b53bb2ec7b5e52b09bd035343025c2cc3"; libraryHaskellDepends = [ base time ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -169824,6 +164531,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "toxcore" = callPackage + ({ mkDerivation, base, bytestring, bytestring-arbitrary + , data-default-class, hspec, QuickCheck, saltine, toxcore + }: + mkDerivation { + pname = "toxcore"; + version = "0.0.2"; + sha256 = "859eff7c76714fb802b1868a9d5165122217f3c3284c0cb0e7f7fb39921d7a72"; + libraryHaskellDepends = [ + base bytestring bytestring-arbitrary data-default-class QuickCheck + saltine + ]; + librarySystemDepends = [ toxcore ]; + testHaskellDepends = [ + base data-default-class hspec QuickCheck saltine + ]; + jailbreak = true; + homepage = "https://toktok.github.io"; + description = "Haskell bindings to the C reference implementation of Tox"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {toxcore = null;}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-builder , containers, data-default-class, data-interval, deepseq @@ -170030,8 +164760,8 @@ self: { }: mkDerivation { pname = "traildb"; - version = "0.1.0.2"; - sha256 = "d9f92a220123ccf6bc33bd1a70736a2cf9631cae2e3252f39237d9a87b9ffac8"; + version = "0.1.1.0"; + sha256 = "15378affdaaa360d3f7c2f9e39866b9f73d60b3092ca9ab4ef4f82a33a373b3b"; libraryHaskellDepends = [ base bytestring containers directory exceptions lens primitive text time transformers unix vector @@ -170181,21 +164911,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "transformers-compat_0_4_0_4" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.4.0.4"; - sha256 = "d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52"; - libraryHaskellDepends = [ base transformers ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -170319,6 +165034,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_4_4" = callPackage + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -170340,6 +165072,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient-universe_0_3_4" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.3.4"; + sha256 = "14a52d54f3328742b248f781ec06b44d8be532e943dbbd2a23149868593081f8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + executableHaskellDepends = [ base transformers transient ]; + jailbreak = true; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -170645,34 +165403,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_5_2" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.5.2"; - sha256 = "ebc23319d2cfd39c87b2cf688f3db45528e371de9a417fc9e07e50a796b6503a"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "trifecta" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset @@ -171012,31 +165742,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tttool_1_6_1_1" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib - }: - mkDerivation { - pname = "tttool"; - version = "1.6.1.1"; - sha256 = "6a002fd4ed43f6ddf165961baa88fa0eb75c4afa87f6916ec9e37331a3c5d78b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib - ]; - homepage = "https://github.com/entropia/tip-toi-reveng"; - description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF @@ -171333,7 +166038,6 @@ self: { libraryHaskellDepends = [ base optional-args parsec text turtle ]; executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; - doCheck = false; homepage = "https://github.com/elaye/turtle-options#readme"; description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; @@ -171754,7 +166458,6 @@ self: { lens-aeson network-uri resourcet template-haskell text time twitter-types twitter-types-lens ]; - doCheck = false; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -171781,27 +166484,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed_0_2_0_7" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, bytestring - , containers, http-conduit, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "twitter-feed"; - version = "0.2.0.7"; - sha256 = "031cafcb9685b1f3f677f9a168b72831f85df43e49a74cc9e89d3d7218e15d95"; - libraryHaskellDepends = [ - aeson authenticate-oauth base bytestring http-conduit - ]; - testHaskellDepends = [ - base containers HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/stackbuilders/twitter-feed"; - description = "Client for fetching Twitter timeline via Oauth"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "twitter-feed" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework @@ -172255,19 +166937,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "type-list_0_3_0_4" = callPackage - ({ mkDerivation, base, singletons }: - mkDerivation { - pname = "type-list"; - version = "0.3.0.4"; - sha256 = "cd06218bf2f6897e0caf85c86334d8834ea36410a0d0b1d9193e1cbadd1b300a"; - libraryHaskellDepends = [ base singletons ]; - jailbreak = true; - description = "Operations on type-level lists and tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "type-list" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -172383,6 +167052,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_3_0_1" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.3.0.1"; + sha256 = "aecd1a319efc13eb42b73b489cf374f94bf126f19fdc28b2f5cd6f73dda3a241"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sheyll/type-spec#readme"; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -172730,34 +167413,6 @@ self: { license = "GPL"; }) {}; - "tz_0_1_1_1" = callPackage - ({ mkDerivation, base, binary, bindings-posix, bytestring - , containers, data-default, deepseq, HUnit, QuickCheck - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, time, tzdata, unix - , vector - }: - mkDerivation { - pname = "tz"; - version = "0.1.1.1"; - sha256 = "66862e68a1dca1a9fb5372b86f23ae64f39ff0f2f075041fc3dae4c7d2dedcd0"; - libraryHaskellDepends = [ - base binary bytestring containers data-default deepseq - template-haskell time tzdata vector - ]; - testHaskellDepends = [ - base bindings-posix HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - time tzdata unix vector - ]; - jailbreak = true; - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - homepage = "https://github.com/nilcons/haskell-tz"; - description = "Efficient time zone handling"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , deepseq, HUnit, QuickCheck, template-haskell, test-framework @@ -172803,6 +167458,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "u2f" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base64-bytestring, binary, bytestring, cryptohash, cryptonite + , either-unwrap, hspec, text + }: + mkDerivation { + pname = "u2f"; + version = "0.1.0.0"; + sha256 = "b7d123b1eee52751bc1310e2acca2129241bf5588a2587dcfe37691e1ff17205"; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring binary + bytestring cryptohash cryptonite either-unwrap text + ]; + testHaskellDepends = [ base bytestring hspec text ]; + jailbreak = true; + homepage = "https://github.com/EButlerIV/u2f"; + description = "Haskell Universal Two Factor helper toolbox library thing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uAgda" = callPackage ({ mkDerivation, array, base, BNFC-meta, cmdargs, containers, mtl , parsec, pretty, split, transformers @@ -173624,18 +168299,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "union_0_1_1_0" = callPackage - ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: - mkDerivation { - pname = "union"; - version = "0.1.1.0"; - sha256 = "d83b04349288fe9b73c254312da9850e1c05717beb7f8db6f7fefed83f1a82e6"; - libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; - description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "union" = callPackage ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: mkDerivation { @@ -174028,21 +168691,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-compat_0_4_1_4" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.4.1.4"; - sha256 = "fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b"; - revision = "2"; - editedCabalFile = "2c9cfb5497baed3eeddfe5c6cc249bf51a76e2bb646c322b8f45a0db8c42129c"; - libraryHaskellDepends = [ base unix ]; - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -174143,23 +168791,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-time_0_3_6" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec - , old-locale, old-time, QuickCheck, time - }: - mkDerivation { - pname = "unix-time"; - version = "0.3.6"; - sha256 = "5d15ebd0ee74e13638a7c04a7fc5f05a29ccd3228c8798df226939a778f7db37"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale old-time QuickCheck time - ]; - description = "Unix time parser/formatter and utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hspec , old-locale, old-time, QuickCheck, time @@ -174575,30 +169206,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring_0_2_1_2" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, derive, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.1.2"; - sha256 = "885eacdbca1a94b32eadcaaf20b87be7e293a09418007e0c77cc613ccaecc8eb"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers derive HUnit - lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, derive, HUnit, lens-simple, QuickCheck @@ -174642,21 +169249,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "uri-encode_1_5_0_4" = callPackage - ({ mkDerivation, base, bytestring, network-uri, text, utf8-string - }: - mkDerivation { - pname = "uri-encode"; - version = "1.5.0.4"; - sha256 = "f7ca380f88a3cc815cdffeb7cc714fbed4b9bd8da1a4ac3139e4ab001179f582"; - libraryHaskellDepends = [ - base bytestring network-uri text utf8-string - ]; - description = "Unicode aware uri-encoding"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-encode" = callPackage ({ mkDerivation, base, bytestring, network-uri, text, utf8-string }: @@ -174986,23 +169578,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "userid_0_1_2_6" = callPackage - ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes - , web-routes-th - }: - mkDerivation { - pname = "userid"; - version = "0.1.2.6"; - sha256 = "2a6972e25defb31b57055249888ec19565e0f1b884da1235ef1af76d11f44ab1"; - libraryHaskellDepends = [ - aeson base boomerang safecopy web-routes web-routes-th - ]; - homepage = "http://www.github.com/Happstack/userid"; - description = "The UserId type and useful instances for web development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "userid" = callPackage ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes , web-routes-th @@ -175067,7 +169642,6 @@ self: { base bytestring mtl postgresql-simple text time users uuid ]; testHaskellDepends = [ base hspec postgresql-simple users-test ]; - doCheck = false; homepage = "https://github.com/agrafix/users"; description = "A PostgreSQL backend for the users package"; license = stdenv.lib.licenses.mit; @@ -175159,19 +169733,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "utility-ht_0_0_11" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "utility-ht"; - version = "0.0.11"; - sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -175393,7 +169954,6 @@ self: { base bytestring HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -175421,20 +169981,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "uuid-orphans_1_3_11_1" = callPackage - ({ mkDerivation, base, safecopy, text, uuid-types, web-routes }: - mkDerivation { - pname = "uuid-orphans"; - version = "1.3.11.1"; - sha256 = "264028379dc6bfea1d84ebd6c745d666c51957430822b52480dd6413717a8b75"; - libraryHaskellDepends = [ - base safecopy text uuid-types web-routes - ]; - description = "Orphan instances for the UUID datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uuid-orphans" = callPackage ({ mkDerivation, base, safecopy, text, th-lift, uuid-types , web-routes @@ -175478,7 +170024,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -176192,7 +170737,6 @@ self: { test-framework-quickcheck2 transformers ]; jailbreak = true; - doCheck = false; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -176323,20 +170867,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-fftw_0_1_3_6" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.6"; - sha256 = "6ed9d7b6000fdc72d76e7d5a3bfe1441f67eee46bf6f814caf3c35524b000764"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw;}; - "vector-fftw" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { @@ -176468,8 +170998,8 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.10.3"; - sha256 = "efe39aa83d5ec5187c26f88496faf7411d3ee943cbc719797e58d115b004c885"; + version = "0.10.4"; + sha256 = "b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -176517,6 +171047,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-split" = callPackage + ({ mkDerivation, base, QuickCheck, split, tasty, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "vector-split"; + version = "1.0.0.0"; + sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base QuickCheck split tasty tasty-quickcheck vector + ]; + homepage = "https://github.com/fhaust/vector-split#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vector-static" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -176651,24 +171198,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "versions_2_0_0" = callPackage - ({ mkDerivation, base, either, megaparsec, microlens, semigroups - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "versions"; - version = "2.0.0"; - sha256 = "d8e18c140295e45e6b4f9c103c0c9d953a3baa769a0a364648074ad91623b7d2"; - libraryHaskellDepends = [ base megaparsec semigroups text ]; - testHaskellDepends = [ - base either microlens tasty tasty-hunit text - ]; - jailbreak = true; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "versions" = callPackage ({ mkDerivation, base, either, megaparsec, microlens, semigroups , tasty, tasty-hunit, text @@ -177228,7 +171757,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango @@ -177245,44 +171774,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; - - "vty_5_5_0" = 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.5.0"; - sha256 = "9e185e42aff3385767b2f025765d896d8f503719f08cc6484f1c12b795eca41d"; - 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; - }) {}; + }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers @@ -177456,6 +171948,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wahsp" = callPackage + ({ mkDerivation, aeson, base, data-default-class, kansas-comet + , natural-transformation, remote-monad, scotty, semigroups, stm + , text, wai-middleware-static + }: + mkDerivation { + pname = "wahsp"; + version = "0.2"; + sha256 = "e634e0743dbbf93f2dffc68b68a8cc86a7ee3b62a044932f192c5f491e81fe74"; + revision = "1"; + editedCabalFile = "145ecbcceca09e635f744466b1d439a6144cd83e3d0c74a2478e4470bbffbacd"; + libraryHaskellDepends = [ + aeson base data-default-class kansas-comet natural-transformation + remote-monad scotty semigroups stm text wai-middleware-static + ]; + jailbreak = true; + homepage = "https://github.com/nshaheed/WebAudioHs/"; + description = "A haskell binding of the Web Audio API ala blank-canvas"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text @@ -177528,43 +172042,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-app-static_3_1_5" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, cryptonite, directory, file-embed - , filepath, hspec, http-date, http-types, memory, mime-types - , network, old-locale, optparse-applicative, template-haskell - , temporary, text, time, transformers, unix-compat - , unordered-containers, wai, wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.5"; - sha256 = "28667193acfcc534752b715b5f5e16fc58edb550d03c0eb2b68e123e41030d4c"; - revision = "1"; - editedCabalFile = "c3f6628138ef318fc0a5a77949627b7ce06d149f53c21a2832b671664ea473de"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - cryptonite directory file-embed filepath http-date http-types - memory mime-types old-locale optparse-applicative template-haskell - text time transformers unix-compat unordered-containers wai - wai-extra warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - network old-locale temporary text time transformers unix-compat wai - wai-extra zlib - ]; - homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-app-static" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, cryptonite, directory, file-embed @@ -177634,10 +172111,10 @@ self: { process tasty tasty-hunit text wai wai-extra wai-websockets warp websockets ]; - doCheck = false; homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-devel" = callPackage @@ -177714,36 +172191,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_16_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.16.1"; - sha256 = "8f726e73e1895e30e260dd843159bce4cd10740dead9b1607884217bf0975157"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -177993,26 +172440,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-logger_2_2_7" = callPackage - ({ mkDerivation, base, blaze-builder, byteorder, bytestring - , case-insensitive, doctest, fast-logger, http-types, network, unix - , unix-time, wai - }: - mkDerivation { - pname = "wai-logger"; - version = "2.2.7"; - sha256 = "f4718c7661373b6a93fb7ac4b4662617f9e161f6b9297d0f665f71391e489607"; - libraryHaskellDepends = [ - base blaze-builder byteorder bytestring case-insensitive - fast-logger http-types network unix unix-time wai - ]; - testHaskellDepends = [ base doctest ]; - doCheck = false; - description = "A logging system for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-logger" = callPackage ({ mkDerivation, base, blaze-builder, byteorder, bytestring , case-insensitive, doctest, fast-logger, http-types, network, unix @@ -178027,7 +172454,6 @@ self: { fast-logger http-types network unix unix-time wai ]; testHaskellDepends = [ base doctest ]; - doCheck = false; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178050,27 +172476,29 @@ self: { }) {}; "wai-make-assets" = callPackage - ({ mkDerivation, base, bytestring, directory, getopt-generics - , hspec, http-types, lens, mockery, shake, silently - , string-conversions, wai, wai-app-static, warp, wreq + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, getopt-generics, hspec, http-types, lens, mockery + , shake, silently, string-conversions, wai, wai-app-static, warp + , wreq }: mkDerivation { pname = "wai-make-assets"; - version = "0.1.1"; - sha256 = "0e05db16a0d5d93439833d29b33aed97cd9b2093b99f8939ada104eded63877f"; + version = "0.2"; + sha256 = "7e871b15d889dc8f7d185eab424eff0362bf120e6b7a5e4e43eb2e411e7ad640"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory http-types shake string-conversions wai - wai-app-static warp + base bytestring data-default directory filepath http-types shake + string-conversions wai wai-app-static warp ]; executableHaskellDepends = [ - base bytestring directory getopt-generics http-types shake - string-conversions wai wai-app-static warp + base bytestring data-default directory filepath getopt-generics + http-types shake string-conversions wai wai-app-static warp ]; testHaskellDepends = [ - base bytestring directory hspec http-types lens mockery shake - silently string-conversions wai wai-app-static warp wreq + base bytestring data-default directory filepath hspec http-types + lens mockery shake silently string-conversions wai wai-app-static + warp wreq ]; homepage = "https://github.com/soenkehahn/wai-make-assets#readme"; description = "Compiling and serving assets"; @@ -178209,35 +172637,6 @@ self: { homepage = "https://github.com/fpco/wai-middleware-consul"; description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; - }) {}; - - "wai-middleware-content-type_0_4_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.4.0"; - sha256 = "bccf5fb49c39cde628d8e73b4afff934186cba6824a8b04501bb3fbada4229eb"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "A simple WAI library for responding with content"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178266,38 +172665,8 @@ self: { shakespeare tasty tasty-hspec text transformers transformers-base unordered-containers urlpath wai wai-transformers warp ]; - doCheck = false; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-middleware-crowd_0_1_4_1" = callPackage - ({ mkDerivation, authenticate, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, clientsession - , containers, cookie, gitrev, http-client, http-client-tls - , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, vault - , wai, wai-app-static, wai-extra, warp - }: - mkDerivation { - pname = "wai-middleware-crowd"; - version = "0.1.4.1"; - sha256 = "b9bf4c1fe892232a8f3adcaca9407f81cadd2a8926e763eb2ecb35b2e9674d2e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - authenticate base base64-bytestring binary blaze-builder bytestring - case-insensitive clientsession containers cookie http-client - http-client-tls http-types resourcet text time unix-compat vault - wai - ]; - executableHaskellDepends = [ - base bytestring clientsession gitrev http-client http-client-tls - http-reverse-proxy http-types optparse-applicative template-haskell - text transformers wai wai-app-static wai-extra warp - ]; - description = "Middleware and utilities for using Atlassian Crowd authentication"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178565,24 +172934,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-verbs_0_2_0" = callPackage - ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, transformers - , transformers-base, unordered-containers, wai - }: - mkDerivation { - pname = "wai-middleware-verbs"; - version = "0.2.0"; - sha256 = "5e88a38e8e838be9334b72a4dcec70874fe02c8b128dc7a64e682cacfb6ffbf3"; - libraryHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet transformers transformers-base unordered-containers wai - ]; - description = "Route different middleware responses based on the incoming HTTP verb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-verbs" = callPackage ({ mkDerivation, base, errors, exceptions, hashable, http-types , mmorph, monad-logger, mtl, resourcet, transformers @@ -178600,32 +172951,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-predicates_0_8_6" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, cookie, http-types - , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers - , vault, vector, wai - }: - mkDerivation { - pname = "wai-predicates"; - version = "0.8.6"; - sha256 = "7aba73c37a27975b37077b6f06d6c34488750ff022210e29a0966c68fafde918"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types singletons transformers vault vector wai - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types tasty - tasty-hunit tasty-quickcheck wai - ]; - jailbreak = true; - doCheck = false; - homepage = "https://gitlab.com/twittner/wai-predicates/"; - description = "WAI request predicates"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-predicates" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types @@ -178678,26 +173003,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-route_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck - , tasty, tasty-quickcheck, unordered-containers, wai - }: - mkDerivation { - pname = "wai-route"; - version = "0.3.1"; - sha256 = "6715210058c36baf8476f27807f1ac7ef9c190f5769d516f3edfeae4fb753aef"; - libraryHaskellDepends = [ - base bytestring http-types unordered-containers wai - ]; - testHaskellDepends = [ - base bytestring http-types mtl QuickCheck tasty tasty-quickcheck - wai - ]; - description = "Minimalistic, efficient routing for WAI"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-route" = callPackage ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck , tasty, tasty-quickcheck, unordered-containers, wai @@ -178757,32 +173062,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-routing_0_12_3" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, containers, cookie - , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers - , wai, wai-predicates, wai-route - }: - mkDerivation { - pname = "wai-routing"; - version = "0.12.3"; - sha256 = "9ce8d30b45ac65162589236b33f4ea417f784c70a1cc10b564880819d2620b0b"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types transformers wai wai-predicates wai-route - ]; - testHaskellDepends = [ - base blaze-builder bytestring bytestring-conversion - case-insensitive containers http-types tasty tasty-hunit - tasty-quickcheck wai wai-predicates - ]; - jailbreak = true; - homepage = "https://gitlab.com/twittner/wai-routing/"; - description = "Declarative routing for WAI"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -178896,10 +173175,10 @@ self: { testHaskellDepends = [ base bytestring data-default postgresql-simple text wai-session ]; - doCheck = false; homepage = "https://github.com/hce/postgresql-session#readme"; description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-tokyocabinet" = callPackage @@ -179038,32 +173317,6 @@ self: { license = "unknown"; }) {}; - "wai-websockets_3_0_0_9" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , file-embed, http-types, network, text, transformers, wai - , wai-app-static, warp, websockets - }: - mkDerivation { - pname = "wai-websockets"; - version = "3.0.0.9"; - sha256 = "a2476dcd0474a4d3322b4d0bbf0418eebb834ad03cecd43d1648d0c73c9f2883"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types network - transformers wai websockets - ]; - executableHaskellDepends = [ - base blaze-builder bytestring case-insensitive file-embed - http-types network text transformers wai wai-app-static warp - websockets - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provide a bridge between WAI and the websockets package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-websockets" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai @@ -179162,39 +173415,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "warp_3_2_7" = 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.7"; - sha256 = "ca8f59f9467151a453b5eaa6631d6ccb12ffabd4cd074bf32908e780b695f184"; - 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 - ]; - doCheck = false; - 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" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers @@ -179221,7 +173441,6 @@ self: { simple-sendfile stm streaming-commons text time transformers unix unix-compat vault wai word8 ]; - doCheck = false; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; @@ -179599,26 +173818,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "web-routes_0_27_10" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; - version = "0.27.10"; - sha256 = "1d0f5da073271aa45dbcc9ef51791841f45d13f16756cfe3c16d731e2dd67b4c"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "web-routes" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck @@ -179935,30 +174134,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "webdriver-angular_0_1_10" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-webdriver - , language-javascript, template-haskell, text, transformers - , unordered-containers, wai-app-static, warp, webdriver - }: - mkDerivation { - pname = "webdriver-angular"; - version = "0.1.10"; - sha256 = "93e341b71b93ecd09a9bdfeae6b5debb4b92832e647ed041f435a6ef0bc34c5b"; - libraryHaskellDepends = [ - aeson base language-javascript template-haskell text transformers - unordered-containers webdriver - ]; - testHaskellDepends = [ - base hspec hspec-webdriver transformers wai-app-static warp - webdriver - ]; - doCheck = false; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -179976,7 +174151,6 @@ self: { base hspec hspec-webdriver transformers wai-app-static warp webdriver ]; - doCheck = false; homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; @@ -180106,25 +174280,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; - "webkitgtk3_0_14_1_1" = callPackage - ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools - , gtk3, mtl, pango, text, transformers, webkit - }: - mkDerivation { - pname = "webkitgtk3"; - version = "0.14.1.1"; - sha256 = "a8edd6470fe9a6c82f98bc331d23f6c6fb6978b6d63f03f010e0c7e1000eb216"; - libraryHaskellDepends = [ - base bytestring cairo glib gtk3 mtl pango text transformers - ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Webkit library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit @@ -180143,22 +174298,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {webkit = null;}; - "webkitgtk3-javascriptcore_0_13_1_2" = callPackage - ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit - , webkitgtk3 - }: - mkDerivation { - pname = "webkitgtk3-javascriptcore"; - version = "0.13.1.2"; - sha256 = "974924ce394670a7b60126f78eaad2d9a023acab3dfc2472202f07998a95e1bd"; - libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { @@ -180229,35 +174368,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets_0_9_6_2" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.6.2"; - sha256 = "d772478ca85b4723cadbf7d73a16c15dea466fd1524d6fe323a2675106c93353"; - revision = "1"; - editedCabalFile = "fcc1f199941e5ee4a5047a74a550877c5e8e6abe1e104f27478324d9112ecd19"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy @@ -180284,23 +174394,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-snap_0_9_2_0" = callPackage - ({ mkDerivation, base, bytestring, enumerator, mtl, snap-core - , snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.9.2.0"; - sha256 = "b7c30525c8a3ba5aeaadccaf47efc23ac52885e520012df6fc813fbf1bf35f0f"; - libraryHaskellDepends = [ - base bytestring enumerator mtl snap-core snap-server websockets - ]; - jailbreak = true; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core , snap-server, websockets @@ -180435,37 +174528,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "werewolf_1_0_2_2" = callPackage - ({ mkDerivation, aeson, base, containers, directory, extra - , filepath, lens, MonadRandom, mtl, optparse-applicative - , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "werewolf"; - version = "1.0.2.2"; - sha256 = "ef55f17c0d3a49f1135e9691d1cf29dbd0b538c4ef941b20f2f7ca7fd407fa81"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers directory extra filepath lens MonadRandom mtl - text transformers - ]; - executableHaskellDepends = [ - aeson base directory extra filepath lens MonadRandom mtl - optparse-applicative random-shuffle text transformers - ]; - testHaskellDepends = [ - base containers extra lens MonadRandom mtl QuickCheck tasty - tasty-quickcheck text - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf"; - description = "A game engine for playing werewolf within an arbitrary chat client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf" = callPackage ({ mkDerivation, aeson, base, containers, directory, extra , filepath, interpolate, lens, MonadRandom, mtl @@ -180491,28 +174553,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "werewolf-slack_1_0_1_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, extra, http-client - , http-client-tls, http-types, mtl, optparse-applicative, process - , text, wai, warp, werewolf - }: - mkDerivation { - pname = "werewolf-slack"; - version = "1.0.1.4"; - sha256 = "273414f32d25d2dcd8d4445b9055d8e59e68ffdd3f2e6e625de1e6a89b33d450"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring extra http-client http-client-tls http-types - mtl optparse-applicative process text wai warp werewolf - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf-slack"; - description = "A chat interface for playing werewolf in Slack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf-slack" = callPackage ({ mkDerivation, aeson, base, bytestring, extra, http-client , http-client-tls, http-types, mtl, optparse-applicative, process @@ -181342,6 +175382,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "workflow-types" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, Earley + , exceptions, free, hashable, semigroups, split, transformers + }: + mkDerivation { + pname = "workflow-types"; + version = "0.0.0"; + sha256 = "54991eaf641bdf43e0d3e99bee650fa6ae2690adeb34d0f6378b5a0d93aaafa7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base comonad containers deepseq Earley exceptions free hashable + semigroups split transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/sboosali/workflow-types#readme"; + description = "Automate keyboard\/mouse\/clipboard\/application interaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "workflow-windows" = callPackage + ({ mkDerivation, base, doctest, hspec, QuickCheck }: + mkDerivation { + pname = "workflow-windows"; + version = "0.0.0"; + sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + jailbreak = true; + homepage = "http://github.com/sboosali/workflow-windows#readme"; + description = "Automate keyboard/mouse/clipboard/application interaction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -181403,6 +175480,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wrecker" = callPackage + ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, base + , bytestring, clock, clock-extras, deepseq, hspec, hspec-discovery + , http-client, http-types, next-ref, optparse-applicative + , statistics, stm, stm-chans, tabular, text, threads + , threads-extras, time, unagi-chan, unix, unordered-containers + , vector, vty + }: + mkDerivation { + pname = "wrecker"; + version = "0.1.0.1"; + sha256 = "ab82b2795d70901ce63b25215e03cad28ba57dba4dadb51b44712a84fb965eb0"; + libraryHaskellDepends = [ + aeson aeson-qq ansi-terminal ansigraph base bytestring clock + clock-extras deepseq http-client http-types next-ref + optparse-applicative statistics stm stm-chans tabular text threads + threads-extras time unagi-chan unix unordered-containers vector vty + ]; + testHaskellDepends = [ base hspec hspec-discovery ]; + jailbreak = true; + homepage = "https://github.com/skedgeme/wrecker#readme"; + description = "A HTTP Performance Benchmarker"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {hspec-discovery = null;}; + "wreq" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -181436,7 +175539,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text time transformers unix-compat uuid vector ]; - doCheck = false; homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; @@ -181694,22 +175796,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wuss_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.0.4"; - sha256 = "11a0072c4986d6aa60f686cf9fd29b58077706ab27aabad18d01e5942a179155"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - homepage = "https://github.com/tfausak/wuss#readme"; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wuss" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: @@ -181968,6 +176054,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509_1_6_4" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.6.4"; + sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, mtl, pem, x509 @@ -182041,12 +176150,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_4" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.4"; + sha256 = "ad14ca56c70964fee09a5ff06f738ea7bdff599be27baed24a35115efc5967a4"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x86-64bit" = callPackage ({ mkDerivation, base, monads-tf, QuickCheck, tardis, vector }: mkDerivation { pname = "x86-64bit"; - version = "0.3"; - sha256 = "cd8115c071ac2e4a9961f9a0ffe2a1733abe44f677f8cce8a0a6fcf6bda69af7"; + version = "0.3.1"; + sha256 = "8ace704629ca875748dc7d60b5dbd3b4ac029035e0298f874182a5dec8228628"; libraryHaskellDepends = [ base monads-tf QuickCheck tardis vector ]; @@ -182163,50 +176292,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "xdcc_1_0_4" = callPackage - ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive - , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp - , irc-dcc, lifted-base, network, optparse-applicative, path, random - , simpleirc, transformers, unix-compat - }: - mkDerivation { - pname = "xdcc"; - version = "1.0.4"; - sha256 = "ca6eec53d1229c85d50b64ff08ef4304c795c2fae5e96e730c25d42dbb41a9e9"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ascii-progress base bytestring case-insensitive concurrent-extra - concurrent-output errors iproute irc-ctcp irc-dcc lifted-base - network optparse-applicative path random simpleirc transformers - unix-compat - ]; - jailbreak = true; - homepage = "https://github.com/JanGe/xdcc"; - description = "A wget-like utility for retrieving files from XDCC bots on IRC"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xdcc" = callPackage ({ mkDerivation, ascii-progress, async, base, bytestring - , case-insensitive, concurrent-extra, concurrent-output, errors - , iproute, irc-client, irc-conduit, irc-ctcp, irc-dcc, lifted-base - , network, optparse-applicative, path, random, safe-exceptions, stm - , text, text-format, transformers, unix-compat + , case-insensitive, concurrent-output, errors, iproute, irc-client + , irc-dcc, monad-control, network, optparse-applicative, path + , random, safe-exceptions, signal, stm, text, transformers + , transformers-base, unix-compat }: mkDerivation { pname = "xdcc"; - version = "1.1.2"; - sha256 = "d3268b0e1ffc28dabd33ffdc8c5f2e632b114002b5b3cc1d6836faa2d640b35d"; + version = "1.1.3"; + sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ascii-progress async base bytestring case-insensitive - concurrent-extra concurrent-output errors iproute irc-client - irc-conduit irc-ctcp irc-dcc lifted-base network - optparse-applicative path random safe-exceptions stm text - text-format transformers unix-compat + concurrent-output errors iproute irc-client irc-dcc monad-control + network optparse-applicative path random safe-exceptions signal stm + text transformers transformers-base unix-compat ]; homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; @@ -182535,26 +176638,28 @@ self: { base blaze-markup bytestring text time time-locale-compat zip-archive ]; - doCheck = false; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xlsx_0_2_3" = callPackage + "xlsx" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, extra, filepath, groom - , lens, mtl, network-uri, old-locale, raw-strings-qq, safe - , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time - , transformers, vector, xml-conduit, zip-archive, zlib + , conduit, containers, data-default, Diff, errors, extra, filepath + , groom, lens, mtl, mtl-compat, network-uri, old-locale + , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xml-conduit + , zip-archive, zlib }: mkDerivation { pname = "xlsx"; - version = "0.2.3"; - sha256 = "c1170f83d96c4fd500b2a09aa016d6e52668cabf5442e5ba7aa5c64b0e817563"; + version = "0.2.4"; + sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers - data-default extra filepath lens mtl network-uri old-locale safe - text time transformers vector xml-conduit zip-archive zlib + data-default errors extra filepath lens mtl mtl-compat network-uri + old-locale safe text time transformers vector xml-conduit + zip-archive zlib ]; testHaskellDepends = [ base bytestring containers Diff groom lens mtl raw-strings-qq @@ -182564,10 +176669,9 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xlsx" = callPackage + "xlsx_0_3_0" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath , groom, lens, mtl, mtl-compat, network-uri, old-locale @@ -182577,8 +176681,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.2.4"; - sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40"; + version = "0.3.0"; + sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -182593,6 +176697,7 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-tabular" = callPackage @@ -182612,6 +176717,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xlsx-tabular_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , lens, text, xlsx + }: + mkDerivation { + pname = "xlsx-tabular"; + version = "0.1.0.2"; + sha256 = "0650c6e22c4b1f2be1d91a62cdf6160a17f2a18cfe7918cc30523a923218689d"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default lens text xlsx + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/kkazuo/xlsx-tabular#readme"; + description = "Xlsx table decode utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-templater" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, parsec, text, time, transformers, xlsx @@ -183171,30 +177294,10 @@ self: { base bytestring containers filepath HUnit hxt process QuickCheck text unix ]; - doCheck = false; description = "Fast XML generation library"; license = stdenv.lib.licenses.bsd3; }) {}; - "xmlhtml_0_2_3_4" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, parsec, text, unordered-containers - }: - mkDerivation { - pname = "xmlhtml"; - version = "0.2.3.4"; - sha256 = "d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533"; - revision = "1"; - editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - parsec text unordered-containers - ]; - description = "XML parser and renderer with HTML 5 quirks mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xmlhtml" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, directory, HUnit, parsec, QuickCheck @@ -183321,7 +177424,6 @@ self: { testHaskellDepends = [ base containers extensible-exceptions QuickCheck X11 ]; - doCheck = false; postInstall = '' shopt -s globstar mkdir -p $out/share/man/man1 @@ -183994,7 +178096,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_8_18_1" = callPackage + "yaml" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -184002,8 +178104,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.18.1"; - sha256 = "24610e879d243dd7307123d076d436197f7e28bee5d6a78cafe444833cc9ac7a"; + version = "0.8.18.6"; + sha256 = "587f913263bf871190c24aff57808f346b72906f23ed9c1bb96e9aca63732e0a"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -184015,25 +178117,26 @@ self: { libraryPkgconfigDepends = [ libyaml ]; executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit hspec HUnit - mockery resourcet text transformers unordered-containers vector + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet text transformers unordered-containers + vector ]; homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage + "yaml_0_8_18_7" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, text, transformers, unordered-containers, vector + , semigroups, temporary, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "yaml"; - version = "0.8.18.5"; - sha256 = "90875ae906872f0b2d3cc38f265f11347c80643d4b64a6c5965183e1b700e5c3"; + version = "0.8.18.7"; + sha256 = "b8cebafe9294b34258114b8ea5576d26c2d0070645ab9bfc84000b367931a944"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -184046,13 +178149,13 @@ self: { executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet text transformers unordered-containers - vector + HUnit mockery resourcet temporary text transformers + unordered-containers vector ]; - doCheck = false; homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -184553,37 +178656,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth_1_4_13_3" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.13.3"; - sha256 = "38380dcc421848882e1f0c4bdc01b24f8a007748ee1354185c0bff52aada5344"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html @@ -184613,31 +178685,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth-account_1_4_2" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger - , mtl, nonce, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-account"; - version = "1.4.2"; - sha256 = "38d5c5795a6acb487f408b0bd7ab3fd874f3d99c5df94202dcbb436847e7eef3"; - libraryHaskellDepends = [ - base blaze-html bytestring mtl nonce persistent pwstore-fast text - yesod-auth yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base bytestring hspec monad-logger mtl persistent-sqlite resourcet - text xml-conduit yesod yesod-auth yesod-test - ]; - jailbreak = true; - homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; - description = "An account authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -184765,33 +178812,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-hashdb_1_5_1_1" = callPackage - ({ mkDerivation, base, basic-prelude, bytestring, containers - , cryptohash, hspec, http-conduit, http-types, monad-logger - , network-uri, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.5.1.1"; - sha256 = "399d76adbee53b80af091b360ebe61ef8e013e13fc40226d0464f7076865bc23"; - libraryHaskellDepends = [ - base bytestring cryptohash persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text wai-extra yesod yesod-auth yesod-core yesod-test - ]; - jailbreak = true; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-hashdb" = callPackage ({ mkDerivation, base, basic-prelude, bytestring, containers , cryptohash, hspec, http-conduit, http-types, monad-logger @@ -184801,8 +178821,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.5.1.2"; - sha256 = "95937003779f9024c65f960022dafcd125b28ae4de24b5b7be66b1dd9d4d5a66"; + version = "1.5.1.3"; + sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a"; libraryHaskellDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -184905,28 +178925,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-oauth2_0_1_10" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , hspec, http-client, http-conduit, http-types, lifted-base - , network-uri, random, text, transformers, vector, yesod-auth - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-auth-oauth2"; - version = "0.1.10"; - sha256 = "90b3748945e1661311d2ca791f82df8fcb0172e4266f5751374340686eb6e72b"; - libraryHaskellDepends = [ - aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base network-uri random text transformers vector - yesod-auth yesod-core yesod-form - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; - description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , hspec, http-client, http-conduit, http-types, lifted-base @@ -185002,40 +179000,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-bin_1_4_18_2" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.18.2"; - sha256 = "4cfd0c6bb3a77e7d126a17e9d11fc50325afdb89c8ed04b9692f1e7948724151"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat unix-compat unordered-containers - wai wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-bin" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra @@ -185154,47 +179118,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core_1_4_22" = 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.22"; - sha256 = "21329336daff5825005efa5905a305e764f2db95e0e43e5d0f0a85fac8bcf124"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive @@ -185581,10 +179504,10 @@ self: { file-embed hedis lens monad-logger stm text time uuid yesod ]; testHaskellDepends = [ base ]; - doHaddock = false; homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme"; description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-json" = callPackage @@ -185745,30 +179668,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-persistent_1_4_0_5" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.0.5"; - sha256 = "e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-persistent" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet @@ -186176,42 +180075,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static_1_5_0_3" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, file-embed, filepath, hashable, hjsmin - , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.0.3"; - sha256 = "a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory file-embed - filepath hashable hjsmin http-types mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra @@ -186266,7 +180129,6 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; - doCheck = false; homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -186300,33 +180162,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-test_1_5_1_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, text, time, transformers, wai - , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.1.1"; - sha256 = "0886927c92ddc59608902c6fb02b8e8b9e631120dd6e75db764a95b5a75b0160"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-test" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie @@ -186688,27 +180523,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yi-rope_0_7_0_1" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.7.0.1"; - sha256 = "e0d56d061a7b5e44d0b82290e7c03ef0c5cf278071c8264a23feb7bd725919a4"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yi-rope" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck @@ -187438,35 +181252,11 @@ self: { base bytestring conduit containers exceptions filepath hspec path path-io QuickCheck text time transformers ]; - doCheck = false; homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; }) {}; - "zip-archive_0_2_3_7" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.2.3.7"; - sha256 = "41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699"; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process time - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zip;}; - "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty @@ -187474,8 +181264,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.3.0.4"; - sha256 = "67a463b23e1694ad7d4d1f6815b009288c9b585bc411eb1754396b830eba8f92"; + version = "0.3.0.5"; + sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7"; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib @@ -187614,7 +181404,6 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; jailbreak = true; - doCheck = false; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh index 471b2c81584e..223d19b70f03 100644 --- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh +++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh @@ -2,4 +2,4 @@ COMMAND=$1 shift -exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@" +exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@" diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 3cb1efbce739..bf7fd18f820a 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,7 +23,7 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, rehoo, writeText +{ lib, stdenv, hoogle, writeText , ghc, packages ? [ ghc.ghc ] }: @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { name = "hoogle-local-0.1"; - buildInputs = [hoogle rehoo]; + buildInputs = [ghc hoogle]; phases = [ "buildPhase" ]; @@ -68,22 +68,11 @@ stdenv.mkDerivation { mkdir -p $out/share/doc/hoogle - function import_dbs() { - find $1 -name '*.txt' | while read f; do - newname=$(basename "$f" | tr '[:upper:]' '[:lower:]') - if [[ -f $f && ! -f ./$newname ]]; then - cp -p $f "./$newname" - hoogle convert -d "$(dirname $f)" "./$newname" - fi - done - } - echo importing builtin packages for docdir in ${ghc.doc}/${docLibGlob}/*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then - import_dbs $docdir ln -sfn $docdir $out/share/doc/hoogle/$name fi done @@ -92,10 +81,9 @@ stdenv.mkDerivation { for i in $docPackages; do if [[ ! $i == $out ]]; then for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do - name=`basename $docdir` + name="$(basename $docdir)" docdir=$docdir/html if [[ -d $docdir ]]; then - import_dbs $docdir ln -sfn $docdir $out/share/doc/hoogle/$name fi done @@ -103,13 +91,7 @@ stdenv.mkDerivation { done echo building hoogle database - # FIXME: rehoo is marked as depricated on Hackage - chmod 644 *.hoo *.txt - rehoo -j$NIX_BUILD_CORES -c64 . - - mv default.hoo .x - rm -fr downloads *.dep *.txt *.hoo - mv .x $out/share/doc/hoogle/default.hoo + hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle echo building haddock index # adapted from GHC's gen_contents_index diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index e96200578de5..246a9f305dba 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -62,6 +62,8 @@ rec { doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); + sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; buildPhase = "./Setup sdist"; diff --git a/pkgs/development/haskell-modules/patches/spy.patch b/pkgs/development/haskell-modules/patches/spy.patch deleted file mode 100644 index 4c4e1844361b..000000000000 --- a/pkgs/development/haskell-modules/patches/spy.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/Spy/Watcher.hs b/src/Spy/Watcher.hs - index 8512613..4df67d4 100644 ---- a/src/Spy/Watcher.hs -+++ b/src/Spy/Watcher.hs -@@ -50,7 +50,7 @@ plainFormat = Plain - spy :: Spy -> IO b -> IO () - spy config after = withManager $ \wm -> - runIndefinitely -- (watchTree wm (decodeString $ dir config) -+ (watchTree wm (dir config) - (not . skipEvent config . eventPath) - (handleEvent config)) - (const after) -@@ -106,9 +106,9 @@ eventTime (Modified _ t) = t - eventTime (Removed _ t) = t - - eventPath :: Event -> FilePath --eventPath (Added fp _) = encodeString fp --eventPath (Modified fp _) = encodeString fp --eventPath (Removed fp _) = encodeString fp -+eventPath (Added fp _) = fp -+eventPath (Modified fp _) = fp -+eventPath (Removed fp _) = fp - - eventType :: Event -> FilePath - eventType (Added _ _) = "Added" diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 0a8d41ed9094..6999ee07e3d0 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy"; + sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index d6f385f5b503..a89f4b1e5d71 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.lua.org/ftp/lua-4.0.1.tar.gz; - md5 = "a31d963dbdf727f9b34eee1e0d29132c"; + sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; }; configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9ae5865b0d7f..811b1a3817c3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -305,7 +305,7 @@ in { }; php70 = generic { - version = "7.0.10"; - sha256 = "1ppn17n5klhs1b2mcbbxxiqq4xvdbmv8p866q0qnk61nlzjvnmc0"; + version = "7.0.11"; + sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr"; }; } diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 213f5dabe799..c0bd10a0d437 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.4.0"; + majorVersion = "5.4.1"; version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1jm4ak6rbqhdhm8gjbd5hanabskbyzhzvjcl93fj0i017yirw88i"; + sha256 = "1x8sa5x1nkrb8wrmicri94ji8kvyxihyryi8br5fk7gak0agcai0"; }; # http://bugs.python.org/issue27369 @@ -32,14 +32,6 @@ let patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' ''; - # Increase recursion limit. This patch is not needed on pypy > 5.4.0 - patches = [ - (fetchurl { - url = "https://bitbucket.org/pypy/pypy/commits/a5db0f4359abb3f64b6d7ed83202e1cb0de37fb2/raw/"; - sha256 = "07nvqjhj0kl67f3kjwhmybaqg6089ps3q8r0si1lgk3gyb56ygn0"; - }) - ]; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ba39965cb351..b4bd532dc1d9 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -8,7 +8,7 @@ let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; env = ( let - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; + paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; in buildEnv { name = "${python.name}-env"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6ab527b7ccfe..8e462ffaacc7 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper , cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp, gtk, libffi, libjpeg, libpng +, glib, gmp, gtk2, libffi, libjpeg, libpng , libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? true @@ -17,7 +17,7 @@ let fontconfig glib gmp - gtk + gtk2 libjpeg libpng mpfr diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8450def08452..caaa826ae67d 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib , gtk_doc, autoconf, automake, libtool, libarchive, libyaml , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib +, libuuid, json_glib, autoconf-archive }: stdenv.mkDerivation rec { - name = "appstream-glib-0.5.12"; + name = "appstream-glib-0.6.3"; src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s"; + sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ]; buildInputs = [ glib gtk_doc gettext sqlite libsoup gcab attr acl docbook_xsl libuuid json_glib libarchive libyaml gtk3 gobjectIntrospection ]; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 70e7b1c33c0d..9b6ba128512c 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, gettext, qt4 +{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ gtk qt4 gnutls libgcrypt ]; + buildInputs = [ gtk2 qt4 gnutls libgcrypt ]; QTDIR = qt4; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index cda126218ba6..fad8dc86bd14 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }: +{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }: stdenv.mkDerivation rec { name = "lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks"; }; - buildInputs = [ gtk libsndfile pkgconfig python ]; + buildInputs = [ gtk2 libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index a56425b8425b..c74c8caa23fd 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }: stdenv.mkDerivation rec { name = "lvtk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python ]; - buildInputs = [ boost gtkmm lv2 ]; + buildInputs = [ boost gtkmm2 lv2 ]; + + enableParallelBuilding = true; # Fix including the boost libraries during linking postPatch = '' diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 789846c15e7d..97d7dd831551 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: +{ stdenv, fetchsvn, boost, gtk2, pkgconfig, python }: stdenv.mkDerivation rec { name = "raul-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4"; }; - buildInputs = [ boost gtk pkgconfig python ]; + buildInputs = [ boost gtk2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f5a98750ded4..518f89092ab3 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: +{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: stdenv.mkDerivation rec { name = "suil-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; }; - buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; + buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index d3754ecd6c62..a3cdbbf28272 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk2 }: stdenv.mkDerivation rec { name = "clutter-gtk-0.10.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq"; }; - propagatedBuildInputs = [ clutter gtk ]; + propagatedBuildInputs = [ clutter gtk2 ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 980155c007a9..fb5431ff8d59 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }: +{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-2010-02-21-git"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ]; + buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix new file mode 100644 index 000000000000..672a89cc3c02 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: + +stdenv.mkDerivation rec { + name = "czmqpp-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "czmqpp"; + rev = "v${version}"; + sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + propagatedBuildInputs = [ czmq ]; + + # https://github.com/zeromq/czmqpp/issues/42 + patches = [ ./socket.patch ]; +} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch new file mode 100644 index 000000000000..0464bcf77971 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/socket.patch @@ -0,0 +1,17 @@ +--- /src/socket.cpp ++++ /src/socket.cpp +@@ -60,12 +60,12 @@ + int socket::bind(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_bind(self_, address.c_str()); ++ return zsocket_bind(self_, "%s", address.c_str()); + } + int socket::connect(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_connect(self_, address.c_str()); ++ return zsocket_connect(self_, "%s", address.c_str()); + } + + bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 5c2ef0f6b4e0..af83068e5ad6 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd }: +, pygobject2, gst_python, gupnp_igd }: stdenv.mkDerivation rec { name = "farsight2-0.0.31"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; }; - buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index a57c3da333e2..27bff62bd656 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base -, pygobject, gst-python, gupnp_igd +, pygobject2, gst-python, gupnp_igd , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j"; }; - buildInputs = [ libnice python pygobject gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 91d2c84252f0..8c6f60b98010 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib}: +{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}: stdenv.mkDerivation { name = "freetts-1.2.2"; @@ -6,11 +6,11 @@ stdenv.mkDerivation { url = mirror://sourceforge/freetts/freetts-1.2.2-src.zip; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; - buildInputs = [ apacheAnt unzip sharutils ]; + buildInputs = [ apacheAnt unzip sharutils jdk ]; unpackPhase = '' unzip $src -x META-INF/* ''; - + buildPhase = '' cd */lib sed -i -e "s/more/cat/" jsapi.sh @@ -23,7 +23,7 @@ stdenv.mkDerivation { install -v -m755 -d $out/{lib,docs/{audio,images}} install -v -m644 lib/*.jar $out/lib ''; - + meta = { description = "Text to speech system based on Festival written in Java"; longDescription = '' diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index eef89e9cff63..6af09bd51795 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: +{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { name = "ganv-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; }; - buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + buildInputs = [ graphviz gtkmm2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index b54b3a38e764..304d8110ad46 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool , OpenGL ? null }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 754c85ecf030..9aba42fdf4bf 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt }: +{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; - buildInputs = [ pkgconfig libxml2 gnome.GConf libxslt ]; + buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ]; propagatedBuildInputs = [dbus glib dbus_glib]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index ad5220cac4e9..804da49fda93 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "gio-sharp-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 59f97e46bef0..f95d0720d830 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, mono, gtk-sharp, gnome}: +{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: stdenv.mkDerivation { name = "gnome-sharp-2.24.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; }; - buildInputs = [ pkgconfig gtk mono gtk-sharp ] - ++ (with gnome; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + buildInputs = [ pkgconfig gtk2 mono gtk-sharp-2_0 ] + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); patches = [ ./Makefile.in.patch ]; diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 2a48d045c515..4ca991b9667a 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.14"; + version = "3.4.15"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23"; + sha256 = "161lbs0ijkkc94xx6yz87q36a055hl6d5hdwyz5s1wpm0lwh2apb"; }; }) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index db35a13cc411..b85859f0e624 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"; + sha256 = "1sx8p7v452s9m854r2c5pvcd1k15a3caiv5h35fhrxz0691h2f2f"; }; }) diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix index 75a7dfb48980..2da683fcbeb7 100644 --- a/pkgs/development/libraries/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext , cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango + glib libgsf libxml2 gtk2 libglade libart cairo pango ]; postInstall = diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 5a367e1d593a..080b781ca31a 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig }: stdenv.mkDerivation rec { majVersion = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - buildInputs = [ gtk cairo glib pkgconfig ]; + buildInputs = [ gtk2 cairo glib pkgconfig ]; meta = { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5fa14e64a22f..8eb79b27fdc6 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, unzip, libunwind }: +{ stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.4"; + name = "gperftools-2.5"; src = fetchurl { - url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.4.tar.gz"; - sha256 = "0b8aqgch8dyapzw2zd9g89x6gsnm2ml0gf169rql0bxldqi3falq"; + url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; + sha256 = "0wsix3lhkpjv8lxmcbml549mfwifdv7n1qak09slvx6d3a7p98kg"; }; - buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isLinux libunwind; + buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ vcunat wkennington ]; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index 249eb9a30da7..b8a18d70af97 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer -, gst_plugins_base, pygobject +, gst_plugins_base, pygobject2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-testFake.patch ]; buildInputs = - [ pkgconfig gst_plugins_base pygobject ] + [ pkgconfig gst_plugins_base pygobject2 ] ; propagatedBuildInputs = [ gstreamer python ]; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 8d8a018f1fe0..1931624d08f2 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}: +{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; }; buildInputs = [ - cdk unzip gtk glib ncurses pkgconfig + cdk unzip gtk2 glib ncurses pkgconfig ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 92578f42e341..b92bbf64514e 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { name = "gtk-sharp-beans-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook which ]; - buildInputs = [ mono gtk-sharp gio-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index a8667770271e..ca6c4d0dfa63 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, mono , glib , pango -, gtk +, gtk2 , GConf ? null , libglade ? null , libgtkhtml ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; buildInputs = [ - pkgconfig mono glib pango gtk GConf libglade libgnomecanvas + pkgconfig mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { inherit monoDLLFixer; passthru = { - inherit gtk; + gtk = gtk2; }; meta = { diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 6e5a1329c9b2..82c4f25f66c9 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.2.0"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gtk ]; + propagatedBuildInputs = [ gtk2 ]; meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index d88160361ca5..eb0ba2db1030 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk }: +{ fetchurl, stdenv, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; preConfigure = '' sed '/DEPRECATED_FLAGS/d' -i configure diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 8a6914cfcd3b..e36d77142e92 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, t1lib, glib, libxml2, popt, gmetadom ? null }: +{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - buildInputs = [pkgconfig gtk t1lib glib gmetadom libxml2 popt]; - propagatedBuildInputs = [gtk t1lib]; + buildInputs = [pkgconfig t1lib glib gmetadom libxml2 popt]; + propagatedBuildInputs = [gtk2 t1lib]; patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; + broken = true; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 76175859e7d4..b87b60c59da9 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; doCheck = true; diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index 512d443f9fc7..52fc4b26e6da 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk, monoDLLFixer}: +{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk2, monoDLLFixer}: stdenv.mkDerivation { name = "gtkmozembed-sharp-0.7-pre41601"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig mono gtksharp gtk + pkgconfig mono gtksharp gtk2 ]; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index daf400fdc5a5..22b96abf6429 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk enchant intltool]; + buildInputs = [aspell pkgconfig gtk2 enchant intltool]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 37403f50e2b1..5ef8bbac5d16 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, dbus, udev, libgudev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, samba, libmtp -, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }: +, gnomeSupport ? false, gnome, libgnome_keyring, makeWrapper }: let ver_maj = "1.22"; diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index 3793a14b4dcc..34c3d26c55ec 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation { buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; - inherit (hunspell) meta; -} \ No newline at end of file + meta = removeAttrs hunspell.meta ["outputsToInstall"]; +} diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 00d3e45805cb..2c1ca6aeb1e8 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp, monoDLLFixer }: +{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { name = "hyena-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig mono gtk-sharp + pkgconfig mono gtk-sharp-2_0 ]; postPatch = '' diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 889137d62840..9fb2a2a2e3a1 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }: +{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }: stdenv.mkDerivation rec { name = "classpath-0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ]; + buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index c3053e1f2681..2cf08e345758 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk +{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 , libXt, libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk libXt libXtst libXi mesa webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 78644200e0b1..8fda2b7e5843 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -11,11 +11,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz"; - sha256 = "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb"; + sha256 = "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind"; }; configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0ab24df57bad..2bd1f0a48ac3 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk2, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk_doc, gtk2, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 581e6e70b711..5c8e1759a2d8 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk3, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygtk +, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 07689fbdd277..54196ae48ffe 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,13 +3,15 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.26"; + name = "ldb-1.1.27"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1rmjv12pf57vga8s5z9p9d90rlfckc1lqjbcp89r83cq5fkwfhw8"; + sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ python pkgconfig readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 @@ -24,6 +26,8 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + stripDebugList = "bin lib modules"; + meta = with stdenv.lib; { description = "A LDAP-like embedded database"; homepage = http://ldb.samba.org/; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 4cf0c52d88b8..af5942fcd54b 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,8 +5,8 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23 -, monoSupport ? false, mono ? null, gtk-sharp ? null +, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23 +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib - python pygobject pygtk gobjectIntrospection vala_0_23 + python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 0c5f900dd412..b2b007765820 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,12 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz, lzo -, sharutils }: +{ + fetchurl, stdenv, pkgconfig, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, + + # Optional but increases closure only negligibly. + xarSupport ? true, +}: + +assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; @@ -10,18 +17,24 @@ stdenv.mkDerivation rec { sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; }; - buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ - stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] + ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + ++ stdenv.lib.optional xarSupport libxml2; # Without this, pkgconfig-based dependencies are unhappy propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; + preBuild = if stdenv.isCygwin then '' echo "#include <windows.h>" >> config.h '' else null; preFixup = '' - sed -i $out/lib/libarchive.la \ + sed -i $lib/lib/libarchive.la \ -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; @@ -31,7 +44,7 @@ stdenv.mkDerivation rec { longDescription = '' This library has code for detecting and reading many archive formats and compressions formats including (but not limited to) tar, shar, cpio, zip, and - compressed with gzip, bzip2, lzma, xz, .. + compressed with gzip, bzip2, lzma, xz, ... ''; homepage = http://libarchive.org; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 053d6ba8e7d4..4037de5a9cf7 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,13 +1,14 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite , clutter_gtk, libsoup /*, libmemphis */ }: -let version = "0.12.13"; in stdenv.mkDerivation rec { + major = "0.12"; + version = "${major}.14"; name = "libchamplain-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz"; - sha256 = "1arzd1hsgq14rbiwa1ih2g250x6ljna2s2kiqfrw155c612s9cxk"; + url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; + sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index dbe818ba561c..15e0fbc6f796 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libconfuse-${version}"; - version = "2.8"; + version = "3.0"; src = fetchFromGitHub { - sha256 = "0s0asxnml4rlv17ijz5w57x949anag28wx7wdahqx6mgqz0w2j2k"; + sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 142025c1e51d..d2c202b970a1 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchsvn, python }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "ctemplate-${version}"; version = "2.3"; - src = fetchsvn { - url = "http://ctemplate.googlecode.com/svn/tags/${name}"; - sha256 = "1kvh82mhazf4qz7blnv0rcax7vi524dmz6v6rp89z2h3qjilbvc7"; + src = fetchurl { + url = "https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-${version}.tar.gz"; + sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index f4f3c7747899..32eb4e04f03c 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23 +{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ] + buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index d30ea6e5324b..01dd6b0d49eb 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgeotiff-1.2.5"; src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; + url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index b86eba685bbb..0de84b1141dc 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk, gnome, gnome3, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo }: @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser + gtk2 gnome2.GConf libstartup_notification + gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index b4b951325a40..706e6a714c1a 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen, - monoSupport ? true, mono, gtk-sharp + libimobiledevice, python, pygobject2, mutagen, + monoSupport ? true, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; + gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 514aea12c7e4..9fb22eee6b24 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,8 +4,8 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils -, monoSupport ? false, mono ? null, gtk-sharp ? null +, python, pygobject2, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils ] ++ (if gtkVersion == "2" - then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 3e88ed99b85b..d13a9050dc9d 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -3,7 +3,7 @@ , documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: +, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] - ++ optional gtkWidgets gtk + ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index afc8a44397d8..a3b011629141 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.3.3"; + name = "libinput-${version}"; + version = "1.5.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1kmiv1mcrxniigdcs65w23897mczsx0hasxc6p13hjk58zzfvj1h"; + sha256 = "0708259k2qpdyi8z8n74d2pprjdvivmqkskjkq7s7ypchn9mb5js"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 0cf07d0769ad..6f833ec81a92 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: +{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; - buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 pkgconfig ]; preBuild = '' diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix new file mode 100644 index 000000000000..39806d7d22c3 --- /dev/null +++ b/pkgs/development/libraries/libite/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: + +stdenv.mkDerivation rec { + name = "libite-${version}"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "libite"; + rev = "v${version}"; + sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libconfuse ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Lightweight library of frog DNA"; + longDescription = '' + Libite is a lightweight library of frog DNA. It can be used to fill + the gaps in any dinosaur project. It holds useful functions and macros + developed by both Finit and the OpenBSD project. Most notably the + string functions: strlcpy(3), strlcat(3) and the highly useful *BSD + sys/queue.h and sys/tree.h API's. + + Libite is the frog DNA missing in GNU libc. However, -lite does not + aim to become another GLIB! One noticeable gap in GLIBC is the missing + _SAFE macros in the BSD sys/queue.h API — highly recommended when + traversing lists to delete/free nodes. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + }; +} + diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 9171471882ca..69c30b7cca4b 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -8,8 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn"; }; + outputs = [ "out" "dev" "doc" ]; + propagatedBuildInputs = [ libgpgerror ]; + postInstall = '' + mkdir -p $dev/bin + mv $out/bin/*-config $dev/bin/ + rmdir --ignore-fail-on-non-empty $out/bin + ''; + meta = with stdenv.lib; { homepage = https://www.gnupg.org; description = "CMS and X.509 access library"; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix new file mode 100644 index 000000000000..827f18d2ffc9 --- /dev/null +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmaxminddb-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + }; + + meta = with stdenv.lib; { + description = "C library for working with MaxMind geolocation DB files"; + homepage = "https://github.com/maxmind/libmaxminddb"; + license = licenses.apsl20; + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix new file mode 100644 index 000000000000..3905ba1b2716 --- /dev/null +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, boost, mysql }: + +stdenv.mkDerivation rec { + name = "libmysqlconnectorcpp-${version}"; + version = "1.1.7"; + + src = fetchurl { + url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; + sha256 = "0qy7kxz8h1zswr50ysyl2cc9gy0ip2j7ikl714m7lq3gsay3ydav"; + }; + + buildInputs = [ cmake boost mysql ]; + + cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; + + meta = { + homepage = http://dev.mysql.com/downloads/connector/cpp/; + description = "C++ library for connecting to mysql servers."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index a59420a7045d..dc0beb07db94 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn"; }; + outputs = [ "out" "dev" ]; + + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray=(--includedir=$dev/include --libdir=$out/lib) + ''; + propagatedBuildInputs = [ expat curl fftw ]; meta = { diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 07a95887ab40..82bf9a486791 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; + sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 3aa708e568a9..734760c8830b 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0avri5c3sr31ax0vjvzla1a11xb4irnrc6571lm6w4zxigqakkqk"; + sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi"; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; buildInputs = [ readline ]; propagatedBuildInputs = [ cln libxml2 glib ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d3127437de61..fedc5287b49b 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; }; + outputs = [ "out" "lib" "dev" "doc" ]; + buildInputs = [ jasper ]; propagatedBuildInputs = [ lcms2 ]; diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c0f12c545641..c8751c3e5dd4 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, glib, gtk, libxml2, pango +, glib, gtk2, libxml2, pango }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk libxml2 pango ]; + buildInputs = [ glib gtk2 libxml2 pango ]; meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 0e1d3a4bb4c8..ef0236406213 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index eb3917b11928..faa0b988be2a 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos }: +{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: stdenv.mkDerivation rec { name = "libspatialite-4.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; }; - buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos ]; + buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos libiconv ]; configureFlags = "--disable-freexl"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://www.gaia-gis.it/fossil/libspatialite; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix new file mode 100644 index 000000000000..abe0538b8a9c --- /dev/null +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -0,0 +1,115 @@ +{ stdenv, fetchurl, fetchpatch, flex, bison, file }: + +stdenv.mkDerivation rec { + name = "libstdc++5-${version}"; + version = "3.3.6"; + + src = [ + (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; + sha256 = "1dpyrpsgakilz2rnh5f8gvrzq5pwzvndacc0df6m04bpqn5fx6sg"; + }) + (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; + sha256 = "14lxl81f7adpc9jxfiwzdxsdzs5zv4piv8xh7f9w910hfzrgvsby"; + }) + ]; + + patches = [ + ./no-sys-dirs.patch + (fetchpatch { + name = "siginfo.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j"; + addPrefixes = true; + }) + (fetchpatch { + name = "gcc-3.4.3-no_multilib_amd64.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm"; + addPrefixes = true; + }) + ]; + + postPatch = '' + # fix build issue with recent gcc + sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c + + # No fixincludes + sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + ''; + + preConfigure = '' + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure + ''; + + preBuild = '' + # libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad + # Thing. + export CPP="gcc -E" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY="$(cat $NIX_CC/nix-support/orig-libc-dev)/include" + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" + + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + for i in $extraLDFlags; do + EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" + done + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray=( \ + "''${makeFlagsArray[@]}" \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + CXXFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + FLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + BOOT_CFLAGS="$EXTRA_FLAGS" \ + BOOT_LDFLAGS="$EXTRA_FLAGS" + ) + ''; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ flex bison file ]; + + configureFlags = [ "--disable-multilib" "--enable-__cxa-atexit" "--enable-threads=posix" "--enable-languages=c++" "--enable-clocale=gnu" ]; + + buildFLags = [ "all-target-libstdc++-v3" ]; + + installFlags = [ "install-target-libstdc++-v3" ]; + + postInstall = '' + # Remove includefiles and libs provided by gcc + shopt -s extglob + rm -rf $out/{bin,include,share,man,info} + rm -f $out/lib/*.a + rm -rf $out/lib/!(libstdc++*) + ''; + + meta = with stdenv.lib; { + homepage = http://gcc.gnu.org/; + license = licenses.lgpl3Plus; + description = "GNU Compiler Collection, version ${version} -- C++ standard library"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch new file mode 100644 index 000000000000..8c91d75f2a53 --- /dev/null +++ b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch @@ -0,0 +1,53 @@ +diff -ru3 gcc-3.3.6-old/gcc/cppdefault.c gcc-3.3.6/gcc/cppdefault.c +--- gcc-3.3.6-old/gcc/cppdefault.c 2003-11-07 02:13:31.000000000 +0300 ++++ gcc-3.3.6/gcc/cppdefault.c 2016-09-02 16:00:03.492484016 +0300 +@@ -26,6 +26,10 @@ + #include "system.h" + #include "cppdefault.h" + ++#undef LOCAL_INCLUDE_DIR ++#undef SYSTEM_INCLUDE_DIR ++#undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru3 gcc-3.3.6-old/gcc/gcc.c gcc-3.3.6/gcc/gcc.c +--- gcc-3.3.6-old/gcc/gcc.c 2004-04-01 20:55:17.000000000 +0400 ++++ gcc-3.3.6/gcc/gcc.c 2016-09-02 16:01:24.843520114 +0300 +@@ -6130,10 +6130,6 @@ + NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); + } + +- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1, +- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); +- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2, +- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); + #if 0 /* Can cause surprises, and one can use -B./ instead. */ + add_prefix (&startfile_prefixes, "./", NULL, + PREFIX_PRIORITY_LAST, 1, NULL, 0); +diff -ru3 gcc-3.3.6-old/gcc/Makefile.in gcc-3.3.6/gcc/Makefile.in +--- gcc-3.3.6-old/gcc/Makefile.in 2004-04-01 20:55:23.000000000 +0400 ++++ gcc-3.3.6/gcc/Makefile.in 2016-09-02 16:00:03.493484017 +0300 +@@ -260,7 +260,11 @@ + PARTITION_H = $(srcdir)/../include/partition.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = /usr/include ++# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent ++# `fixinc' from fixing header files in /usr/include. However, ++# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set ++# it to some dummy directory. ++NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +@@ -2201,7 +2205,7 @@ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ ++ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + @TARGET_SYSTEM_ROOT_DEFINE@ diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 373405432c8e..bb6907c7b046 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,10 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - urls = - [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" - "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" - ]; + url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix deleted file mode 100644 index 985c570a34e0..000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "0.16.19"; - sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw"; -}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix new file mode 100644 index 000000000000..97aa0145956c --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.0.10"; + sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl"; +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix deleted file mode 100644 index e2809e9d483b..000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0.9"; - sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; -}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 1950f94aca2e..b6aace0de2d6 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1"; - sha256 = "06dzzr9g2qhy48yy50xgac9jadjmqjykl52fq2kfl2l7xxzykkkz"; + version = "1.1.1"; + sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; }) diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix index 0d929941044c..061b2cfedfbf 100644 --- a/pkgs/development/libraries/libtunepimp/default.nix +++ b/pkgs/development/libraries/libtunepimp/default.nix @@ -4,6 +4,14 @@ stdenv.mkDerivation rec { name = "libtunepimp-0.5.3"; + outputs = [ "out" "lib" "dev" ]; + + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray=(--includedir=$dev/include --libdir=$lib/lib) + ''; + propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec libmad libogg libvorbis flac libofa libtool ]; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 0cdcbd72bae1..ebf81c67be05 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ]; - buildInputs = [ pkgconfig glib gtk dbus_glib ]; + buildInputs = [ pkgconfig glib gtk2 dbus_glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ae83ce78d5fe..36b5759a2cc0 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl +, nettle, libgcrypt, python, pygobject2, gobjectIntrospection, libcap_ng, numactl , xen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index a5f52beed54a..6e0809664cff 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: let ver_maj = "2.31"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; + buildInputs = [ pkgconfig gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 72afc1d55eb5..65e10c5a3995 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.38.1"; + name = "libxml++-${maj_ver}.${min_ver}"; + maj_ver = "2.40"; + min_ver = "1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/2.38/${name}.tar.xz"; - sha256 = "0px0ljcf9rsfa092dzmm097yn7wln6d5fgsvj9lnrnq3kcc2j9c8"; + url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; + sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; nativeBuildInputs = [ pkgconfig perl ]; @@ -14,8 +16,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 ]; - configureFlags = "--disable-documentation"; #doesn't build without this for some reason - meta = with stdenv.lib; { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 667298922ca8..e441d1e6b615 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, fetchpatch }: let - version = "0.1.6"; + version = "0.1.7"; in stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx"; + sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; - patches = [(fetchpatch { - name = "CVE-2014-9130.diff"; - url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/"; - sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04"; - })]; - meta = with stdenv.lib; { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch index b96e8e0b816e..68c0f1da26b6 100644 --- a/pkgs/development/libraries/mesa/symlink-drivers.patch +++ b/pkgs/development/libraries/mesa/symlink-drivers.patch @@ -1,7 +1,7 @@ -diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1.4/src/gallium/targets/dri/Makefile.am ---- mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am 2016-05-09 14:20:52.000000000 +0200 -+++ mesa-11.1.4/src/gallium/targets/dri/Makefile.am 2016-05-22 17:56:03.396185082 +0200 -@@ -126,14 +126,13 @@ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.3/src/gallium/targets/dri/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -134,14 +134,13 @@ done; endif @@ -19,9 +19,25 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1. uninstall-hook: for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am ---- mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am 2016-01-29 13:21:30.000000000 +0100 -+++ mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am 2016-05-22 20:54:12.722358242 +0200 +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am mesa-12.0.3/src/gallium/targets/va/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/va/Makefile.am 2016-09-22 14:45:39.635963339 +0200 +@@ -71,10 +71,10 @@ + # gallium_drv_video.so in the set of final installed files. + install-data-hook: + for i in $(TARGET_DRIVERS); do \ +- ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ ++ ln -srf $(DESTDIR)$(vadir)/gallium_drv_video.so \ + $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ + done; \ +- $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* ++ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am 2016-09-22 14:42:19.173575498 +0200 @@ -103,15 +103,14 @@ done; endif @@ -49,10 +65,31 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11. uninstall-hook: for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am mesa-11.1.4/src/mesa/drivers/dri/Makefile.am ---- mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am 2016-01-18 08:39:26.000000000 +0100 -+++ mesa-11.1.4/src/mesa/drivers/dri/Makefile.am 2016-05-22 17:55:46.251244940 +0200 -@@ -86,14 +86,13 @@ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am 2016-09-22 14:54:22.291014543 +0200 +@@ -73,7 +73,7 @@ + j=libXvMCgallium.$(LIB_EXT); \ + k=libXvMC$${i}.$(LIB_EXT); \ + l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ ++ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ +@@ -82,7 +82,7 @@ + ln -sf $${l} \ + $${dest_dir}/$${k}; \ + done; \ +- $(RM) $${dest_dir}/libXvMCgallium.* ++ $(RM) $${dest_dir}/libXvMCgallium.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am mesa-12.0.3/src/mesa/drivers/dri/Makefile.am +--- mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/mesa/drivers/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -94,14 +94,13 @@ done; endif diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix new file mode 100644 index 000000000000..32467e4849b5 --- /dev/null +++ b/pkgs/development/libraries/ntl/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, gmp, libtool +}: + +stdenv.mkDerivation rec { + name = "ntl-${version}"; + version = "9.11.0"; + src = fetchurl { + url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; + sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + }; + + buildInputs = [ perl gmp libtool ]; + + sourceRoot = "${name}/src"; + + enableParallelBuilding = true; + + dontAddPrefix = true; + + configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + + # doCheck = true; # takes some time + + meta = { + description = "A Library for doing Number Theory"; + longDescription = '' + NTL is a high-performance, portable C++ library providing data + structures and algorithms for manipulating signed, arbitrary + length integers, and for vectors, matrices, and polynomials over + the integers and over finite fields. + ''; + homepage = http://www.shoup.net/ntl/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b74607784747..564bf9f62e3d 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 1b69563355bc..ec85542c9207 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,33 @@ -{ stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype -, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu -, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal -, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL -, qt4, poppler, librsvg, gtk -, withApps ? true }: +{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip +, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 +, cairo, poppler, librsvg, libpng, libtiff, libXrandr +, xineLib, boost +, withApps ? false +, withSDL ? false, SDL +, withQt4 ? false, qt4 +}: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; - sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; + url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; + sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9"; }; + nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + buildInputs = [ - cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper - gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg - xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf - pkgconfig kbproto SDL qt4 poppler librsvg gtk - ]; + freetype libjpeg jasper libxml2 zlib gdal curl libX11 + cairo poppler librsvg libpng libtiff libXrandr boost + xineLib + ] ++ lib.optional withSDL SDL + ++ lib.optional withQt4 qt4; enableParallelBuilding = true; - cmakeFlags = [ - "-DMATH_LIBRARY=" - "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" - "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" - ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff b/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff deleted file mode 100644 index f8a4b7c22573..000000000000 --- a/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff +++ /dev/null @@ -1,256 +0,0 @@ -From 6f35f6deb5ca7daebe289f86477e061ce3ee5f46 Mon Sep 17 00:00:00 2001 -From: Matt Caswell <matt@openssl.org> -Date: Thu, 5 May 2016 11:10:26 +0100 -Subject: [PATCH] Avoid some undefined pointer arithmetic - -A common idiom in the codebase is: - -if (p + len > limit) -{ - return; /* Too long */ -} - -Where "p" points to some malloc'd data of SIZE bytes and -limit == p + SIZE - -"len" here could be from some externally supplied data (e.g. from a TLS -message). - -The rules of C pointer arithmetic are such that "p + len" is only well -defined where len <= SIZE. Therefore the above idiom is actually -undefined behaviour. - -For example this could cause problems if some malloc implementation -provides an address for "p" such that "p + len" actually overflows for -values of len that are too big and therefore p + len < limit! - -Issue reported by Guido Vranken. - -CVE-2016-2177 - -Reviewed-by: Rich Salz <rsalz@openssl.org> ---- - ssl/s3_srvr.c | 14 +++++++------- - ssl/ssl_sess.c | 2 +- - ssl/t1_lib.c | 48 ++++++++++++++++++++++++++---------------------- - 3 files changed, 34 insertions(+), 30 deletions(-) - -diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c -index 04cf93a..6c74caa 100644 ---- a/ssl/s3_srvr.c -+++ b/ssl/s3_srvr.c -@@ -1040,7 +1040,7 @@ int ssl3_get_client_hello(SSL *s) - - session_length = *(p + SSL3_RANDOM_SIZE); - -- if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) { -+ if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1058,7 +1058,7 @@ int ssl3_get_client_hello(SSL *s) - /* get the session-id */ - j = *(p++); - -- if (p + j > d + n) { -+ if ((d + n) - p < j) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1114,14 +1114,14 @@ int ssl3_get_client_hello(SSL *s) - - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) { - /* cookie stuff */ -- if (p + 1 > d + n) { -+ if ((d + n) - p < 1) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; - } - cookie_len = *(p++); - -- if (p + cookie_len > d + n) { -+ if ((d + n ) - p < cookie_len) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1166,7 +1166,7 @@ int ssl3_get_client_hello(SSL *s) - p += cookie_len; - } - -- if (p + 2 > d + n) { -+ if ((d + n ) - p < 2) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1180,7 +1180,7 @@ int ssl3_get_client_hello(SSL *s) - } - - /* i bytes of cipher data + 1 byte for compression length later */ -- if ((p + i + 1) > (d + n)) { -+ if ((d + n) - p < i + 1) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -@@ -1246,7 +1246,7 @@ int ssl3_get_client_hello(SSL *s) - - /* compression */ - i = *(p++); -- if ((p + i) > (d + n)) { -+ if ((d + n) - p < i) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c -index 48fc451..a97d060 100644 ---- a/ssl/ssl_sess.c -+++ b/ssl/ssl_sess.c -@@ -602,7 +602,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, - int r; - #endif - -- if (session_id + len > limit) { -+ if (limit - session_id < len) { - fatal = 1; - goto err; - } -diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c -index 0bdb77d..8ed1793 100644 ---- a/ssl/t1_lib.c -+++ b/ssl/t1_lib.c -@@ -942,11 +942,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - 0x02, 0x03, /* SHA-1/ECDSA */ - }; - -- if (data >= (limit - 2)) -+ if (limit - data <= 2) - return; - data += 2; - -- if (data > (limit - 4)) -+ if (limit - data < 4) - return; - n2s(data, type); - n2s(data, size); -@@ -954,7 +954,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - if (type != TLSEXT_TYPE_server_name) - return; - -- if (data + size > limit) -+ if (limit - data < size) - return; - data += size; - -@@ -962,7 +962,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - const size_t len1 = sizeof(kSafariExtensionsBlock); - const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock); - -- if (data + len1 + len2 != limit) -+ if (limit - data != (int)(len1 + len2)) - return; - if (memcmp(data, kSafariExtensionsBlock, len1) != 0) - return; -@@ -971,7 +971,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - } else { - const size_t len = sizeof(kSafariExtensionsBlock); - -- if (data + len != limit) -+ if (limit - data != (int)(len)) - return; - if (memcmp(data, kSafariExtensionsBlock, len) != 0) - return; -@@ -1019,19 +1019,19 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, - if (data == limit) - goto ri_check; - -- if (data > (limit - 2)) -+ if (limit - data < 2) - goto err; - - n2s(data, len); - -- if (data + len != limit) -+ if (limit - data != len) - goto err; - -- while (data <= (limit - 4)) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (limit)) -+ if (limit - data < size) - goto err; - # if 0 - fprintf(stderr, "Received extension type %d size %d\n", type, size); -@@ -1460,20 +1460,20 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, - SSL_TLSEXT_HB_DONT_SEND_REQUESTS); - # endif - -- if (data >= (d + n - 2)) -+ if ((d + n) - data <= 2) - goto ri_check; - - n2s(data, length); -- if (data + length != d + n) { -+ if ((d + n) - data != length) { - *al = SSL_AD_DECODE_ERROR; - return 0; - } - -- while (data <= (d + n - 4)) { -+ while ((d + n) - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (d + n)) -+ if ((d + n) - data < size) - goto ri_check; - - if (s->tlsext_debug_cb) -@@ -2179,29 +2179,33 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, - /* Skip past DTLS cookie */ - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) { - i = *(p++); -- p += i; -- if (p >= limit) -+ -+ if (limit - p <= i) - return -1; -+ -+ p += i; - } - /* Skip past cipher list */ - n2s(p, i); -- p += i; -- if (p >= limit) -+ if (limit - p <= i) - return -1; -+ p += i; -+ - /* Skip past compression algorithm list */ - i = *(p++); -- p += i; -- if (p > limit) -+ if (limit - p < i) - return -1; -+ p += i; -+ - /* Now at start of extensions */ -- if ((p + 2) >= limit) -+ if (limit - p <= 2) - return 0; - n2s(p, i); -- while ((p + 4) <= limit) { -+ while (limit - p >= 4) { - unsigned short type, size; - n2s(p, type); - n2s(p, size); -- if (p + size > limit) -+ if (limit - p < size) - return 0; - if (type == TLSEXT_TYPE_session_ticket) { - int r; --- -1.9.1 - diff --git a/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff b/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff deleted file mode 100644 index ca934c20a674..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff +++ /dev/null @@ -1,279 +0,0 @@ -From a004e72b95835136d3f1ea90517f706c24c03da7 Mon Sep 17 00:00:00 2001 -From: Matt Caswell <matt@openssl.org> -Date: Thu, 5 May 2016 11:10:26 +0100 -Subject: [PATCH] Avoid some undefined pointer arithmetic - -A common idiom in the codebase is: - -if (p + len > limit) -{ - return; /* Too long */ -} - -Where "p" points to some malloc'd data of SIZE bytes and -limit == p + SIZE - -"len" here could be from some externally supplied data (e.g. from a TLS -message). - -The rules of C pointer arithmetic are such that "p + len" is only well -defined where len <= SIZE. Therefore the above idiom is actually -undefined behaviour. - -For example this could cause problems if some malloc implementation -provides an address for "p" such that "p + len" actually overflows for -values of len that are too big and therefore p + len < limit! - -Issue reported by Guido Vranken. - -CVE-2016-2177 - -Reviewed-by: Rich Salz <rsalz@openssl.org> ---- - ssl/s3_srvr.c | 14 +++++++------- - ssl/ssl_sess.c | 2 +- - ssl/t1_lib.c | 56 ++++++++++++++++++++++++++++++-------------------------- - 3 files changed, 38 insertions(+), 34 deletions(-) - -diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c -index ab28702..ab7f690 100644 ---- a/ssl/s3_srvr.c -+++ b/ssl/s3_srvr.c -@@ -980,7 +980,7 @@ int ssl3_get_client_hello(SSL *s) - - session_length = *(p + SSL3_RANDOM_SIZE); - -- if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) { -+ if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -998,7 +998,7 @@ int ssl3_get_client_hello(SSL *s) - /* get the session-id */ - j = *(p++); - -- if (p + j > d + n) { -+ if ((d + n) - p < j) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1054,14 +1054,14 @@ int ssl3_get_client_hello(SSL *s) - - if (SSL_IS_DTLS(s)) { - /* cookie stuff */ -- if (p + 1 > d + n) { -+ if ((d + n) - p < 1) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; - } - cookie_len = *(p++); - -- if (p + cookie_len > d + n) { -+ if ((d + n ) - p < cookie_len) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1131,7 +1131,7 @@ int ssl3_get_client_hello(SSL *s) - } - } - -- if (p + 2 > d + n) { -+ if ((d + n ) - p < 2) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1145,7 +1145,7 @@ int ssl3_get_client_hello(SSL *s) - } - - /* i bytes of cipher data + 1 byte for compression length later */ -- if ((p + i + 1) > (d + n)) { -+ if ((d + n) - p < i + 1) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -@@ -1211,7 +1211,7 @@ int ssl3_get_client_hello(SSL *s) - - /* compression */ - i = *(p++); -- if ((p + i) > (d + n)) { -+ if ((d + n) - p < i) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c -index b182998..54ee783 100644 ---- a/ssl/ssl_sess.c -+++ b/ssl/ssl_sess.c -@@ -573,7 +573,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, - int r; - #endif - -- if (session_id + len > limit) { -+ if (limit - session_id < len) { - fatal = 1; - goto err; - } -diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c -index fb64607..cdac011 100644 ---- a/ssl/t1_lib.c -+++ b/ssl/t1_lib.c -@@ -1867,11 +1867,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - 0x02, 0x03, /* SHA-1/ECDSA */ - }; - -- if (data >= (limit - 2)) -+ if (limit - data <= 2) - return; - data += 2; - -- if (data > (limit - 4)) -+ if (limit - data < 4) - return; - n2s(data, type); - n2s(data, size); -@@ -1879,7 +1879,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - if (type != TLSEXT_TYPE_server_name) - return; - -- if (data + size > limit) -+ if (limit - data < size) - return; - data += size; - -@@ -1887,7 +1887,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - const size_t len1 = sizeof(kSafariExtensionsBlock); - const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock); - -- if (data + len1 + len2 != limit) -+ if (limit - data != (int)(len1 + len2)) - return; - if (memcmp(data, kSafariExtensionsBlock, len1) != 0) - return; -@@ -1896,7 +1896,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - } else { - const size_t len = sizeof(kSafariExtensionsBlock); - -- if (data + len != limit) -+ if (limit - data != (int)(len)) - return; - if (memcmp(data, kSafariExtensionsBlock, len) != 0) - return; -@@ -2053,19 +2053,19 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, - if (data == limit) - goto ri_check; - -- if (data > (limit - 2)) -+ if (limit - data < 2) - goto err; - - n2s(data, len); - -- if (data + len != limit) -+ if (limit - data != len) - goto err; - -- while (data <= (limit - 4)) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (limit)) -+ if (limit - data < size) - goto err; - # if 0 - fprintf(stderr, "Received extension type %d size %d\n", type, size); -@@ -2472,18 +2472,18 @@ static int ssl_scan_clienthello_custom_tlsext(SSL *s, - if (s->hit || s->cert->srv_ext.meths_count == 0) - return 1; - -- if (data >= limit - 2) -+ if (limit - data <= 2) - return 1; - n2s(data, len); - -- if (data > limit - len) -+ if (limit - data < len) - return 1; - -- while (data <= limit - 4) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > limit) -+ if (limit - data < size) - return 1; - if (custom_ext_parse(s, 1 /* server */ , type, data, size, al) <= 0) - return 0; -@@ -2569,20 +2569,20 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, - SSL_TLSEXT_HB_DONT_SEND_REQUESTS); - # endif - -- if (data >= (d + n - 2)) -+ if ((d + n) - data <= 2) - goto ri_check; - - n2s(data, length); -- if (data + length != d + n) { -+ if ((d + n) - data != length) { - *al = SSL_AD_DECODE_ERROR; - return 0; - } - -- while (data <= (d + n - 4)) { -+ while ((d + n) - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (d + n)) -+ if ((d + n) - data < size) - goto ri_check; - - if (s->tlsext_debug_cb) -@@ -3307,29 +3307,33 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, - /* Skip past DTLS cookie */ - if (SSL_IS_DTLS(s)) { - i = *(p++); -- p += i; -- if (p >= limit) -+ -+ if (limit - p <= i) - return -1; -+ -+ p += i; - } - /* Skip past cipher list */ - n2s(p, i); -- p += i; -- if (p >= limit) -+ if (limit - p <= i) - return -1; -+ p += i; -+ - /* Skip past compression algorithm list */ - i = *(p++); -- p += i; -- if (p > limit) -+ if (limit - p < i) - return -1; -+ p += i; -+ - /* Now at start of extensions */ -- if ((p + 2) >= limit) -+ if (limit - p <= 2) - return 0; - n2s(p, i); -- while ((p + 4) <= limit) { -+ while (limit - p >= 4) { - unsigned short type, size; - n2s(p, type); - n2s(p, size); -- if (p + size > limit) -+ if (limit - p < size) - return 0; - if (type == TLSEXT_TYPE_session_ticket) { - int r; --- -1.9.1 - diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c023965c0f63..f684969f9054 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -106,26 +106,18 @@ let in { openssl_1_0_1 = common { - version = "1.0.1t"; - sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"; - patches = [ - # https://git.openssl.org/?p=openssl.git;a=commit;h=6f35f6deb5ca7daebe289f86477e061ce3ee5f46 - ./1.0.1-CVE-2016-2177.diff - ]; + version = "1.0.1u"; + sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; }; openssl_1_0_2 = common { - version = "1.0.2h"; - sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; - patches = [ - # https://git.openssl.org/?p=openssl.git;a=commit;h=a004e72b95835136d3f1ea90517f706c24c03da7 - ./1.0.2-CVE-2016-2177.diff - ]; + version = "1.0.2i"; + sha256 = "0vyy038676cv3m2523fi9ll9nkjxadqdnz18zdp5nm6925yli1wj"; }; openssl_1_1_0 = common { - version = "1.1.0"; - sha256 = "10lcpmnxap9nw8ymdglys93cgkwd1lf1rz4fhq5whwhlmkwrzipm"; + version = "1.1.0a"; + sha256 = "0as40a1lipl9qfax7495jc1xfb049ygavkaxxk4y5kcn8birdrn2"; }; } diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 6daa12745653..b253a27a7db3 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation { - name = "opensubdiv-3.0.4"; + name = "opensubdiv-3.0.5"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; - rev = "v3_0_4"; - sha256 = "14ylpzk4121gi3fl02dwmqjp5sbaqpkm4gd0lh6jijccdih0xsc0"; + rev = "v3_0_5"; + sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 447b8fe15ec0..d226a51d0f8e 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcre2-10.21"; + name = "pcre2-${version}"; + version = "10.22"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6"; + sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j"; }; configureFlags = [ @@ -13,11 +14,17 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - meta = { - description = "Perl Compatible Regular Expressions"; + outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; + + postFixup = '' + moveToOutput bin/pcre2-config "$dev" + ''; + + meta = with stdenv.lib; { + description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index fa373a7e97f4..9094eca26e5d 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: -let - rev = "5d412bad60"; -in stdenv.mkDerivation rec { - name = "pkcs11-helper-20121123-${rev}"; + name = "pkcs11-helper-${version}"; + version = "1.11"; - src = fetchurl { - url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; - name = "${name}.tar.gz"; - sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "pkcs11-helper"; + rev = "${name}"; + sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q"; }; buildInputs = [ pkgconfig openssl autoreconfHook ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; - license = with licenses; [ "BSD" gpl2 ]; + license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 65d45923e5a5..a93ae2fc8adf 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -6,7 +6,7 @@ , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf -, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs , developerBuild ? false , docs ? false , examples ? false @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter gconf = GConf.out; - gtk = gtk.out; + gtk = gtk2.out; libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; }) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }) ++ [(fetchpatch { @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals (mysql != null) [ mysql.lib ] - ++ optionals gtkStyle [ gtk gdk_pixbuf ] + ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 2f252a6cf28f..fdeb4f7e6c94 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -66,7 +66,7 @@ let harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index b80b8a1e7611..d36a7ef82734 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -19,7 +19,7 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk +, libgnomeui, GConf, gnome_vfs, gtk2 , decryptSslTraffic ? false }: @@ -28,7 +28,7 @@ let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ]; + gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ]; dontInvalidateBacking = fetchurl { url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; @@ -211,7 +211,7 @@ stdenv.mkDerivation { ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql # FIXME: move to the main list on rebuild. - ++ [gnome_vfs.out libgnomeui.out gtk GConf]; + ++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index 32b07b6c907d..3a2d026842a3 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix index 46f47b41535a..683bb031e95e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix index 46f47b41535a..683bb031e95e 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 77a74c4e8446..6803dfd76de9 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL gtk mesa ]; + buildInputs = [ SDL gtk2 mesa ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 0ef024424b25..3034370e4ea5 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, gtk2, spice_protocol, intltool, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup , gtk3, enableGTK3 ? false }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir - ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); + ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk2 ]); nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index ee89eda327d0..faba57d155fb 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; - + includeAllQtDirs = true; CLUCENE_HOME = clucene_core; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Strigi installs some libraries in an incorrect place + # ($out/$out/lib instead of $out/lib), so move them to the right + # place. + postInstall = + '' + mv $out/$out/lib/* $out/lib + rm -rf $out/nix + ''; + meta = { homepage = http://strigi.sourceforge.net; description = "A very fast and efficient crawler to index data on your harddrive"; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 3c40ae247f65..024531a3027a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.5"; + name = "talloc-2.1.8"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq"; + sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 0843d05e0282..f7449dcf1ab9 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.8"; + name = "tdb-1.3.11"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186"; + sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 95eb0255bdcb..2856f025a888 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.28"; + name = "tevent-0.9.30"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0a9ml52jjnzz7qg9z750mavlvs1yibjwrzy4yl55dc95j0vm7n84"; + sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; }; buildInputs = [ diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix new file mode 100644 index 000000000000..43a8f7db8d68 --- /dev/null +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, boost, sqlite }: + +stdenv.mkDerivation rec { + name = "vsqlite-${version}"; + version = "0.3.13"; + + src = fetchurl { + url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; + }; + + buildInputs = [ boost sqlite ]; + + meta = { + homepage = http://vsqlite.virtuosic-bytes.com/; + description = "C++ wrapper library for sqlite."; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/webkitgtk/2.10.nix b/pkgs/development/libraries/webkitgtk/2.10.nix deleted file mode 100644 index e74cc6421b24..000000000000 --- a/pkgs/development/libraries/webkitgtk/2.10.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify -, gtk2, gtk3, wayland, libwebp, enchant -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? false, geoclue2, sqlite, xorg -, enableCredentialStorage ? !stdenv.isDarwin -, gst-plugins-base, readline, libedit -}: - -assert enableGeoLocation -> geoclue2 != null; -assert stdenv.isDarwin -> !enableCredentialStorage; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.10.9"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; - license = licenses.bsd2; - platforms = platforms.linux; - hydraPlatforms = []; - maintainers = with maintainers; [ koral ]; - }; - - preConfigure = "patchShebangs Tools"; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv"; - }; - - patches = [ - ./finding-harfbuzz-icu.patch - ] ++ optional stdenv.isDarwin ./adding-libintl.patch; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=OFF" - ] ++ optionals (!enableCredentialStorage) [ - "-DENABLE_CREDENTIAL_STORAGE=OFF" - ] ++ optionals (!enableGeoLocation) [ - "-DENABLE_GEOLOCATION=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_WEBKIT=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_TOOLS=ON" - "-DENABLE_MINIBROWSER=ON" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_VIDEO=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_INTROSPECTION=OFF" - "-DUSE_LIBNOTIFY=OFF" - "-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder" - ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; - - nativeBuildInputs = [ - cmake perl python ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - gtk2 libwebp enchant libnotify - libxml2 libxslt harfbuzz libpthreadstubs - gst-plugins-base xorg.libXt - ] ++ optionals enableCredentialStorage [ - libsecret - ] ++ (if stdenv.isDarwin then [ - readline libedit - ] else [ - wayland - ]) ++ optional enableGeoLocation geoclue2; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix new file mode 100644 index 000000000000..fca358ed4305 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.14.0"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + preConfigure = "patchShebangs Tools"; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5"; + }; + + # see if we can clean this up.... + + patches = [ ./finding-harfbuzz-icu.patch ]; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_GLES2=ON" + ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + #NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; + + nativeBuildInputs = [ + cmake perl python ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + gtk2 wayland libwebp enchant libnotify gnutls + libxml2 libsecret libxslt harfbuzz libpthreadstubs + gst-plugins-base libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]); + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 7396b7009552..c4530da54531 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, libX11, cairo , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] ++ optional withMesa mesa; nativeBuildInputs = [ pkgconfig ]; @@ -56,7 +56,10 @@ stdenv.mkDerivation rec { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index d9f0dcc1b0f4..82ba9daed80f 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index bdb0032a85ae..087e93b0e054 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index acd71d65c0eb..fc2981f7f1f7 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -22,6 +22,7 @@ let url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; + patches = [ ./gcc-5.patch]; }; "2.8" = { @@ -30,7 +31,7 @@ let x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ]; + patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch]; }; }; diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/pkgs/development/misc/amdapp-sdk/gcc-5.patch new file mode 100644 index 000000000000..dc8538db4c1f --- /dev/null +++ b/pkgs/development/misc/amdapp-sdk/gcc-5.patch @@ -0,0 +1,11 @@ +--- include/CL/cl.hpp ++++ include/CL/cl.hpp +@@ -201,7 +201,7 @@ + #include <functional> + #define __CL_FUNCTION_TYPE typename std::function + #define CL_USE_CPP_FUNCTORS +-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) ++#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) + #include <tr1/functional> + #define __CL_FUNCTION_TYPE typename std::tr1::function + #define CL_USE_CPP_FUNCTORS diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 645795034cd8..aef61bb2fc22 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2016-07-21 16:22:25.601902 with ADRT.--> + <!--Generated on 2016-09-13 10:48:39.682447 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>3</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:39 2016.--> + <!--Built on: Mon Aug 15 05:06:49 2016.--> <sdk:size>34908058</sdk:size> <sdk:checksum type="sha1">1f92abf3a76be66ae8032257fc7620acbd2b2e3a</sdk:checksum> <sdk:url>google_apis-3-r03.zip</sdk:url> @@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:43 2016.--> + <!--Built on: Mon Aug 15 05:06:49 2016.--> <sdk:size>42435735</sdk:size> <sdk:checksum type="sha1">9b6e86d8568558de4d606a7debc4f6049608dbd0</sdk:checksum> <sdk:url>google_apis-4_r02.zip</sdk:url> @@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:47 2016.--> + <!--Built on: Mon Aug 15 05:06:51 2016.--> <sdk:size>49123776</sdk:size> <sdk:checksum type="sha1">46eaeb56b645ee7ffa24ede8fa17f3df70db0503</sdk:checksum> <sdk:url>google_apis-5_r01.zip</sdk:url> @@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:52 2016.--> + <!--Built on: Mon Aug 15 05:06:51 2016.--> <sdk:size>53382941</sdk:size> <sdk:checksum type="sha1">5ff545d96e031e09580a6cf55713015c7d4936b2</sdk:checksum> <sdk:url>google_apis-6_r01.zip</sdk:url> @@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:55 2016.--> + <!--Built on: Mon Aug 15 05:06:52 2016.--> <sdk:size>53691339</sdk:size> <sdk:checksum type="sha1">2e7f91e0fe34fef7f58aeced973c6ae52361b5ac</sdk:checksum> <sdk:url>google_apis-7_r01.zip</sdk:url> @@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:39:59 2016.--> + <!--Built on: Mon Aug 15 05:06:52 2016.--> <sdk:size>59505020</sdk:size> <sdk:checksum type="sha1">3079958e7ec87222cac1e6b27bc471b27bf2c352</sdk:checksum> <sdk:url>google_apis-8_r02.zip</sdk:url> @@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:04 2016.--> + <!--Built on: Mon Aug 15 05:06:50 2016.--> <sdk:size>63401546</sdk:size> <sdk:checksum type="sha1">78664645a1e9accea4430814f8694291a7f1ea5d</sdk:checksum> <sdk:url>google_apis-9_r02.zip</sdk:url> @@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:09 2016.--> + <!--Built on: Mon Aug 15 05:06:52 2016.--> <sdk:size>65781578</sdk:size> <sdk:checksum type="sha1">cc0711857c881fa7534f90cf8cc09b8fe985484d</sdk:checksum> <sdk:url>google_apis-10_r02.zip</sdk:url> @@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:13 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>83477179</sdk:size> <sdk:checksum type="sha1">5eab5e81addee9f3576d456d205208314b5146a5</sdk:checksum> <sdk:url>google_apis-11_r01.zip</sdk:url> @@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:18 2016.--> + <!--Built on: Mon Aug 15 05:06:51 2016.--> <sdk:size>86099835</sdk:size> <sdk:checksum type="sha1">e9999f4fa978812174dfeceec0721c793a636e5d</sdk:checksum> <sdk:url>google_apis-12_r01.zip</sdk:url> @@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:23 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>88615525</sdk:size> <sdk:checksum type="sha1">3b153edd211c27dc736c893c658418a4f9041417</sdk:checksum> <sdk:url>google_apis-13_r01.zip</sdk:url> @@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:28 2016.--> + <!--Built on: Mon Aug 15 05:06:53 2016.--> <sdk:size>106533714</sdk:size> <sdk:checksum type="sha1">f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39</sdk:checksum> <sdk:url>google_apis-14_r02.zip</sdk:url> @@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>3</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:33 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>106624396</sdk:size> <sdk:checksum type="sha1">d0d2bf26805eb271693570a1aaec33e7dc3f45e9</sdk:checksum> <sdk:url>google_apis-15_r03.zip</sdk:url> @@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>4</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:40 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>127341982</sdk:size> <sdk:checksum type="sha1">ee6acf1b01020bfa8a8e24725dbc4478bee5e792</sdk:checksum> <sdk:url>google_apis-16_r04.zip</sdk:url> @@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>4</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:46 2016.--> + <!--Built on: Mon Aug 15 05:06:55 2016.--> <sdk:size>137231243</sdk:size> <sdk:checksum type="sha1">a076be0677f38df8ca5536b44dfb411a0c808c4f</sdk:checksum> <sdk:url>google_apis-17_r04.zip</sdk:url> @@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>4</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:40:53 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>143195183</sdk:size> <sdk:checksum type="sha1">6109603409debdd40854d4d4a92eaf8481462c8b</sdk:checksum> <sdk:url>google_apis-18_r04.zip</sdk:url> @@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>20</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu May 19 11:35:33 2016.--> + <!--Built on: Mon Aug 15 04:16:31 2016.--> <sdk:size>147081</sdk:size> <sdk:checksum type="sha1">5b933abe830b2f25b4c0f171d45e9e0651e56311</sdk:checksum> <sdk:url>google_apis-19_r20.zip</sdk:url> @@ -1086,11 +1086,44 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& </sdk:libs> </sdk:add-on> <sdk:add-on> + <!--Generated from bid:3249234, branch:git_nyc-emu-release--> + <sdk:revision>1</sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Thu Sep 8 15:11:39 2016.--> + <sdk:size>154865</sdk:size> + <sdk:checksum type="sha1">31361c2868f27343ee917fbd259c1463821b6145</sdk:checksum> + <sdk:url>google_apis-24_r1.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + <sdk:vendor-id>google</sdk:vendor-id> + <sdk:vendor-display>Google Inc.</sdk:vendor-display> + <sdk:name-id>google_apis</sdk:name-id> + <sdk:name-display>Google APIs</sdk:name-display> + <sdk:api-level>24</sdk:api-level> + <sdk:description>Android + Google APIs</sdk:description> + <sdk:libs> + <sdk:lib> + <sdk:name>com.google.android.maps</sdk:name> + <sdk:description>API for Google Maps</sdk:description> + </sdk:lib> + <sdk:lib> + <sdk:name>com.android.future.usb.accessory</sdk:name> + <sdk:description>API for USB Accessories</sdk:description> + </sdk:lib> + <sdk:lib> + <sdk:name>com.google.android.media.effects</sdk:name> + <sdk:description>Collection of video effects</sdk:description> + </sdk:lib> + </sdk:libs> + </sdk:add-on> + <sdk:add-on> <!--Generated from bid:77907680, branch:perforce--> <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:41:02 2016.--> + <!--Built on: Mon Aug 15 05:06:45 2016.--> <sdk:size>179499</sdk:size> <sdk:checksum type="sha1">66a754efb24e9bb07cc51648426443c7586c9d4a</sdk:checksum> <sdk:url>google_apis-21_r01.zip</sdk:url> @@ -1123,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:41:05 2016.--> + <!--Built on: Mon Aug 15 05:06:45 2016.--> <sdk:size>179259</sdk:size> <sdk:checksum type="sha1">5def0f42160cba8acff51b9c0c7e8be313de84f5</sdk:checksum> <sdk:url>google_apis-22_r01.zip</sdk:url> @@ -1156,7 +1189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:41:08 2016.--> + <!--Built on: Mon Aug 15 05:06:45 2016.--> <sdk:size>179900</sdk:size> <sdk:checksum type="sha1">04c5cc1a7c88967250ebba9561d81e24104167db</sdk:checksum> <sdk:url>google_apis-23_r01.zip</sdk:url> @@ -1190,7 +1223,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:41:13 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>78266751</sdk:size> <sdk:checksum type="sha1">92128a12e7e8b0fb5bac59153d7779b717e7b840</sdk:checksum> <sdk:url>google_tv-12_r02.zip</sdk:url> @@ -1212,7 +1245,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Apr 5 11:41:18 2016.--> + <!--Built on: Mon Aug 15 05:06:54 2016.--> <sdk:size>87721879</sdk:size> <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum> <sdk:url>google_tv-13_r01.zip</sdk:url> @@ -1229,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:libs/> </sdk:add-on> <sdk:extra> - <!--Generated from bid:3078275, branch:git_nyc-dev--> + <!--Generated from bid:3256427, branch:git_nyc-support-release--> <sdk:revision> - <sdk:major>35</sdk:major> + <sdk:major>37</sdk:major> <sdk:minor>0</sdk:minor> <sdk:micro>0</sdk:micro> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu Jul 21 12:00:22 2016.--> - <sdk:size>251973915</sdk:size> - <sdk:checksum type="sha1">7a201334775d78bf185ffcce686b1b168d152217</sdk:checksum> - <sdk:url>android_m2repository_r35.zip</sdk:url> + <!--Built on: Mon Sep 12 10:14:44 2016.--> + <sdk:size>281268000</sdk:size> + <sdk:checksum type="sha1">2f862a5d66d5526cd5b7655c3e9678f493e485f7</sdk:checksum> + <sdk:url>android_m2repository_r37.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1275,88 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:old-paths>compatibility</sdk:old-paths> </sdk:extra> <sdk:extra> - <!--Generated from bid:108530044, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Apr 5 11:38:48 2016.--> - <sdk:size>12968916</sdk:size> - <sdk:checksum type="sha1">7c9ef7544cf0aea030bcc29bd8e12c04fd53e653</sdk:checksum> - <sdk:url>gapid_r01_linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Apr 5 11:38:46 2016.--> - <sdk:size>15824058</sdk:size> - <sdk:checksum type="sha1">597eb271349d890566274861eba2770a84ee4c69</sdk:checksum> - <sdk:url>gapid_r01_osx.zip</sdk:url> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Apr 5 11:38:47 2016.--> - <sdk:size>13220091</sdk:size> - <sdk:checksum type="sha1">82c9b3eb1b281f27f58fe55025227148b3deb12e</sdk:checksum> - <sdk:url>gapid_r01_windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>android</sdk:vendor-id> - <sdk:vendor-display>Android</sdk:vendor-display> - <sdk:description>Tools that support GPU debugging and profiling within an IDE.</sdk:description> - <sdk:name-display>GPU Debugging tools</sdk:name-display> - <sdk:path>gapid</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:2994895, branch:git_studio-master-dev--> - <sdk:revision> - <sdk:major>3</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 21 13:35:11 2016.--> - <sdk:size>31528127</sdk:size> - <sdk:checksum type="sha1">a33fe37c87b095171d647385445abe164ae03514</sdk:checksum> - <sdk:url>gapid_2994895_linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 21 13:35:14 2016.--> - <sdk:size>31908588</sdk:size> - <sdk:checksum type="sha1">81dec931c8b0a5fe7c68accd8b3f8c731a9474f3</sdk:checksum> - <sdk:url>gapid_2994895_osx.zip</sdk:url> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 21 13:35:13 2016.--> - <sdk:size>31656334</sdk:size> - <sdk:checksum type="sha1">ce00f4a7364d7fdd5d25d2429f04c4d50f56be1e</sdk:checksum> - <sdk:url>gapid_2994895_windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>android</sdk:vendor-id> - <sdk:vendor-display>Android</sdk:vendor-display> - <sdk:description>Tools that support GPU debugging and profiling within an IDE.</sdk:description> - <sdk:name-display>GPU Debugging tools</sdk:name-display> - <sdk:path>gapid_3</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:127098392, branch:perforce--> + <!--Generated from bid:128809501, branch:perforce--> <sdk:revision> - <sdk:major>31</sdk:major> + <sdk:major>32</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Jul 11 10:11:05 2016.--> - <sdk:size>106690833</sdk:size> - <sdk:checksum type="sha1">20054f56e8e24c5f1aadd8cdf232d5dd54565aee</sdk:checksum> - <sdk:url>google_m2repository_r31.zip</sdk:url> + <!--Built on: Fri Jul 29 09:01:13 2016.--> + <sdk:size>113922721</sdk:size> + <sdk:checksum type="sha1">ae24bde9c8f732f4d13b72e70802be8c97dcfddf</sdk:checksum> + <sdk:url>google_m2repository_r32.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -1431,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:path>google_play_services_froyo</sdk:path> </sdk:extra> <sdk:extra> - <!--Generated from bid:125682601, branch:perforce--> + <!--Generated from bid:128810771, branch:perforce--> <sdk:revision> - <sdk:major>31</sdk:major> + <sdk:major>32</sdk:major> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu Jun 23 11:29:48 2016.--> - <sdk:size>11746505</sdk:size> - <sdk:checksum type="sha1">3f1b502d0f6361c036cb332b8c15249a1168e08b</sdk:checksum> - <sdk:url>google_play_services_9256000_r31.zip</sdk:url> + <!--Built on: Fri Jul 29 09:01:17 2016.--> + <sdk:size>11820632</sdk:size> + <sdk:checksum type="sha1">bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f</sdk:checksum> + <sdk:url>google_play_services_945200_r32.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 66d548d3304d..f999f603b8f9 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -256,6 +256,18 @@ in }; }; + google_apis_24 = buildGoogleApis { + name = "google_apis-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { @@ -271,8 +283,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_9256000_r31.zip; - sha1 = "3f1b502d0f6361c036cb332b8c15249a1168e08b"; + url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip; + sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a0ecb641f082..0126d6981e72 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio, dbus +, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: @@ -10,16 +10,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.1.7"; + version = "25.2.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha1 = "p03br08zfq0j7aar5638z8fdh5n9x1in"; + sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha1 = "7fzlfms37cfk25kk4f9zriy63djmbi8g"; + sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl"; } else throw "platform not ${stdenv.system} supported!"; @@ -67,15 +67,15 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/android \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/hierarchyviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 255aa497e24a..945cc0bedd5c 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit}: +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "23.0.1"; + version = "24.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8"; } else throw "System ${stdenv.system} not supported!"; @@ -23,50 +23,34 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} - - # Patch the interpreter - for i in aidl bcc_compat dexdump llvm-rs-cc - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - done - - # These binaries need to find libstdc++ and libgcc_s - for i in aidl lib/libLLVM.so - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i - done - - # These binaries need to find libstdc++, libgcc_s and libraries in the current folder - for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so aidl - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:`pwd`/lib $i - done - - # Create link to make libtinfo.so.5 work - ln -s ${ncurses_32bit.out}/lib/libncurses.so.5 `pwd`/lib/libtinfo.so.5 - - # These binaries need to find libstdc++, libgcc_s, ncurses, and libraries in the current folder - for i in bcc_compat llvm-rs-cc - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${ncurses_32bit.out}/lib:`pwd`/lib $i - done - # These binaries also need zlib in addition to libstdc++ - for i in arm-linux-androideabi-ld i686-linux-android-ld mipsel-linux-android-ld split-select aapt zipalign - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i - done - - # These binaries need to find libstdc++, libgcc_s, and zlib - for i in aapt dexdump + ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 + + find . -type f -print0 | while IFS= read -r -d "" file do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i + type=$(file "$file") + ## Patch 64-bit binaries + if grep -q "ELF 64-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" + fi + patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" + ## Patch 32-bit binaries + elif grep -q "ELF 32-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" + fi + patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" + fi done ''} patchShebangs . ''; - buildInputs = [ unzip ]; + buildInputs = [ unzip file ]; } diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 5a5eb1ab51bd..a21edcc06962 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -6,10 +6,11 @@ rec { }; buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip; + inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; - ncurses_32bit = pkgs_i686.ncurses; + ncurses_32bit = pkgs_i686.ncurses5; + ncurses = pkgs.ncurses5; }; support = import ./support.nix { @@ -40,7 +41,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bafdf75bef30..517167b0d559 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "24"; + version = "24.0.2"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha1 = "qabpsfhm7shvyjy6amdl7b3d41n64zsr"; + sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha1 = "5s808wby36xxkfmrj4va9dnc0rwsz2gh"; + sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index b33d80f13e71..e0c77ad294e6 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index d39d6dab7ca6..60fae208ae1a 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index ead5dcad7117..a0ef9bc4485a 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2016-07-22 11:17:21.550545 with ADRT.--> + <!--Generated on 2016-09-13 11:44:58.246002 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -335,18 +335,58 @@ June 2014.</sdk:license> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> </sdk:ndk> + <sdk:ndk> + <!--Generated from bid:3214847, branch:aosp-ndk-r13-release--> + <sdk:description>NDK</sdk:description> + <sdk:revision>13</sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Tue Aug 23 15:40:55 2016.--> + <sdk:size>665405792</sdk:size> + <sdk:checksum type="sha1">0cbdb271b103a7e4237b34b73f0e56381e4632aa</sdk:checksum> + <sdk:url>android-ndk-r13-beta2-darwin-x86_64.zip</sdk:url> + <sdk:host-os>macosx</sdk:host-os> + <sdk:host-bits>64</sdk:host-bits> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Aug 23 15:41:13 2016.--> + <sdk:size>686843165</sdk:size> + <sdk:checksum type="sha1">ea1a76d9ebdc82fe742d32798aaee7c980afd2f6</sdk:checksum> + <sdk:url>android-ndk-r13-beta2-linux-x86_64.zip</sdk:url> + <sdk:host-os>linux</sdk:host-os> + <sdk:host-bits>64</sdk:host-bits> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Aug 23 15:40:19 2016.--> + <sdk:size>619981813</sdk:size> + <sdk:checksum type="sha1">a5f6edceb3afa4ecd47071822ea32ba6bd6ac002</sdk:checksum> + <sdk:url>android-ndk-r13-beta2-windows-x86.zip</sdk:url> + <sdk:host-os>windows</sdk:host-os> + <sdk:host-bits>32</sdk:host-bits> + </sdk:archive> + <sdk:archive> + <!--Built on: Tue Aug 23 15:40:37 2016.--> + <sdk:size>680836961</sdk:size> + <sdk:checksum type="sha1">a0b6a0ed271b0a99cdca28ce8fd405f89defc539</sdk:checksum> + <sdk:url>android-ndk-r13-beta2-windows-x86_64.zip</sdk:url> + <sdk:host-os>windows</sdk:host-os> + <sdk:host-bits>64</sdk:host-bits> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-preview-license"/> + </sdk:ndk> <sdk:platform> - <!--Generated from bid:3051502, branch:git_nyc-preview-release--> + <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> <sdk:version>7.0</sdk:version> <sdk:api-level>24</sdk:api-level> <sdk:description>Android SDK Platform 24</sdk:description> <sdk:revision>2</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 13:51:08 2016.--> - <sdk:size>82645675</sdk:size> - <sdk:checksum type="sha1">27516dab4848f55896e16f7089038c62bbbffea7</sdk:checksum> - <sdk:url>platform-24_r01.zip</sdk:url> + <!--Built on: Mon Aug 22 11:05:39 2016.--> + <sdk:size>82648154</sdk:size> + <sdk:checksum type="sha1">8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee</sdk:checksum> + <sdk:url>platform-24_r02.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> @@ -953,6 +993,20 @@ June 2014.</sdk:license> </sdk:layoutlib> </sdk:platform> <sdk:source> + <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> + <sdk:api-level>24</sdk:api-level> + <sdk:revision>1</sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Mon Aug 22 11:05:30 2016.--> + <sdk:size>30270410</sdk:size> + <sdk:checksum type="sha1">6b96115830a83d654479f32ce4b724ca9011148b</sdk:checksum> + <sdk:url>sources-24_r01.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:source> + <sdk:source> <!--Generated from bid:2166767, branch:git_mnc-release--> <sdk:api-level>23</sdk:api-level> <sdk:revision>1</sdk:revision> @@ -1094,7 +1148,39 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:source> <sdk:build-tool> - <!--Generated from bid:3051502, branch:git_nyc-preview-release--> + <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> + <sdk:revision> + <sdk:major>24</sdk:major> + <sdk:minor>0</sdk:minor> + <sdk:micro>2</sdk:micro> + </sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Mon Aug 22 11:05:10 2016.--> + <sdk:size>48936295</sdk:size> + <sdk:checksum type="sha1">f199a7a788c3fefbed102eea34d6007737b803cf</sdk:checksum> + <sdk:url>build-tools_r24.0.2-linux.zip</sdk:url> + <sdk:host-os>linux</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Mon Aug 22 11:05:08 2016.--> + <sdk:size>48726190</sdk:size> + <sdk:checksum type="sha1">8bb8fc575477491d5957de743089df412de55cda</sdk:checksum> + <sdk:url>build-tools_r24.0.2-macosx.zip</sdk:url> + <sdk:host-os>macosx</sdk:host-os> + </sdk:archive> + <sdk:archive> + <!--Built on: Mon Aug 22 11:05:05 2016.--> + <sdk:size>49512513</sdk:size> + <sdk:checksum type="sha1">09586a1f1c39bcfa7db5205c9a07837247deb67e</sdk:checksum> + <sdk:url>build-tools_r24.0.2-windows.zip</sdk:url> + <sdk:host-os>windows</sdk:host-os> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + </sdk:build-tool> + <sdk:build-tool> + <!--Generated from bid:3208200, branch:git_nyc-dev--> <sdk:revision> <sdk:major>24</sdk:major> <sdk:minor>0</sdk:minor> @@ -1102,23 +1188,23 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:49 2016.--> - <sdk:size>48936213</sdk:size> - <sdk:checksum type="sha1">d3647db5c349247787d4e124dfb717e72b4304c7</sdk:checksum> + <!--Built on: Tue Aug 23 11:42:33 2016.--> + <sdk:size>48936286</sdk:size> + <sdk:checksum type="sha1">84f18c392919a074fcbb9b1d967984e6b2fef8b4</sdk:checksum> <sdk:url>build-tools_r24.0.1-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:47 2016.--> - <sdk:size>48725466</sdk:size> - <sdk:checksum type="sha1">4fb942e52d05ded78719410fc8644e70a62f18d6</sdk:checksum> + <!--Built on: Tue Aug 23 11:42:31 2016.--> + <sdk:size>48726085</sdk:size> + <sdk:checksum type="sha1">5c6457fcdfa07724fb086d8ff4e8316fc0742848</sdk:checksum> <sdk:url>build-tools_r24.0.1-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:45 2016.--> - <sdk:size>49511433</sdk:size> - <sdk:checksum type="sha1">f73cc9028bff45689351ac8e093876bbeb80d1f1</sdk:checksum> + <!--Built on: Tue Aug 23 11:42:30 2016.--> + <sdk:size>49511883</sdk:size> + <sdk:checksum type="sha1">ac4a7cea42c3ef74d7fbf1b992fad311c550034e</sdk:checksum> <sdk:url>build-tools_r24.0.1-windows.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> </sdk:archive> @@ -1134,21 +1220,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jun 10 15:06:14 2016.--> + <!--Built on: Mon Aug 15 04:18:09 2016.--> <sdk:size>48960919</sdk:size> <sdk:checksum type="sha1">c6271c4d78a5612ea6c7150688bcd5b7313de8d1</sdk:checksum> <sdk:url>build-tools_r24-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jun 10 15:06:11 2016.--> + <!--Built on: Mon Aug 15 04:18:36 2016.--> <sdk:size>48747930</sdk:size> <sdk:checksum type="sha1">97fc4ed442f23989cc488d02c1d1de9bdde241de</sdk:checksum> <sdk:url>build-tools_r24-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jun 10 15:06:10 2016.--> + <!--Built on: Mon Aug 15 04:19:02 2016.--> <sdk:size>49535326</sdk:size> <sdk:checksum type="sha1">dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7</sdk:checksum> <sdk:url>build-tools_r24-windows.zip</sdk:url> @@ -1166,21 +1252,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:56 2016.--> + <!--Built on: Mon Aug 15 04:18:06 2016.--> <sdk:size>39071201</sdk:size> <sdk:checksum type="sha1">8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3</sdk:checksum> <sdk:url>build-tools_r23.0.2-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:56 2016.--> + <!--Built on: Mon Aug 15 04:19:01 2016.--> <sdk:size>38060914</sdk:size> <sdk:checksum type="sha1">482c4cbceef8ff58aefd92d8155a38610158fdaf</sdk:checksum> <sdk:url>build-tools_r23.0.2-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:56 2016.--> + <!--Built on: Mon Aug 15 04:19:55 2016.--> <sdk:size>38217626</sdk:size> <sdk:checksum type="sha1">fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96</sdk:checksum> <sdk:url>build-tools_r23.0.2-windows.zip</sdk:url> @@ -1198,21 +1284,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Tue Mar 15 17:38:51 2016.--> + <!--Built on: Mon Aug 15 04:18:13 2016.--> <sdk:size>40733174</sdk:size> <sdk:checksum type="sha1">368f2600feac7e9b511b82f53d1f2240ae4a91a3</sdk:checksum> <sdk:url>build-tools_r23.0.3-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Tue Mar 15 17:38:50 2016.--> + <!--Built on: Mon Aug 15 04:18:36 2016.--> <sdk:size>39679533</sdk:size> <sdk:checksum type="sha1">fbc98cd303fd15a31d472de6c03bd707829f00b0</sdk:checksum> <sdk:url>build-tools_r23.0.3-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Tue Mar 15 17:38:48 2016.--> + <!--Built on: Mon Aug 15 04:18:59 2016.--> <sdk:size>39869945</sdk:size> <sdk:checksum type="sha1">c6d8266c6a3243c8f1e41b786c0e3cee4c781263</sdk:checksum> <sdk:url>build-tools_r23.0.3-windows.zip</sdk:url> @@ -1263,21 +1349,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:54 2016.--> + <!--Built on: Mon Aug 15 04:18:06 2016.--> <sdk:size>39080519</sdk:size> <sdk:checksum type="sha1">c1d6209212b01469f80fa804e0c1d39a06bc9060</sdk:checksum> <sdk:url>build-tools_r23-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:54 2016.--> + <!--Built on: Mon Aug 15 04:19:19 2016.--> <sdk:size>38070540</sdk:size> <sdk:checksum type="sha1">90ba6e716f7703a236cd44b2e71c5ff430855a03</sdk:checksum> <sdk:url>build-tools_r23-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:54 2016.--> + <!--Built on: Mon Aug 15 04:20:17 2016.--> <sdk:size>38570715</sdk:size> <sdk:checksum type="sha1">3874948f35f2f8946597679cc6e9151449f23b5d</sdk:checksum> <sdk:url>build-tools_r23-windows.zip</sdk:url> @@ -1295,21 +1381,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:53 2016.--> + <!--Built on: Mon Aug 15 04:18:01 2016.--> <sdk:size>33104577</sdk:size> <sdk:checksum type="sha1">da8b9c5c3ede39298e6cf0283c000c2ee9029646</sdk:checksum> <sdk:url>build-tools_r22.0.1-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:54 2016.--> + <!--Built on: Mon Aug 15 04:18:48 2016.--> <sdk:size>33646102</sdk:size> <sdk:checksum type="sha1">53dad7f608e01d53b17176ba11165acbfccc5bbf</sdk:checksum> <sdk:url>build-tools_r22.0.1-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:54 2016.--> + <!--Built on: Mon Aug 15 04:19:49 2016.--> <sdk:size>33254137</sdk:size> <sdk:checksum type="sha1">61d8cbe069d9e0a57872a83e5e5abe164b7d52cf</sdk:checksum> <sdk:url>build-tools_r22.0.1-windows.zip</sdk:url> @@ -1328,21 +1414,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:53 2016.--> + <!--Built on: Mon Aug 15 04:17:57 2016.--> <sdk:size>33104280</sdk:size> <sdk:checksum type="sha1">a8a1619dd090e44fac957bce6842e62abf87965b</sdk:checksum> <sdk:url>build-tools_r22-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:53 2016.--> + <!--Built on: Mon Aug 15 04:18:14 2016.--> <sdk:size>33646090</sdk:size> <sdk:checksum type="sha1">af95429b24088d704bc5db9bd606e34ac1b82c0d</sdk:checksum> <sdk:url>build-tools_r22-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:53 2016.--> + <!--Built on: Mon Aug 15 04:19:09 2016.--> <sdk:size>33254114</sdk:size> <sdk:checksum type="sha1">08fcca41e81b172bd9f570963b90d3a84929e043</sdk:checksum> <sdk:url>build-tools_r22-windows.zip</sdk:url> @@ -1360,21 +1446,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:52 2016.--> + <!--Built on: Mon Aug 15 04:17:59 2016.--> <sdk:size>32637678</sdk:size> <sdk:checksum type="sha1">5e35259843bf2926113a38368b08458735479658</sdk:checksum> <sdk:url>build-tools_r21.1.2-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:52 2016.--> + <!--Built on: Mon Aug 15 04:18:34 2016.--> <sdk:size>33152878</sdk:size> <sdk:checksum type="sha1">e7c906b4ba0eea93b32ba36c610dbd6b204bff48</sdk:checksum> <sdk:url>build-tools_r21.1.2-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:52 2016.--> + <!--Built on: Mon Aug 15 04:19:25 2016.--> <sdk:size>32792587</sdk:size> <sdk:checksum type="sha1">1d944759c47f60e634d2b8a1f3a4259be2f8d652</sdk:checksum> <sdk:url>build-tools_r21.1.2-windows.zip</sdk:url> @@ -1393,21 +1479,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:51 2016.--> + <!--Built on: Mon Aug 15 04:17:59 2016.--> <sdk:size>32642454</sdk:size> <sdk:checksum type="sha1">1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d</sdk:checksum> <sdk:url>build-tools_r21.1.1-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:52 2016.--> + <!--Built on: Mon Aug 15 04:18:16 2016.--> <sdk:size>33157676</sdk:size> <sdk:checksum type="sha1">836a146eab0504aa9387a5132e986fe7c7381571</sdk:checksum> <sdk:url>build-tools_r21.1.1-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:52 2016.--> + <!--Built on: Mon Aug 15 04:18:32 2016.--> <sdk:size>32797356</sdk:size> <sdk:checksum type="sha1">53fc4201237f899d5cd92f0b76ad41fb89da188b</sdk:checksum> <sdk:url>build-tools_r21.1.1-windows.zip</sdk:url> @@ -1426,21 +1512,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:51 2016.--> + <!--Built on: Mon Aug 15 04:17:58 2016.--> <sdk:size>32642820</sdk:size> <sdk:checksum type="sha1">b7455e543784d52a8925f960bc880493ed1478cb</sdk:checksum> <sdk:url>build-tools_r21.1-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:51 2016.--> + <!--Built on: Mon Aug 15 04:18:34 2016.--> <sdk:size>33158159</sdk:size> <sdk:checksum type="sha1">df619356c2359aa5eacdd48699d15b335d9bd246</sdk:checksum> <sdk:url>build-tools_r21.1-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:51 2016.--> + <!--Built on: Mon Aug 15 04:19:31 2016.--> <sdk:size>32797810</sdk:size> <sdk:checksum type="sha1">c79d63ac6b713a1e326ad4dae43f2ee76708a2f4</sdk:checksum> <sdk:url>build-tools_r21.1-windows.zip</sdk:url> @@ -1459,21 +1545,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:50 2016.--> + <!--Built on: Mon Aug 15 04:17:56 2016.--> <sdk:size>22153122</sdk:size> <sdk:checksum type="sha1">e1236ab8897b62b57414adcf04c132567b2612a5</sdk:checksum> <sdk:url>build-tools_r21.0.2-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:50 2016.--> + <!--Built on: Mon Aug 15 04:18:09 2016.--> <sdk:size>22668597</sdk:size> <sdk:checksum type="sha1">f17471c154058f3734729ef3cc363399b1cd3de1</sdk:checksum> <sdk:url>build-tools_r21.0.2-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:50 2016.--> + <!--Built on: Mon Aug 15 04:19:02 2016.--> <sdk:size>22306371</sdk:size> <sdk:checksum type="sha1">37496141b23cbe633167927b7abe6e22d9f1a1c1</sdk:checksum> <sdk:url>build-tools_r21.0.2-windows.zip</sdk:url> @@ -1492,21 +1578,21 @@ June 2014.</sdk:license> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:49 2016.--> + <!--Built on: Mon Aug 15 04:17:55 2016.--> <sdk:size>22153013</sdk:size> <sdk:checksum type="sha1">e573069eea3e5255e7a65bedeb767f4fd0a5f49a</sdk:checksum> <sdk:url>build-tools_r21.0.1-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:50 2016.--> + <!--Built on: Mon Aug 15 04:18:08 2016.--> <sdk:size>22668616</sdk:size> <sdk:checksum type="sha1">b60c8f9b810c980abafa04896706f3911be1ade7</sdk:checksum> <sdk:url>build-tools_r21.0.1-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Mon Mar 28 00:56:50 2016.--> + <!--Built on: Mon Aug 15 04:18:21 2016.--> <sdk:size>22306243</sdk:size> <sdk:checksum type="sha1">d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df</sdk:checksum> <sdk:url>build-tools_r21.0.1-windows.zip</sdk:url> @@ -1877,100 +1963,64 @@ June 2014.</sdk:license> <sdk:uses-license ref="android-sdk-license"/> </sdk:build-tool> <sdk:platform-tool> - <!--Generated from bid:3051502, branch:nyc_preview_release--> + <!--Generated from bid:3264814, branch:git_nyc-sdk-dev--> <sdk:revision> <sdk:major>24</sdk:major> <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> + <sdk:micro>2</sdk:micro> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:59 2016.--> - <sdk:size>3328487</sdk:size> - <sdk:checksum type="sha1">597f626c206dac435b55c64bbfa13e153a7d97c2</sdk:checksum> - <sdk:url>platform-tools_r24-linux.zip</sdk:url> + <!--Built on: Mon Sep 12 16:08:48 2016.--> + <sdk:size>3341647</sdk:size> + <sdk:checksum type="sha1">a268850d31973d32de5c1515853f81924a4068cf</sdk:checksum> + <sdk:url>platform-tools_r24.0.2-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:58 2016.--> - <sdk:size>3143839</sdk:size> - <sdk:checksum type="sha1">f089af7906ccb6a43691b9bad9bb197e7104902e</sdk:checksum> - <sdk:url>platform-tools_r24-macosx.zip</sdk:url> + <!--Built on: Mon Sep 12 16:08:48 2016.--> + <sdk:size>3157182</sdk:size> + <sdk:checksum type="sha1">16053da716cbc6ef31c32a0d2f1437b22089c88c</sdk:checksum> + <sdk:url>platform-tools_r24.0.2-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Fri Jul 15 13:50:58 2016.--> - <sdk:size>2984063</sdk:size> - <sdk:checksum type="sha1">f1e2d122544d7beaa6f979e485fe742ba735802e</sdk:checksum> - <sdk:url>platform-tools_r24-windows.zip</sdk:url> + <!--Built on: Mon Sep 12 16:08:47 2016.--> + <sdk:size>2997417</sdk:size> + <sdk:checksum type="sha1">ce09a7351d5c50865691554ed56325f6e5cd733c</sdk:checksum> + <sdk:url>platform-tools_r24.0.2-windows.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> </sdk:platform-tool> <sdk:tool> - <!--Generated from bid:2879327, branch:aosp-emu-2.0-release--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>7</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 18 11:42:01 2016.--> - <sdk:size>234442830</sdk:size> - <sdk:checksum type="sha1">36869e6c81cda18f862959a92301761f81bc06b8</sdk:checksum> - <sdk:url>tools_r25.1.7-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed May 18 11:41:53 2016.--> - <sdk:size>161408907</sdk:size> - <sdk:checksum type="sha1">0fc555651bc6c7fc93237316311d3b435747bf3b</sdk:checksum> - <sdk:url>tools_r25.1.7-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed May 18 11:41:48 2016.--> - <sdk:size>230413711</sdk:size> - <sdk:checksum type="sha1">2556ac9a5fa741d44d9b989966c0bbdf15cb6424</sdk:checksum> - <sdk:url>tools_r25.1.7-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-platform-tools-rev> - <sdk:major>20</sdk:major> - </sdk:min-platform-tools-rev> - </sdk:tool> - <sdk:tool> - <!--Generated from bid:3037468, branch:aosp-emu-2.2-release--> + <!--Generated from bid:3098464, branch:aosp-emu-2.2-release--> <sdk:revision> <sdk:major>25</sdk:major> <sdk:minor>2</sdk:minor> - <sdk:micro>0</sdk:micro> - <sdk:preview>1</sdk:preview> + <sdk:micro>2</sdk:micro> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Thu Jul 7 09:13:33 2016.--> - <sdk:size>277445993</sdk:size> - <sdk:checksum type="sha1">084ff93feb2f432f532cb00375e582f46b583ff2</sdk:checksum> - <sdk:url>tools_r25.2-linux.zip</sdk:url> + <!--Built on: Fri Jul 29 11:26:26 2016.--> + <sdk:size>273491448</sdk:size> + <sdk:checksum type="sha1">99257925a3d8b46fee948a7520d7b7e3e3e1890e</sdk:checksum> + <sdk:url>tools_r25.2.2-linux.zip</sdk:url> <sdk:host-os>linux</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Thu Jul 7 09:13:24 2016.--> - <sdk:size>195767390</sdk:size> - <sdk:checksum type="sha1">e49cc97f6f408fde9181f11ab942dbbea31abce3</sdk:checksum> - <sdk:url>tools_r25.2-macosx.zip</sdk:url> + <!--Built on: Fri Jul 29 11:26:16 2016.--> + <sdk:size>195856788</sdk:size> + <sdk:checksum type="sha1">bbaa3929696ce523ea62b58cc8032d7964a154c5</sdk:checksum> + <sdk:url>tools_r25.2.2-macosx.zip</sdk:url> <sdk:host-os>macosx</sdk:host-os> </sdk:archive> <sdk:archive> - <!--Built on: Thu Jul 7 09:13:18 2016.--> - <sdk:size>301550581</sdk:size> - <sdk:checksum type="sha1">cc8bcbd7fb5627ab866cc583b041d0bfc18e4441</sdk:checksum> - <sdk:url>tools_r25.2-windows.zip</sdk:url> + <!--Built on: Fri Jul 29 11:26:07 2016.--> + <sdk:size>301642481</sdk:size> + <sdk:checksum type="sha1">ef898dff805c4b9e39f6e77fd9ec397fb1b1f809</sdk:checksum> + <sdk:url>tools_r25.2.2-windows.zip</sdk:url> <sdk:host-os>windows</sdk:host-os> </sdk:archive> </sdk:archives> @@ -1980,15 +2030,15 @@ June 2014.</sdk:license> </sdk:min-platform-tools-rev> </sdk:tool> <sdk:doc> - <!--Generated from bid:2166767, branch:git_mnc-release--> - <sdk:api-level>23</sdk:api-level> + <!--Generated from bid:3249234, branch:git_nyc-emu-release--> + <sdk:api-level>24</sdk:api-level> <sdk:revision>1</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Mon Mar 28 00:57:04 2016.--> - <sdk:size>332171437</sdk:size> - <sdk:checksum type="sha1">060ebab2f74861e1ddd9136df26b837312bc087f</sdk:checksum> - <sdk:url>docs-23_r01.zip</sdk:url> + <!--Built on: Thu Sep 8 15:25:04 2016.--> + <sdk:size>419477967</sdk:size> + <sdk:checksum type="sha1">eef58238949ee9544876cb3e002f2d58e4ee7b5d</sdk:checksum> + <sdk:url>docs-24_r01.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 1138d8284d4c..237f13482321 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2016-07-15 21:31:22.867420 with ADRT.--> + <!--Generated on 2016-09-12 21:35:04.795787 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -558,23 +558,40 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3065232, branch:git_nyc-emu-release--> + <!--Generated from bid:3245079, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>7</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 10:08:55 2016.--> - <sdk:size>497498007</sdk:size> - <sdk:checksum type="sha1">2eb8fb86f7312614a2a0b033d669d67206a618ff</sdk:checksum> - <sdk:url>sysimg_armeabi-v7a-24_r05.zip</sdk:url> + <!--Built on: Tue Sep 6 08:28:18 2016.--> + <sdk:size>283677512</sdk:size> + <sdk:checksum type="sha1">3454546b4eed2d6c3dd06d47757d6da9f4176033</sdk:checksum> + <sdk:url>armeabi-v7a-24_r07.zip</sdk:url> </sdk:archive> </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> + <sdk:uses-license ref="android-sdk-license"/> <sdk:abi>armeabi-v7a</sdk:abi> <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> + <!--Generated from bid:3245079, branch:git_nyc-emu-release--> + <sdk:api-level>24</sdk:api-level> + <sdk:description>ARM 64 v8a System Image</sdk:description> + <sdk:revision>7</sdk:revision> + <sdk:archives> + <sdk:archive> + <!--Built on: Tue Sep 6 08:28:58 2016.--> + <sdk:size>384556503</sdk:size> + <sdk:checksum type="sha1">e8ab2e49e4efe4b064232b33b5eeaded61437d7f</sdk:checksum> + <sdk:url>arm64-v8a-24_r07.zip</sdk:url> + </sdk:archive> + </sdk:archives> + <sdk:uses-license ref="android-sdk-license"/> + <sdk:abi>arm64-v8a</sdk:abi> + <sdk:tag-id>default</sdk:tag-id> + </sdk:system-image> + <sdk:system-image> <!--Generated from bid:1741834, branch:git_ics-mr1--> <sdk:api-level>15</sdk:api-level> <sdk:description>MIPS System Image</sdk:description> @@ -779,19 +796,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3065232, branch:git_nyc-emu-release--> + <!--Generated from bid:3245079, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>7</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 10:09:24 2016.--> - <sdk:size>535224957</sdk:size> - <sdk:checksum type="sha1">ce6441c4cadaecd28b364c59b36c31ef0904dae0</sdk:checksum> - <sdk:url>sysimg_x86-24_r05.zip</sdk:url> + <!--Built on: Tue Sep 6 08:29:27 2016.--> + <sdk:size>302213276</sdk:size> + <sdk:checksum type="sha1">566fdee283a907854bfa3c174265bc31f396eabd</sdk:checksum> + <sdk:url>x86-24_r07.zip</sdk:url> </sdk:archive> </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> + <sdk:uses-license ref="android-sdk-license"/> <sdk:abi>x86</sdk:abi> <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> @@ -847,19 +864,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS ISâ <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> <sdk:system-image> - <!--Generated from bid:3065232, branch:git_nyc-emu-release--> + <!--Generated from bid:3245079, branch:git_nyc-emu-release--> <sdk:api-level>24</sdk:api-level> <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>5</sdk:revision> + <sdk:revision>7</sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 10:10:10 2016.--> - <sdk:size>727226879</sdk:size> - <sdk:checksum type="sha1">e1869b32b1dcb2f4d4d18c912166b3e2bee8a841</sdk:checksum> - <sdk:url>sysimg_x86_64-24_r05.zip</sdk:url> + <!--Built on: Tue Sep 6 08:29:51 2016.--> + <sdk:size>407148033</sdk:size> + <sdk:checksum type="sha1">a379932395ced0a8f572b39c396d86e08827a9ba</sdk:checksum> + <sdk:url>x86_64-24_r07.zip</sdk:url> </sdk:archive> </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> + <sdk:uses-license ref="android-sdk-license"/> <sdk:abi>x86_64</sdk:abi> <sdk:tag-id>default</sdk:tag-id> </sdk:system-image> diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index cd6ac3b2943a..2c8e1b33a464 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -207,27 +207,35 @@ in }; }; + sysimg_arm64-v8a_24 = buildSystemImage { + name = "sysimg-arm64-v8a-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + }; + }; + sysimg_armeabi-v7a_24 = buildSystemImage { name = "sysimg-armeabi-v7a-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armeabi-v7a-24_r05.zip; - sha1 = "2eb8fb86f7312614a2a0b033d669d67206a618ff"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; }; }; sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-24_r05.zip; - sha1 = "ce6441c4cadaecd28b364c59b36c31ef0904dae0"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; + sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-24_r05.zip; - sha1 = "e1869b32b1dcb2f4d4d18c912166b3e2bee8a841"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; + sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; }; }; } diff --git a/pkgs/development/node-packages/README b/pkgs/development/node-packages/README deleted file mode 100644 index 48354324a053..000000000000 --- a/pkgs/development/node-packages/README +++ /dev/null @@ -1,13 +0,0 @@ -How to update the NPM packages -============================== -- Install node2nix: - -nix-env -f '<nixpkgs>' -iA node2nix - -- Modify node-packages.json, add, update or remove package entries - -- Run the script: - -sh generate.sh - -- Done! diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md new file mode 100644 index 000000000000..138d1475c2fe --- /dev/null +++ b/pkgs/development/node-packages/README.md @@ -0,0 +1,13 @@ +Node.js packages +=============== +To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: + + 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA node2nix`. + 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, + or remove package entries. + 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`. + 4. Build your new package to test your changes: `cd /path/to/nixpkgs && + nix-build -A nodePackages.<new-or-updated-package>`. To build against a + specific node.js version (e.g. 5.x): `nix-build -A + nodePackages_5_x.<new-or-updated-package>` + 5. Add, commit, and share your changes! diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 05c18f861a0c..1c0f5f0626ed 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix index a1567025c7d6..be9201677ce0 100644 --- a/pkgs/development/node-packages/composition-v5.nix +++ b/pkgs/development/node-packages/composition-v5.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 5d724034201b..99cb7ca40441 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -35,5 +35,16 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0"; + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix index c858c580d2a4..00dce5966aae 100644 --- a/pkgs/development/node-packages/default-v5.nix +++ b/pkgs/development/node-packages/default-v5.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index c858c580d2a4..00dce5966aae 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 29995f22e26e..c5c69c7d05d7 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -227,6 +227,9 @@ let done done fi + + # Run post install hook, if provided + runHook postInstall ''; }); diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index b506ea1d2695..d98359053370 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; "os-homedir-1.0.1" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.16.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; + sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -715,13 +724,13 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.0" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; + sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; }; }; "applicationinsights-0.15.12" = { @@ -841,13 +850,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.0" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +940,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1012,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1156,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1813,13 +1831,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; "sshpk-1.10.0" = { @@ -1840,13 +1858,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1957,15 +1975,6 @@ let sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; }; }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1975,220 +1984,13 @@ let sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; }; }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; "extend-1.2.1" = { @@ -2218,6 +2020,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "request-2.69.0" = { + name = "request"; + packageName = "request"; + version = "2.69.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + }; "jsonparse-1.2.0" = { name = "jsonparse"; packageName = "jsonparse"; @@ -2227,6 +2038,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + }; + }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -2308,24 +2137,6 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; "async-0.2.7" = { name = "async"; packageName = "async"; @@ -2497,13 +2308,13 @@ let sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; }; }; - "once-1.3.3" = { + "once-1.4.0" = { name = "once"; packageName = "once"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; "path-is-absolute-1.0.0" = { @@ -2578,22 +2389,31 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; "ctype-0.5.2" = { @@ -3028,6 +2848,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3127,13 +2956,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; "array-find-index-1.0.1" = { @@ -3703,13 +3532,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3937,13 +3766,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.6" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; + sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; }; }; "public-encrypt-4.0.0" = { @@ -4000,13 +3829,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4063,13 +3892,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4288,6 +4117,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4981,13 +4819,13 @@ let sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5575,6 +5413,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5647,6 +5494,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5746,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -7042,13 +6907,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6934,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6961,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6988,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,15 +7177,6 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7420,6 +7276,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7330,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7510,13 +7510,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -8477,13 +8477,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8873,13 +8873,121 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; + sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8927,13 +9035,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -9053,15 +9161,6 @@ let sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; - }; - }; "es6-map-0.1.4" = { name = "es6-map"; packageName = "es6-map"; @@ -9827,13 +9926,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -11124,13 +11223,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; + sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; }; }; "escodegen-1.8.1" = { @@ -11304,22 +11403,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11358,13 +11457,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -11448,15 +11547,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "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"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11520,6 +11610,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12339,13 +12438,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12420,6 +12519,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12447,6 +12555,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12609,6 +12735,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12654,6 +12789,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12915,13 +13059,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -14256,13 +14400,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14274,22 +14418,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14301,22 +14445,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14382,40 +14526,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.4.1" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; + sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.5.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; + sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.4.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; + sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.3.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; + sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; }; }; "npm-install-checks-3.0.0" = { @@ -14427,6 +14571,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14445,6 +14598,15 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14490,33 +14652,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14742,13 +14877,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14787,40 +14922,49 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.union-4.5.0" = { + "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "airplayer-2.0.0" = { @@ -14940,13 +15084,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14976,13 +15120,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15886,13 +16030,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.4" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; + sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; }; }; "node-swt-0.1.1" = { @@ -16228,13 +16372,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -16552,6 +16696,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16795,13 +16948,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16993,13 +17146,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17038,6 +17191,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"; @@ -17191,6 +17353,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17200,6 +17398,33 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17389,13 +17614,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -17557,10 +17782,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17617,7 +17842,7 @@ in sources."os-tmpdir-1.0.1" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -17651,6 +17876,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17661,10 +17887,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; + sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17676,7 +17902,7 @@ in dependencies = [ (sources."concat-stream-1.4.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-1.1.14" // { dependencies = [ @@ -17750,7 +17976,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -17830,10 +18056,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -17884,82 +18110,20 @@ in sources."azure-arm-hdinsight-0.2.0" 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-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.16.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - (sources."azure-common-0.9.12" // { - dependencies = [ - (sources."xml2js-0.2.7" // { - dependencies = [ - sources."sax-0.5.2" - ]; - }) - sources."dateformat-1.0.2-1.2.3" - (sources."request-2.45.0" // { - dependencies = [ - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."tunnel-agent-0.4.3" - (sources."form-data-0.1.4" // { - dependencies = [ - (sources."combined-stream-0.0.7" // { - dependencies = [ - sources."delayed-stream-0.0.5" - ]; - }) - sources."mime-1.2.11" - sources."async-0.9.2" - ]; - }) - sources."tough-cookie-2.3.1" - (sources."http-signature-0.10.1" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.4.0" - (sources."hawk-1.1.1" // { - dependencies = [ - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - ]; - }) - sources."validator-3.1.0" - sources."envconf-0.0.4" - sources."duplexer-0.1.1" - ]; - }) - sources."moment-2.6.0" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.0.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17969,14 +18133,18 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) (sources."azure-storage-1.1.0" // { dependencies = [ sources."extend-1.2.1" @@ -17990,99 +18158,18 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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."validator-3.22.2" - (sources."xml2js-0.2.7" // { - dependencies = [ - sources."sax-0.5.2" - ]; - }) - ]; - }) - sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" - sources."applicationinsights-0.15.12" - (sources."caller-id-0.1.0" // { - dependencies = [ - sources."stack-trace-0.0.9" - ]; - }) - sources."colors-1.1.2" - (sources."commander-1.0.4" // { - dependencies = [ - sources."keypress-0.1.0" - ]; - }) - sources."easy-table-0.0.1" - (sources."event-stream-3.1.5" // { - dependencies = [ - sources."duplexer-0.1.1" - sources."from-0.1.3" - sources."map-stream-0.1.0" - sources."pause-stream-0.0.11" - sources."split-0.2.10" - sources."stream-combiner-0.0.4" - ]; - }) - sources."eyes-0.1.8" - sources."github-0.1.6" - sources."fast-json-patch-0.5.6" - sources."js2xmlparser-1.0.0" - (sources."jsonlint-1.6.2" // { - dependencies = [ - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."underscore-1.6.0" - (sources."chalk-0.4.0" // { - dependencies = [ - sources."has-color-0.1.7" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" - ]; - }) - ]; - }) - sources."JSV-4.0.2" - ]; - }) - sources."jsrsasign-4.8.2" - (sources."kuduscript-1.0.8" // { - dependencies = [ - (sources."commander-1.1.1" // { - dependencies = [ - sources."keypress-0.1.0" - ]; - }) - sources."streamline-0.4.11" - ]; - }) - sources."moment-2.14.1" - (sources."ms-rest-1.15.0" // { - dependencies = [ - (sources."request-2.74.0" // { + (sources."request-2.69.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.1" - 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."bl-1.0.3" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -18154,10 +18241,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -18188,14 +18275,81 @@ in sources."mime-db-1.23.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.0.2" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.1" + sources."tough-cookie-2.2.2" sources."tunnel-agent-0.4.3" ]; }) + sources."validator-3.22.2" + (sources."xml2js-0.2.7" // { + dependencies = [ + sources."sax-0.5.2" + ]; + }) + ]; + }) + sources."azure-arm-batch-0.2.0" + sources."azure-batch-0.5.0" + sources."applicationinsights-0.15.12" + (sources."caller-id-0.1.0" // { + dependencies = [ + sources."stack-trace-0.0.9" + ]; + }) + sources."colors-1.1.2" + (sources."commander-1.0.4" // { + dependencies = [ + sources."keypress-0.1.0" + ]; + }) + sources."easy-table-0.0.1" + (sources."event-stream-3.1.5" // { + dependencies = [ + sources."duplexer-0.1.1" + sources."from-0.1.3" + sources."map-stream-0.1.0" + sources."pause-stream-0.0.11" + sources."split-0.2.10" + sources."stream-combiner-0.0.4" + ]; + }) + sources."eyes-0.1.8" + sources."github-0.1.6" + sources."fast-json-patch-0.5.6" + sources."js2xmlparser-1.0.0" + (sources."jsonlint-1.6.2" // { + dependencies = [ + (sources."nomnom-1.8.1" // { + dependencies = [ + sources."underscore-1.6.0" + (sources."chalk-0.4.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + }) + ]; + }) + sources."JSV-4.0.2" + ]; + }) + sources."jsrsasign-4.8.2" + (sources."kuduscript-1.0.8" // { + dependencies = [ + (sources."commander-1.1.1" // { + dependencies = [ + sources."keypress-0.1.0" + ]; + }) + sources."streamline-0.4.11" + ]; + }) + sources."moment-2.15.0" + (sources."ms-rest-1.15.0" // { + dependencies = [ sources."duplexer-0.1.1" ]; }) @@ -18241,7 +18395,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18252,7 +18406,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18281,19 +18435,19 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" - (sources."bl-1.0.3" // { + (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18373,10 +18527,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -18409,9 +18563,9 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.0.2" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) @@ -18437,7 +18591,7 @@ in dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -18468,6 +18622,11 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + (sources."user-home-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.1" + ]; + }) sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -18492,6 +18651,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18507,6 +18667,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18517,10 +18678,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; dependencies = [ (sources."argparse-1.0.4" // { @@ -18551,7 +18712,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -18570,7 +18731,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-2.1.1" @@ -18581,7 +18742,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18611,7 +18772,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -18752,7 +18913,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18763,7 +18924,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18804,7 +18965,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18815,7 +18976,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18824,6 +18985,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18899,12 +19061,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -18921,7 +19083,7 @@ in sources."browserify-rsa-4.0.1" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -18935,7 +19097,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -18948,7 +19110,7 @@ in sources."bn.js-4.11.6" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -18956,7 +19118,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -18967,12 +19129,12 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.6" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -18987,7 +19149,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -19020,7 +19182,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19035,7 +19197,7 @@ in }) sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -19114,7 +19276,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.3.1" // { + (sources."stream-http-2.4.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -19151,7 +19313,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -19159,6 +19325,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -19273,7 +19440,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -19460,12 +19627,12 @@ in }) (sources."simple-get-2.2.2" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -19514,7 +19681,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -19553,7 +19720,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19565,7 +19732,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -19589,7 +19756,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19600,7 +19767,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19649,7 +19816,7 @@ in ]; }) sources."ip-1.1.3" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19658,7 +19825,7 @@ in sources."run-series-1.1.4" (sources."simple-get-2.2.2" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -19706,7 +19873,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -19810,7 +19977,7 @@ in sources."voc-0.5.0" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -19847,6 +20014,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -19862,6 +20030,7 @@ in url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -19913,7 +20082,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19924,7 +20093,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20020,12 +20189,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -20042,7 +20211,7 @@ in sources."browserify-rsa-4.0.1" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -20056,7 +20225,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20069,7 +20238,7 @@ in sources."bn.js-4.11.6" (sources."elliptic-6.3.1" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -20077,7 +20246,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -20088,12 +20257,12 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.6" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -20108,7 +20277,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20142,7 +20311,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20161,7 +20330,7 @@ in ]; }) sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-6.6.3" // { dependencies = [ (sources."combine-source-map-0.6.1" // { @@ -20276,7 +20445,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -20433,7 +20606,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20444,7 +20617,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20461,7 +20634,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20472,7 +20645,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20534,7 +20707,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."abbrev-1.0.9" sources."ansi-0.3.1" @@ -20594,7 +20767,7 @@ in sources."graceful-fs-4.1.6" sources."hosted-git-info-2.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" sources."lockfile-1.0.1" (sources."lru-cache-4.0.1" // { @@ -20658,7 +20831,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" sources."npm-package-arg-4.1.1" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -20674,7 +20847,6 @@ in }) ]; }) - sources."retry-0.8.0" ]; }) sources."npm-user-validate-0.1.5" @@ -20695,14 +20867,14 @@ in }) ]; }) - sources."once-1.3.3" + sources."once-1.4.0" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -20819,10 +20991,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -20861,12 +21033,12 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."spdx-license-ids-1.2.2" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -20884,7 +21056,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -20918,7 +21090,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -20995,7 +21167,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21007,7 +21179,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."unorm-1.3.3" @@ -21035,7 +21207,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -21051,8 +21223,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21168,7 +21340,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21188,7 +21360,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -21204,7 +21376,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21343,7 +21515,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21385,7 +21557,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21448,10 +21620,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -21492,6 +21664,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; @@ -21732,12 +21905,13 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -21762,7 +21936,7 @@ in }) sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - (sources."cors-2.8.0" // { + (sources."cors-2.8.1" // { dependencies = [ sources."vary-1.1.0" ]; @@ -21779,7 +21953,7 @@ in }) (sources."from2-1.3.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" @@ -21802,7 +21976,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21847,7 +22021,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-5.1.1" @@ -21892,7 +22066,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-2.3.2" @@ -21907,7 +22081,7 @@ in sources."xtend-3.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ltgt-1.0.2" ]; }) @@ -21924,7 +22098,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21957,7 +22131,7 @@ in sources."stream-shift-1.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."relative-date-1.1.3" @@ -21975,7 +22149,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -21983,7 +22157,7 @@ in sources."split2-0.2.1" (sources."stream-collector-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21997,7 +22171,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22010,7 +22184,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22026,7 +22200,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -22034,6 +22208,7 @@ in sources."thunky-0.1.0" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -22076,7 +22251,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22148,10 +22323,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -22191,6 +22366,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -22198,13 +22374,218 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."got-6.5.0" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + (sources."get-stream-2.3.1" // { + dependencies = [ + sources."object-assign-4.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.0" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."lodash.debounce-4.0.8" + (sources."log-update-1.0.2" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + ]; + }) + sources."mem-0.1.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.1" + ]; + }) + sources."signal-exit-3.0.1" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (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."semver-5.3.0" + (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.3" + ]; + }) + ]; + }) + sources."object-assign-4.1.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.6" + (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."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + ]; + }) + (sources."strip-indent-1.0.1" // { + dependencies = [ + sources."get-stdin-4.0.1" + ]; + }) + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; + sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -22226,7 +22607,7 @@ in }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -22244,7 +22625,7 @@ in sources."ms-0.7.1" ]; }) - (sources."doctrine-1.3.0" // { + (sources."doctrine-1.4.0" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -22332,7 +22713,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -22343,7 +22724,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22351,7 +22732,7 @@ in sources."path-is-absolute-1.0.0" ]; }) - sources."globals-9.9.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { @@ -22392,7 +22773,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22472,7 +22853,7 @@ in sources."fast-levenshtein-1.1.4" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" (sources."require-uncached-1.0.2" // { @@ -22522,6 +22903,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -22543,7 +22925,7 @@ in sources."bower-1.7.9" (sources."glob-3.2.11" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-0.3.0" // { dependencies = [ sources."lru-cache-2.7.3" @@ -22553,6 +22935,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -22691,7 +23074,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -22715,7 +23098,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -22791,7 +23174,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -22913,10 +23296,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -22975,7 +23358,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23114,7 +23497,7 @@ in sources."defined-0.0.0" sources."through-2.3.8" sources."resumer-0.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23143,7 +23526,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23154,7 +23537,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23176,6 +23559,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -23199,6 +23583,7 @@ in }) sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -23224,7 +23609,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23235,7 +23620,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23253,6 +23638,7 @@ in }) sources."resolve-1.1.7" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -23424,6 +23810,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -23481,7 +23868,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -23636,7 +24023,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23650,7 +24037,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -23732,7 +24119,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -23774,7 +24161,7 @@ in sources."os-tmpdir-1.0.1" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -23877,8 +24264,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23952,7 +24339,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -23967,6 +24354,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -23985,13 +24373,14 @@ in dependencies = [ (sources."http-proxy-1.0.2" // { dependencies = [ - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.0" ]; }) sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -24038,7 +24427,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -24132,7 +24521,7 @@ in ]; }) sources."nopt-3.0.6" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24143,13 +24532,14 @@ in sources."has-flag-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wordwrap-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -24168,6 +24558,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -24194,8 +24585,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24230,7 +24621,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -24250,6 +24641,7 @@ in sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -24265,6 +24657,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24279,6 +24672,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24301,6 +24695,7 @@ in }) sources."esprima-2.7.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -24311,10 +24706,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" @@ -24412,7 +24807,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -24436,7 +24831,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -24502,7 +24897,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -24624,10 +25019,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -24707,19 +25102,19 @@ in ]; }) sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ sources."lodash-4.15.0" ]; }) - (sources."connect-3.4.1" // { + (sources."connect-3.5.0" // { dependencies = [ (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.0" // { dependencies = [ sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { @@ -24727,6 +25122,7 @@ in sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.0" sources."unpipe-1.0.0" ]; }) @@ -24768,8 +25164,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24778,7 +25174,7 @@ in ]; }) sources."graceful-fs-4.1.6" - (sources."http-proxy-1.14.0" // { + (sources."http-proxy-1.15.1" // { dependencies = [ sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" @@ -24793,7 +25189,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-4.3.6" @@ -24817,6 +25213,7 @@ in ]; }) sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" (sources."socket.io-1.4.7" // { dependencies = [ @@ -24966,6 +25363,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -25085,7 +25483,7 @@ in }) (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" ]; }) @@ -25110,7 +25508,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -25207,7 +25605,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -25268,6 +25666,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -25288,7 +25687,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25318,11 +25717,11 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."stream-shift-1.0.0" ]; }) - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."extend-3.0.0" (sources."glob-5.0.15" // { @@ -25332,7 +25731,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25343,7 +25742,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25351,11 +25750,11 @@ in sources."path-is-absolute-1.0.0" ]; }) - (sources."glob-parent-2.0.0" // { + (sources."glob-parent-3.0.0" // { dependencies = [ - (sources."is-glob-2.0.1" // { + (sources."is-glob-3.0.0" // { dependencies = [ - sources."is-extglob-1.0.0" + sources."is-extglob-2.0.0" ]; }) ]; @@ -25409,7 +25808,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -25417,7 +25816,11 @@ in }) (sources."parse-glob-3.0.4" // { dependencies = [ - sources."glob-base-0.3.0" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) sources."is-dotfile-1.0.2" ]; }) @@ -25441,7 +25844,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -25487,7 +25890,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25513,6 +25916,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -25560,6 +25964,7 @@ in sources."mkdirp-0.3.0" sources."node.extend-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -25578,6 +25983,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -25588,10 +25994,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -25601,7 +26007,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -25646,7 +26052,7 @@ in sources."semver-5.3.0" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25660,7 +26066,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25740,10 +26146,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -25793,7 +26199,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25819,7 +26225,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25835,7 +26241,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -25870,7 +26276,7 @@ in sources."proto-list-1.2.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25928,7 +26334,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -25940,7 +26346,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."temp-0.8.3" // { @@ -25974,6 +26380,7 @@ in sources."slasp-0.0.4" sources."nijs-0.0.23" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -25991,7 +26398,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."glob-7.0.6" // { @@ -26002,8 +26409,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26041,7 +26448,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26057,7 +26464,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26121,7 +26528,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26201,10 +26608,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -26248,15 +26655,16 @@ in (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -26321,7 +26729,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."meow-3.7.0" // { @@ -26339,7 +26747,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -26540,7 +26948,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26551,7 +26959,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26605,7 +27013,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26621,7 +27029,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26656,7 +27064,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26736,10 +27144,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -26788,7 +27196,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26799,7 +27207,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26817,7 +27225,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -26825,12 +27233,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26852,7 +27260,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26890,7 +27298,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26906,7 +27314,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -26941,7 +27349,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27021,10 +27429,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27073,7 +27481,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27084,7 +27492,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27102,7 +27510,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -27110,12 +27518,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27137,7 +27545,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27151,7 +27559,7 @@ in }) ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27209,6 +27617,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -27243,7 +27652,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27259,7 +27668,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -27302,7 +27711,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27382,10 +27791,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27434,7 +27843,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27445,7 +27854,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27464,7 +27873,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -27477,12 +27886,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27504,7 +27913,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27515,6 +27924,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -27584,7 +27994,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -27608,7 +28018,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -27675,7 +28085,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -27797,10 +28207,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -27849,7 +28259,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27906,7 +28316,7 @@ in sources."ms-0.7.1" ]; }) - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" (sources."lodash.defaults-3.1.2" // { dependencies = [ @@ -28036,7 +28446,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -28056,7 +28466,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -28072,7 +28482,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28126,6 +28536,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -28204,7 +28615,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -28234,7 +28645,7 @@ in dependencies = [ (sources."moment-timezone-0.3.1" // { dependencies = [ - sources."moment-2.14.1" + sources."moment-2.15.0" ]; }) ]; @@ -28343,7 +28754,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -28354,7 +28765,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28416,7 +28827,7 @@ in ]; }) sources."help-me-0.1.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimist-1.2.0" (sources."mqtt-connection-2.1.1" // { dependencies = [ @@ -28431,7 +28842,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28656,7 +29067,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -28668,7 +29079,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28863,7 +29274,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -28881,7 +29292,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28915,10 +29326,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29035,7 +29446,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29051,7 +29462,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -29094,7 +29505,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29174,10 +29585,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29226,7 +29637,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29237,7 +29648,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -29255,7 +29666,7 @@ in sources."graceful-fs-4.1.6" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -29263,12 +29674,12 @@ in (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29290,7 +29701,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29345,6 +29756,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -29431,14 +29843,14 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-1.0.0" // { dependencies = [ sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -29480,18 +29892,18 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-3.10.0" // { + (sources."mailcomposer-3.12.0" // { dependencies = [ - (sources."buildmail-3.8.0" // { + (sources."buildmail-3.10.0" // { dependencies = [ sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" ]; }) - (sources."libmime-2.0.3" // { + (sources."libmime-2.1.0" // { dependencies = [ sources."iconv-lite-0.4.13" sources."libbase64-0.1.0" @@ -29535,6 +29947,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -29544,10 +29957,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; + sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; }; dependencies = [ sources."abbrev-1.0.9" @@ -29620,7 +30033,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -29649,28 +30062,10 @@ in sources."lodash._root-3.0.1" ]; }) - (sources."lodash.clonedeep-4.3.2" // { - dependencies = [ - sources."lodash._baseclone-4.5.7" - ]; - }) - (sources."lodash.union-4.4.0" // { - dependencies = [ - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - ]; - }) - sources."lodash.uniq-4.3.0" - (sources."lodash.without-4.2.0" // { - dependencies = [ - (sources."lodash._basedifference-4.5.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - sources."lodash.rest-4.0.5" - ]; - }) + sources."lodash.clonedeep-4.4.1" + sources."lodash.union-4.5.0" + sources."lodash.uniq-4.4.0" + sources."lodash.without-4.3.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -29759,7 +30154,7 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -29781,14 +30176,14 @@ in ]; }) sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -29836,7 +30231,7 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.72.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -29915,10 +30310,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -29951,9 +30346,9 @@ in }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) @@ -29962,7 +30357,7 @@ in sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -29983,7 +30378,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -30011,6 +30406,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -30046,7 +30442,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30126,10 +30522,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -30183,7 +30579,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -30194,7 +30590,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -30215,7 +30611,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30231,7 +30627,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -30285,7 +30681,7 @@ in sources."inherits-1.0.2" (sources."block-stream-0.0.9" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-0.1.31" // { @@ -30295,7 +30691,7 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30321,7 +30717,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -30365,6 +30761,7 @@ in sources."findit-1.2.0" sources."coffee-script-1.10.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -30432,7 +30829,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."npm-3.10.7" // { + (sources."npm-3.10.8" // { dependencies = [ sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -30465,7 +30862,7 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -30504,7 +30901,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -30533,10 +30930,10 @@ in sources."lodash._root-3.0.1" ]; }) - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30554,6 +30951,39 @@ in }) ]; }) + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) (sources."path-array-1.0.1" // { dependencies = [ (sources."array-index-1.0.0" // { @@ -30593,7 +31023,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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30609,11 +31039,43 @@ in }) ]; }) - sources."retry-0.8.0" + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.0" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30625,7 +31087,7 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -30646,15 +31108,15 @@ in sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" - sources."opener-1.4.1" + sources."once-1.4.0" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -30763,10 +31225,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -30805,12 +31267,11 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -30831,13 +31292,13 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -30918,7 +31379,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -30938,7 +31399,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -30954,7 +31415,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -31004,6 +31465,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -31031,12 +31493,12 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -31077,7 +31539,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31105,7 +31567,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."single-line-log-1.1.1" // { + (sources."single-line-log-1.1.2" // { dependencies = [ (sources."string-width-1.0.2" // { dependencies = [ @@ -31140,7 +31602,7 @@ in sources."buffer-indexof-1.0.2" ]; }) - (sources."multicast-dns-6.0.1" // { + (sources."multicast-dns-6.1.0" // { dependencies = [ (sources."dns-packet-1.1.0" // { dependencies = [ @@ -31170,7 +31632,7 @@ in sources."array-find-index-1.0.1" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -31354,12 +31816,12 @@ in }) (sources."simple-get-2.2.2" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -31409,7 +31871,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -31448,7 +31910,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31460,7 +31922,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -31484,7 +31946,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -31495,7 +31957,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31545,7 +32007,7 @@ in }) sources."ip-1.1.3" sources."minimist-1.2.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31554,7 +32016,7 @@ in sources."run-series-1.1.4" (sources."simple-get-2.2.2" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -31607,7 +32069,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -31618,6 +32080,7 @@ in sources."windows-no-runnable-0.0.6" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -31643,7 +32106,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31732,7 +32195,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31770,8 +32233,16 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - sources."end-of-stream-1.1.0" - (sources."once-1.3.3" // { + (sources."end-of-stream-1.1.0" // { + dependencies = [ + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31879,7 +32350,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-ip-1.0.0" // { dependencies = [ sources."ip-regex-1.0.3" @@ -31887,7 +32358,7 @@ in }) sources."k-bucket-0.5.0" sources."network-address-1.1.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31895,7 +32366,7 @@ in sources."run-parallel-1.1.6" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -31917,8 +32388,8 @@ in ]; }) sources."extend.js-0.0.2" - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31931,7 +32402,7 @@ in sources."run-series-1.1.4" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -32001,14 +32472,14 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" ]; }) sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32027,7 +32498,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32038,7 +32509,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32058,7 +32529,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -32066,6 +32537,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -32086,7 +32558,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -32132,7 +32604,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32143,7 +32615,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32173,7 +32645,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32207,10 +32679,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -32301,12 +32773,13 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -32343,7 +32816,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32354,7 +32827,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32392,6 +32865,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -32443,7 +32917,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -32495,7 +32969,7 @@ in sources."fresh-0.1.0" ]; }) - (sources."openid-2.0.2" // { + (sources."openid-2.0.4" // { dependencies = [ (sources."request-2.74.0" // { dependencies = [ @@ -32506,7 +32980,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32586,10 +33060,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -32653,6 +33127,7 @@ in }) sources."crypto-0.0.3" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -32665,6 +33140,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -32742,7 +33218,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32759,7 +33235,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32884,7 +33360,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32959,10 +33435,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -33029,7 +33505,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33040,7 +33516,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33053,7 +33529,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.0" ]; }) (sources."handlebars-2.0.0" // { @@ -33089,7 +33565,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" ]; }) (sources."sanitize-html-1.13.0" // { @@ -33108,7 +33584,7 @@ in ]; }) sources."entities-1.1.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -33152,7 +33628,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fs-ext-0.5.0" // { @@ -33166,6 +33642,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -33213,7 +33690,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33224,6 +33701,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -33275,7 +33753,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33331,7 +33809,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33342,7 +33820,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33366,10 +33844,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -33383,7 +33861,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33442,6 +33920,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -33477,7 +33956,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33488,7 +33967,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33502,6 +33981,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -33568,6 +34048,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -33625,7 +34106,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33750,7 +34231,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33867,6 +34348,7 @@ in }) sources."wrench-1.5.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -33882,6 +34364,7 @@ in url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -33945,6 +34428,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -33963,7 +34447,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" (sources."body-parser-1.15.2" // { dependencies = [ sources."bytes-2.4.0" @@ -34008,7 +34492,7 @@ in (sources."color-0.11.3" // { dependencies = [ sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" (sources."color-string-0.3.0" // { dependencies = [ sources."color-name-1.1.1" @@ -34081,7 +34565,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -34337,7 +34821,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -34468,13 +34952,13 @@ in ]; }) sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ sources."os-tmpdir-1.0.1" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -34593,10 +35077,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -34638,7 +35122,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -34659,7 +35143,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -34693,7 +35177,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -34732,7 +35216,7 @@ in sources."hosted-git-info-2.1.5" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -34746,7 +35230,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34818,10 +35302,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -34871,7 +35355,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34887,7 +35371,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -34955,7 +35439,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -34966,7 +35450,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -34990,7 +35474,7 @@ in sources."fresh-0.3.0" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -35178,7 +35662,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -35366,6 +35850,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -35393,7 +35878,7 @@ in sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."once-1.3.3" // { dependencies = [ sources."wrappy-1.0.2" @@ -35415,7 +35900,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -35461,7 +35946,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -35472,7 +35957,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -35502,7 +35987,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35536,10 +36021,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -35630,7 +36115,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -35648,6 +36133,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -35674,7 +36160,7 @@ in }) sources."acorn-3.3.0" sources."interpret-0.6.6" - (sources."loader-utils-0.2.15" // { + (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.0.1" @@ -35693,7 +36179,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35740,7 +36226,7 @@ in (sources."http-browserify-1.7.0" // { dependencies = [ sources."Base64-0.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."https-browserify-0.0.0" @@ -35753,12 +36239,12 @@ in dependencies = [ sources."core-util-is-1.0.2" sources."isarray-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."stream-browserify-1.0.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."string_decoder-0.10.31" @@ -35900,7 +36386,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -35924,7 +36410,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -35995,7 +36481,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ (sources."code-point-at-1.0.0" // { @@ -36117,10 +36603,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -36179,7 +36665,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -36255,6 +36741,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -36270,6 +36757,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; @@ -36277,4 +36765,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 8527dbf02e11..3431273d7c73 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; "os-homedir-1.0.1" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.16.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.16.0.tgz"; + sha1 = "df1bd296fb52742af7596db025cbdd1491391f3d"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -715,13 +724,13 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.0" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.0.tgz"; + sha1 = "1fbc1ab0f976ad3f16c5879ba95d4751e9d5bf56"; }; }; "applicationinsights-0.15.12" = { @@ -841,13 +850,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.0" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +940,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1012,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1156,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1813,13 +1831,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; "sshpk-1.10.0" = { @@ -1840,13 +1858,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1957,15 +1975,6 @@ let sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; }; }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1975,211 +1984,13 @@ let sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; }; }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; }; }; "extend-1.2.1" = { @@ -2209,6 +2020,15 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; + "request-2.69.0" = { + name = "request"; + packageName = "request"; + version = "2.69.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + }; "jsonparse-1.2.0" = { name = "jsonparse"; packageName = "jsonparse"; @@ -2218,6 +2038,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + }; + }; "stack-trace-0.0.9" = { name = "stack-trace"; packageName = "stack-trace"; @@ -2299,33 +2137,6 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; "async-0.2.7" = { name = "async"; packageName = "async"; @@ -2497,13 +2308,13 @@ let sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; }; }; - "once-1.3.3" = { + "once-1.4.0" = { name = "once"; packageName = "once"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; "path-is-absolute-1.0.0" = { @@ -2578,22 +2389,31 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; "ctype-0.5.2" = { @@ -3010,6 +2830,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3109,13 +2938,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; "array-find-index-1.0.1" = { @@ -3694,13 +3523,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3928,13 +3757,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.6" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.6.tgz"; + sha1 = "943d289ccd92b3dec55cc77dd696d44d6087e8bd"; }; }; "public-encrypt-4.0.0" = { @@ -3991,13 +3820,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4054,13 +3883,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4279,6 +4108,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4972,13 +4810,13 @@ let sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5566,6 +5404,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5638,6 +5485,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5746,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -7042,13 +6907,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6934,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6961,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6988,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,15 +7177,6 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7420,6 +7276,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7330,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7501,13 +7501,13 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -8459,13 +8459,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8855,13 +8855,121 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz"; + sha1 = "f2d469d8927f088aff28a956d2b93e3e2d14fb8d"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8909,13 +9017,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -9035,15 +9143,6 @@ let sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; - }; - }; "es6-map-0.1.4" = { name = "es6-map"; packageName = "es6-map"; @@ -9809,13 +9908,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -11106,13 +11205,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.0.tgz"; + sha1 = "605f34e75ea702681fcd06b2f4ee2e7b4e019006"; }; }; "escodegen-1.8.1" = { @@ -11286,22 +11385,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11340,13 +11439,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -11430,15 +11529,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "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"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11502,6 +11592,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12321,13 +12420,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12402,6 +12501,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12429,6 +12537,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12591,6 +12717,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12636,6 +12771,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12897,13 +13041,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -14247,13 +14391,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14265,22 +14409,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14292,22 +14436,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14373,40 +14517,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.4.1" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; + sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.5.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; + sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.4.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; + sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.3.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; + sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; }; }; "npm-install-checks-3.0.0" = { @@ -14418,6 +14562,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14436,6 +14589,15 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14481,33 +14643,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14733,13 +14868,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14778,40 +14913,49 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.union-4.5.0" = { + "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; }; - "lodash.uniq-4.4.0" = { + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.3.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "airplayer-2.0.0" = { @@ -14931,13 +15075,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14967,13 +15111,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15877,13 +16021,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.4" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.4.tgz"; + sha1 = "73486f2862b080cc1a582cfd5d4df61d0274ef60"; }; }; "node-swt-0.1.1" = { @@ -16219,13 +16363,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -16543,6 +16687,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16786,13 +16939,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16984,13 +17137,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17029,6 +17182,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"; @@ -17182,6 +17344,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17191,6 +17389,33 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17380,13 +17605,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -17548,10 +17773,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17598,7 +17823,7 @@ in }) sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" + sources."which-1.2.11" sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" sources."isexe-1.1.2" @@ -17606,6 +17831,7 @@ in sources."sax-0.5.8" sources."is-0.3.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17616,10 +17842,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.4.tgz"; + sha1 = "0f5e9a8a529ac30f0fc8e754513ace91df6b5dae"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17643,51 +17869,20 @@ in sources."azure-arm-hdinsight-0.2.0" 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-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.16.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - sources."azure-common-0.9.12" - sources."moment-2.6.0" - sources."xml2js-0.2.7" - sources."request-2.45.0" - sources."validator-3.1.0" - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."form-data-0.1.4" - sources."http-signature-0.10.1" - sources."oauth-sign-0.4.0" - sources."hawk-1.1.1" - sources."aws-sign2-0.5.0" - sources."combined-stream-0.0.7" - sources."async-0.9.2" - sources."delayed-stream-0.0.5" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.0.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17697,26 +17892,37 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) (sources."azure-storage-1.1.0" // { dependencies = [ sources."extend-1.2.1" sources."node-uuid-1.4.7" sources."readable-stream-2.0.6" + (sources."request-2.69.0" // { + dependencies = [ + sources."extend-3.0.0" + ]; + }) sources."validator-3.22.2" sources."xml2js-0.2.7" sources."isarray-1.0.0" + sources."bl-1.0.3" + sources."qs-6.0.2" ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" + sources."azure-batch-0.5.0" sources."applicationinsights-0.15.12" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -17735,15 +17941,8 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.14.1" - (sources."ms-rest-1.15.0" // { - dependencies = [ - sources."request-2.74.0" - sources."node-uuid-1.4.7" - sources."qs-6.2.1" - sources."tough-cookie-2.3.1" - ]; - }) + sources."moment-2.15.0" + sources."ms-rest-1.15.0" (sources."ms-rest-azure-1.15.0" // { dependencies = [ sources."async-0.2.7" @@ -17767,19 +17966,16 @@ in ]; }) sources."readable-stream-1.0.34" - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ - sources."bl-1.0.3" sources."node-uuid-1.4.7" - sources."qs-6.0.2" - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" + sources."qs-6.2.1" + sources."tough-cookie-2.3.1" ]; }) (sources."ssh-key-to-pem-0.11.0" // { dependencies = [ sources."asn1-0.1.11" - sources."ctype-0.5.2" ]; }) sources."streamline-0.10.17" @@ -17788,6 +17984,7 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + sources."user-home-2.0.0" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -17812,7 +18009,7 @@ in ]; }) sources."meow-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -17892,14 +18089,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -17922,8 +18119,6 @@ in ]; }) sources."mime-db-1.23.0" - sources."mime-1.2.11" - sources."ctype-0.5.3" sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.0" @@ -17967,13 +18162,14 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" + sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.14" sources."galaxy-0.1.12" @@ -17983,8 +18179,10 @@ in sources."http-basic-2.5.1" sources."promise-7.1.1" sources."asap-2.0.4" + sources."os-homedir-1.0.1" sources."mute-stream-0.0.6" ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18000,6 +18198,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18010,10 +18209,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; dependencies = [ sources."argparse-1.0.4" @@ -18060,7 +18259,7 @@ in sources."statuses-1.3.0" sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-2.1.5" sources."stream-shift-1.0.0" sources."once-1.3.3" @@ -18082,7 +18281,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -18145,6 +18344,7 @@ in sources."ms-0.7.1" sources."os-tmpdir-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18184,7 +18384,7 @@ in sources."has-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { dependencies = [ @@ -18204,7 +18404,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.3.1" + sources."stream-http-2.4.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -18224,7 +18424,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18250,21 +18454,21 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.6" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.3.1" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" sources."asn1.js-4.8.0" sources."ripemd160-1.0.1" @@ -18272,7 +18476,7 @@ in sources."miller-rabin-4.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -18299,6 +18503,7 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -18405,7 +18610,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -18464,6 +18669,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -18503,10 +18709,14 @@ in sources."bencode-0.10.0" sources."simple-sha1-2.0.8" sources."rusha-0.8.3" - sources."once-1.3.3" - sources."unzip-response-1.0.0" + sources."once-1.4.0" + sources."unzip-response-1.0.1" sources."wrappy-1.0.2" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -18536,7 +18746,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ip-1.1.3" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -18650,6 +18860,7 @@ in sources."graceful-readlink-1.0.1" sources."sax-1.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -18665,6 +18876,7 @@ in url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -18733,7 +18945,7 @@ in sources."glob-6.0.4" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."glob-7.0.6" sources."nopt-3.0.6" @@ -18796,9 +19008,9 @@ in sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -18880,7 +19092,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18906,21 +19122,21 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.6" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.3.1" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" sources."asn1.js-4.8.0" sources."ripemd160-1.0.1" @@ -18996,7 +19212,11 @@ in 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.0" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."mime-1.3.4" sources."setprototypeof-1.0.1" sources."media-typer-0.3.0" @@ -19064,18 +19284,21 @@ in sources."normalize-git-url-3.0.2" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."concat-stream-1.5.2" + sources."request-2.74.0" + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" ]; }) sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" sources."realize-package-specifier-3.0.3" - sources."retry-0.9.0" + sources."retry-0.10.0" (sources."rimraf-2.5.4" // { dependencies = [ sources."glob-7.0.6" @@ -19088,11 +19311,11 @@ in ]; }) sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.10" + sources."which-1.2.11" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" @@ -19110,19 +19333,6 @@ in sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" - sources."are-we-there-yet-1.1.2" - sources."gauge-1.2.7" - sources."delegates-1.0.0" - sources."has-unicode-2.0.1" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" - sources."debuglog-1.0.1" - sources."readdir-scoped-modules-1.0.2" - sources."util-extend-1.0.3" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" @@ -19166,14 +19376,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19195,6 +19405,19 @@ in sources."tweetnacl-0.14.3" ]; }) + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."os-homedir-1.0.1" + sources."os-tmpdir-1.0.1" + sources."debuglog-1.0.1" + sources."readdir-scoped-modules-1.0.2" + sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" sources."isexe-1.1.2" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -19208,7 +19431,7 @@ in sources."bplist-parser-0.0.6" sources."bplist-creator-0.0.4" sources."stream-buffers-0.2.6" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."configstore-1.4.0" sources."is-npm-1.0.0" sources."latest-version-1.0.1" @@ -19248,7 +19471,11 @@ in ]; }) sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" sources."rc-1.1.6" sources."deep-extend-0.4.1" @@ -19286,6 +19513,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; @@ -19422,8 +19650,9 @@ in sources."delayed-stream-0.0.5" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -19443,7 +19672,7 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - sources."cors-2.8.0" + sources."cors-2.8.1" sources."docker-parse-image-3.0.1" sources."end-of-stream-1.1.0" sources."from2-1.3.0" @@ -19514,7 +19743,7 @@ in sources."vary-1.1.0" sources."once-1.3.3" sources."wrappy-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -19560,6 +19789,7 @@ in sources."protein-0.5.0" sources."network-address-0.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -19608,7 +19838,7 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -19636,14 +19866,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19667,6 +19897,7 @@ in }) sources."mime-db-1.23.0" ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -19674,26 +19905,116 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."got-6.5.0" + sources."has-ansi-2.0.0" + sources."lodash.debounce-4.0.8" + sources."log-update-1.0.2" + sources."mem-0.1.1" + sources."meow-3.7.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-2.3.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.0" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."object-assign-4.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."prepend-http-1.0.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.1" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.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.3" + sources."spdx-license-ids-1.2.2" + 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."path-type-1.1.0" + sources."graceful-fs-4.1.6" + 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."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.1" + sources."number-is-nan-1.0.0" + sources."get-stdin-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.5.0.tgz"; + sha1 = "22fc9f780ea5bca1306fab2b6d3336b0fa62c754"; }; dependencies = [ sources."chalk-1.1.3" sources."concat-stream-1.5.2" sources."debug-2.2.0" - sources."doctrine-1.3.0" + sources."doctrine-1.4.0" sources."escope-3.6.0" sources."espree-3.1.7" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.0.6" - sources."globals-9.9.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" @@ -19706,7 +20027,7 @@ in sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.1" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.2" @@ -19722,7 +20043,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -19766,7 +20087,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -19813,6 +20134,7 @@ in sources."xregexp-3.1.1" sources."os-homedir-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -19833,11 +20155,12 @@ in sources."bower-logger-0.2.1" sources."bower-1.7.9" sources."glob-3.2.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-0.3.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -19915,7 +20238,7 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" (sources."readdirp-2.1.0" // { @@ -19952,7 +20275,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -19987,7 +20310,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -20001,7 +20328,7 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -20063,14 +20390,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -20100,7 +20427,7 @@ in }) sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -20128,6 +20455,7 @@ in sources."i-0.3.5" sources."ncp-0.4.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -20148,6 +20476,7 @@ in sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."microee-0.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -20170,9 +20499,9 @@ in sources."resolve-1.1.7" sources."glob-5.0.15" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -20180,6 +20509,7 @@ in sources."concat-map-0.0.1" sources."abbrev-1.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -20275,6 +20605,7 @@ in sources."lodash-4.15.0" sources."nan-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -20355,7 +20686,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -20403,7 +20734,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -20456,7 +20787,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."glob-parent-2.0.0" @@ -20469,7 +20800,7 @@ in sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" + sources."which-1.2.11" sources."os-tmpdir-1.0.1" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" @@ -20531,6 +20862,7 @@ in sources."natives-1.1.0" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -20551,8 +20883,9 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -20586,10 +20919,10 @@ in ]; }) sources."nopt-3.0.6" - sources."once-1.3.3" + sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.1.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -20602,7 +20935,7 @@ in sources."fast-levenshtein-1.1.4" sources."amdefine-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" @@ -20644,6 +20977,7 @@ in sources."has-flag-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -20662,6 +20996,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -20689,8 +21024,8 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" - sources."once-1.3.3" + sources."inherits-2.0.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."date-now-0.1.4" @@ -20712,6 +21047,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -20727,6 +21063,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20741,6 +21078,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20760,6 +21098,7 @@ in sources."esprima-2.7.3" sources."sprintf-js-1.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -20770,22 +21109,22 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" sources."body-parser-1.15.2" sources."chokidar-1.6.0" sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ sources."lodash-4.15.0" ]; }) - sources."connect-3.4.1" + sources."connect-3.5.0" sources."core-js-2.4.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -20799,7 +21138,7 @@ in }) sources."glob-7.0.6" sources."graceful-fs-4.1.6" - sources."http-proxy-1.14.0" + sources."http-proxy-1.15.1" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" (sources."log4js-0.6.38" // { @@ -20813,6 +21152,7 @@ in sources."minimatch-3.0.3" sources."optimist-0.6.1" sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" sources."socket.io-1.4.7" sources."source-map-0.5.6" @@ -20873,7 +21213,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -20911,7 +21251,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -20971,14 +21311,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21006,7 +21346,7 @@ in sources."once-1.3.3" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-0.4.1" + sources."finalhandler-0.5.0" sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."escape-html-1.0.3" @@ -21092,6 +21432,7 @@ in sources."os-tmpdir-1.0.1" sources."lru-cache-2.2.4" ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -21216,7 +21557,7 @@ in sources."uid-safe-2.1.1" sources."random-bytes-1.0.0" sources."crc-3.3.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" @@ -21241,6 +21582,7 @@ in sources."xmlbuilder-4.2.1" sources."lodash-4.15.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -21262,7 +21604,7 @@ in sources."readable-stream-2.0.6" sources."xtend-4.0.1" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21271,7 +21613,7 @@ in sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" sources."duplexify-3.4.5" - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."through2-0.6.5" sources."readable-stream-1.0.34" @@ -21296,8 +21638,13 @@ in sources."wrappy-1.0.2" sources."extend-3.0.0" sources."glob-5.0.15" - sources."glob-parent-2.0.0" - sources."micromatch-2.3.11" + sources."glob-parent-3.0.0" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."ordered-read-streams-0.3.0" sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" @@ -21307,18 +21654,27 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" + sources."is-glob-3.0.0" + sources."is-extglob-2.0.0" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) sources."filename-regex-2.0.0" sources."kind-of-3.0.4" sources."normalize-path-2.0.1" sources."object.omit-2.0.0" - sources."parse-glob-3.0.4" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."regex-cache-0.4.3" sources."arr-flatten-1.0.1" sources."expand-range-1.8.2" @@ -21333,8 +21689,14 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" - sources."glob-base-0.3.0" + sources."for-in-0.1.6" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-glob-2.0.1" + sources."is-extglob-1.0.0" + ]; + }) sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" @@ -21347,6 +21709,7 @@ in sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -21382,6 +21745,7 @@ in sources."request-2.9.203" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -21400,6 +21764,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -21410,10 +21775,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -21421,6 +21786,7 @@ in sources."npm-registry-client-7.1.2" (sources."npmconf-2.0.9" // { dependencies = [ + sources."once-1.3.3" sources."semver-4.3.6" ]; }) @@ -21448,13 +21814,13 @@ in sources."semver-5.3.0" ]; }) - sources."once-1.3.3" + sources."once-1.4.0" sources."request-2.74.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" sources."npmlog-3.1.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -21517,14 +21883,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21564,7 +21930,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -21593,6 +21959,7 @@ in sources."forEachAsync-2.2.1" sources."sequence-2.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -21621,11 +21988,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.10" - sources."inherits-2.0.1" + sources."which-1.2.11" + sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -21649,7 +22016,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -21714,14 +22081,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21747,6 +22114,7 @@ in sources."block-stream-0.0.9" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -21775,7 +22143,7 @@ in sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" - sources."which-1.2.10" + sources."which-1.2.11" sources."ws-1.1.1" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -21813,7 +22181,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -21825,7 +22193,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -21896,7 +22264,7 @@ in sources."media-typer-0.3.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -21919,6 +22287,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."rimraf-2.5.4" sources."glob-7.0.6" ]; @@ -21990,14 +22359,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22035,6 +22404,7 @@ in sources."lcid-1.0.0" sources."invert-kv-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -22062,7 +22432,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22073,7 +22447,7 @@ in sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22082,7 +22456,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -22141,14 +22515,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22175,7 +22549,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -22189,6 +22563,7 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -22207,7 +22582,7 @@ in dependencies = [ sources."chokidar-1.6.0" sources."debug-2.2.0" - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" sources."minimatch-3.0.3" @@ -22222,7 +22597,7 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."path-is-absolute-1.0.0" @@ -22256,7 +22631,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -22284,7 +22659,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22296,7 +22675,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -22355,14 +22734,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22388,7 +22767,7 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22447,10 +22826,15 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" sources."is-finite-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -22569,7 +22953,7 @@ in sources."cookie-signature-1.0.6" sources."vary-1.1.0" sources."moment-timezone-0.3.1" - sources."moment-2.14.1" + sources."moment-2.15.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22603,7 +22987,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -22621,7 +23005,11 @@ in sources."isarray-1.0.0" ]; }) - sources."end-of-stream-1.1.0" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."help-me-0.1.0" sources."minimist-1.2.0" sources."mqtt-connection-2.1.1" @@ -22667,6 +23055,7 @@ in dependencies = [ sources."end-of-stream-1.0.0" sources."readable-stream-2.1.5" + sources."once-1.3.3" sources."isarray-1.0.0" ]; }) @@ -22803,7 +23192,7 @@ in sources."twitter-ng-0.6.2" sources."oauth-0.9.14" sources."is-typedarray-1.0.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."asn1-0.2.3" @@ -22811,7 +23200,7 @@ in ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" (sources."dashdash-1.14.0" // { dependencies = [ @@ -22852,6 +23241,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."readable-stream-2.1.5" sources."isarray-1.0.0" ]; @@ -22865,7 +23255,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -22884,6 +23274,7 @@ in sources."define-properties-1.1.2" sources."foreach-2.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -22961,9 +23352,9 @@ in sources."diff-1.0.8" sources."glob-4.0.6" sources."graceful-fs-3.0.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."natives-1.1.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" @@ -22984,16 +23375,16 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-3.10.0" + sources."mailcomposer-3.12.0" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" - sources."buildmail-3.8.0" - sources."libmime-2.0.3" + sources."buildmail-3.10.0" + sources."libmime-2.1.0" sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" sources."iconv-lite-0.4.13" sources."rai-0.1.12" sources."xoauth2-0.1.8" @@ -23009,6 +23400,7 @@ in sources."underscore-1.7.0" sources."underscore.string-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -23018,10 +23410,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; + sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; }; dependencies = [ sources."abbrev-1.0.9" @@ -23046,7 +23438,7 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -23055,10 +23447,10 @@ in }) sources."lockfile-1.0.1" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.3.2" - sources."lodash.union-4.4.0" - sources."lodash.uniq-4.3.0" - sources."lodash.without-4.2.0" + sources."lodash.clonedeep-4.4.1" + sources."lodash.union-4.5.0" + sources."lodash.uniq-4.4.0" + sources."lodash.without-4.3.0" sources."mkdirp-0.5.1" sources."node-gyp-3.4.0" sources."nopt-3.0.6" @@ -23075,9 +23467,9 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-3.1.2" sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23089,13 +23481,13 @@ in sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" - sources."request-2.72.0" + sources."request-2.74.0" sources."retry-0.9.0" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -23104,7 +23496,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.10" + sources."which-1.2.11" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -23132,10 +23524,6 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."lodash._baseclone-4.5.7" - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - sources."lodash._basedifference-4.5.0" sources."minimist-0.0.8" sources."path-array-1.0.1" sources."array-index-1.0.0" @@ -23165,7 +23553,7 @@ in sources."delegates-1.0.0" sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -23199,9 +23587,9 @@ in sources."mime-types-2.1.11" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."async-2.0.1" @@ -23226,14 +23614,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23264,6 +23652,7 @@ in sources."spdx-expression-parse-1.0.3" sources."spdx-license-ids-1.2.2" ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -23343,7 +23732,7 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -23373,14 +23762,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23407,7 +23796,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -23422,7 +23811,7 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" sources."code-point-at-1.0.0" @@ -23457,6 +23846,7 @@ in sources."jsonfile-1.0.1" sources."foreachasync-3.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -23487,11 +23877,7 @@ in sources."lodash-4.15.0" ]; }) - (sources."npm-3.10.7" // { - dependencies = [ - sources."semver-5.1.1" - ]; - }) + sources."npm-3.10.8" (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" @@ -23529,14 +23915,14 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" + sources."fstream-npm-1.2.0" sources."glob-7.0.6" sources."graceful-fs-4.1.6" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -23545,29 +23931,33 @@ in }) sources."lockfile-1.0.1" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" sources."mkdirp-0.5.1" - sources."node-gyp-3.4.0" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" 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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-3.1.2" - sources."once-1.3.3" - sources."opener-1.4.1" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23580,11 +23970,11 @@ in sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.74.0" - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" @@ -23592,9 +23982,9 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -23621,6 +24011,19 @@ in sources."lodash._root-3.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.0" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -23641,19 +24044,6 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" - sources."string-width-1.0.2" - sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" sources."os-homedir-1.0.1" sources."os-tmpdir-1.0.1" sources."mute-stream-0.0.6" @@ -23701,14 +24091,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23762,7 +24152,11 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" (sources."rc-1.1.6" // { dependencies = [ @@ -23773,6 +24167,7 @@ in sources."strip-json-comments-1.0.4" sources."is-finite-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -23826,6 +24221,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -23846,8 +24242,8 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.15" - sources."inherits-2.0.1" + sources."big-integer-1.6.16" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -23860,14 +24256,14 @@ in sources."xmldom-0.1.22" sources."lodash-3.10.1" sources."consume-http-header-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.1" sources."buffer-indexof-1.0.2" sources."next-line-1.1.0" sources."wrappy-1.0.2" sources."chalk-1.1.3" - sources."single-line-log-1.1.1" + sources."single-line-log-1.1.2" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -23882,7 +24278,7 @@ in sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.0.1" + sources."multicast-dns-6.1.0" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.1.0" sources."thunky-0.1.0" @@ -23899,7 +24295,7 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."array-find-index-1.0.1" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" @@ -23949,8 +24345,12 @@ in sources."bencode-0.10.0" sources."simple-sha1-2.0.8" sources."rusha-0.8.3" - sources."unzip-response-1.0.0" - sources."end-of-stream-1.0.0" + sources."unzip-response-1.0.1" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -24037,6 +24437,7 @@ in sources."ultron-1.0.2" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -24070,6 +24471,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" + sources."once-1.3.3" ]; }) sources."fluent-ffmpeg-2.1.0" @@ -24082,7 +24484,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ee-first-1.1.0" sources."media-typer-0.3.0" sources."mime-types-2.0.14" @@ -24156,8 +24558,12 @@ in sources."keypress-0.1.0" sources."mime-1.2.11" sources."minimist-0.0.8" - sources."end-of-stream-1.1.0" - sources."once-1.3.3" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."once-1.4.0" sources."wrappy-1.0.2" sources."magnet-uri-2.0.1" (sources."parse-torrent-4.1.0" // { @@ -24244,7 +24650,7 @@ in sources."string2compact-1.2.2" sources."ms-0.7.1" sources."ip-regex-1.0.3" - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."ipaddr.js-1.2.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" @@ -24269,9 +24675,10 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -24295,12 +24702,12 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" sources."yauzl-2.4.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -24320,7 +24727,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24352,14 +24759,14 @@ in sources."lodash-4.15.0" sources."mime-db-1.23.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24404,6 +24811,7 @@ in sources."throttleit-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -24440,9 +24848,9 @@ in sources."acorn-1.2.2" sources."defined-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -24455,6 +24863,7 @@ in sources."base62-0.1.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -24525,13 +24934,13 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" sources."ms-0.7.1" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" - (sources."openid-2.0.2" // { + (sources."openid-2.0.4" // { dependencies = [ sources."request-2.74.0" sources."node-uuid-1.4.7" @@ -24596,14 +25005,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24628,6 +25037,7 @@ in sources."mime-db-1.23.0" sources."events.node-0.4.9" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -24640,6 +25050,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -24702,6 +25113,7 @@ in sources."sinopia-htpasswd-0.4.5" (sources."http-errors-1.5.0" // { dependencies = [ + sources."inherits-2.0.1" sources."setprototypeof-1.0.1" sources."statuses-1.3.0" ]; @@ -24769,7 +25181,7 @@ in sources."destroy-1.0.3" sources."mime-1.3.4" sources."statuses-1.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -24835,14 +25247,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24869,7 +25281,7 @@ in sources."dtrace-provider-0.6.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.0" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -24879,7 +25291,7 @@ in ]; }) sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24898,7 +25310,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.1" // { dependencies = [ sources."readable-stream-2.1.5" @@ -24918,6 +25330,7 @@ in sources."through-2.3.8" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -24952,12 +25365,13 @@ in sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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" ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -25011,6 +25425,7 @@ in }) sources."verror-1.1.0" sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" ]; }) sources."cmdln-3.2.1" @@ -25031,7 +25446,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - sources."once-1.3.3" + sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" sources."spdy-1.32.5" @@ -25061,7 +25476,7 @@ in sources."minimist-0.0.8" sources."glob-6.0.4" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.0" sources."brace-expansion-1.1.6" @@ -25079,13 +25494,13 @@ in }) ]; }) - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" sources."verror-1.3.6" ]; }) - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" @@ -25097,6 +25512,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -25122,9 +25538,9 @@ in sources."ms-0.7.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."path-is-absolute-1.0.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -25132,6 +25548,7 @@ in sources."concat-map-0.0.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -25170,6 +25587,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -25258,7 +25676,7 @@ in sources."har-validator-1.8.0" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25305,6 +25723,7 @@ in sources."pkginfo-0.3.1" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -25320,6 +25739,7 @@ in url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -25354,6 +25774,7 @@ in sources."repeat-string-1.5.4" sources."is-buffer-1.1.4" ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -25372,7 +25793,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" sources."body-parser-1.15.2" sources."color-0.11.3" sources."cookie-parser-1.4.3" @@ -25511,7 +25932,7 @@ in sources."mime-types-2.1.11" sources."mime-db-1.23.0" sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" sources."color-string-0.3.0" sources."color-name-1.1.1" sources."cookie-0.3.1" @@ -25682,9 +26103,9 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -25700,7 +26121,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -25708,7 +26129,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.10" + sources."which-1.2.11" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -25801,14 +26222,14 @@ in sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -25956,6 +26377,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -25988,7 +26410,7 @@ in sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."once-1.3.3" sources."osenv-0.0.3" sources."nopt-2.2.1" @@ -26007,7 +26429,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -26060,14 +26482,14 @@ in sources."lodash-4.15.0" sources."mime-db-1.23.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26114,6 +26536,7 @@ in sources."os-tmpdir-1.0.1" sources."underscore-1.8.3" ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -26139,7 +26562,7 @@ in }) sources."acorn-3.3.0" sources."interpret-0.6.6" - sources."loader-utils-0.2.15" + sources."loader-utils-0.2.16" sources."memory-fs-0.3.0" sources."mkdirp-0.5.1" (sources."node-libs-browser-0.6.0" // { @@ -26176,7 +26599,7 @@ in sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26210,7 +26633,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" sources."base64-js-1.1.2" @@ -26276,7 +26703,7 @@ in sources."is-posix-bracket-0.1.1" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -26300,7 +26727,11 @@ in sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -26310,7 +26741,7 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" @@ -26375,14 +26806,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" + sources."jsprim-1.3.1" (sources."sshpk-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26408,7 +26839,7 @@ in sources."glob-7.0.6" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -26419,6 +26850,7 @@ in sources."source-list-map-0.1.6" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -26434,6 +26866,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; @@ -26441,4 +26874,4 @@ in }; production = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 650f26420132..b3924727c01c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -10,6 +10,7 @@ , "dnschain" , "docker-registry-server" , "elasticdump" +, "emoj" , "eslint" , "fetch-bower" , "forever" diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix new file mode 100644 index 000000000000..ecf1ddc8fbae --- /dev/null +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -0,0 +1,35 @@ +{lib, buildOcaml, fetchurl}: + +buildOcaml rec { + name = "FrontC"; + version = "3.4"; + + src = fetchurl { + url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz"; + sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g"; + }; + + meta = with lib; { + homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61; + description = "C Parsing Library"; + license = licenses.lgpl21; + maintainers = [ maintainers.maurer ]; + }; + + meta_file = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META; + sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx"; + }; + + opam_patch = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch; + sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5"; + }; + + patches = [ opam_patch ]; + patchFlags = "-p4"; + + makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)"; + + postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META"; +} diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index bc4b490e8533..3b6ff64daeae 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ]; + buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index a4d4314cd021..0e5772632d52 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}: +{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; }; - buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; + buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f4076fbd95fe..8ee51ed311fe 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./META.patch ]; buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig - findlib freetype lablgtk cairo gdk_pixbuf gtk pango ]; + findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 6b9f6f09ea32..204adeb9451e 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk, +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk2, enableGtkSupport ? true # Whether to compile with support for Gtk # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk. + # on lablgtk and gtk2. }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib pkgconfig cairo ] - ++ optionals enableGtkSupport [ gtk ]; + ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index f7e585b43b08..05b9c06af0fe 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ounit }: -let version = "2.0.1"; in +let version = "2.2"; in stdenv.mkDerivation { name = "ocaml-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml oasis findlib ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ounit ]; - buildPhase = "ocaml do.ml qtest build $out"; createFindlibDestdir = true; - installPhase = "ocaml do.ml qtest install $out"; + installFlags = [ "BIN=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtestâ€)"; diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch new file mode 100644 index 000000000000..a46ffaa7bd9e --- /dev/null +++ b/pkgs/development/perl-modules/dbiclassx-fix.patch @@ -0,0 +1,24 @@ +From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 +From: Peter Rabbitson <ribasushi@cpan.org> +Date: Tue, 13 Sep 2016 17:15:48 +0200 +Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) + libsqlite version + +--- + Changes | 2 ++ + t/prefetch/grouped.t | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t +index 4aad6b1..c0d2224 100644 +--- a/t/prefetch/grouped.t ++++ b/t/prefetch/grouped.t +@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; + + # add an extra track to one of the cds, and then make sure we can get it on top + # (check if limit works) +- my $top_cd = $cd_rs->slice (1,1)->next; ++ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; + $top_cd->create_related ('tracks', { + title => 'over the top', + }); diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index bf53d3302457..6e86235cf23c 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - md5 = "e35f6ce54485663857129370047f6057"; + sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index cdf5a73768d4..52a2c586f858 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, }: stdenv.mkDerivation rec { name = "python-libsexy-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libsexy gtk glib pango libxml2 + libsexy gtk2 glib pango libxml2 ]; postInstall = '' diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 5354d9750f41..7d0896c1fb8b 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo +{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (libglade != null) libglade; - propagatedBuildInputs = [ gtk pygobject pycairo ]; + propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; configurePhase = "configurePhase"; @@ -43,8 +43,8 @@ buildPythonPackage rec { postInstall = '' rm $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \ + ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 + ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \ $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 1c248251a32f..133cbdb34fd2 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: let version = "2.10.1"; in @@ -12,7 +12,7 @@ mkPythonDerivation { patches = [ ./codegendir.patch ]; - buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ]; + buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ee1d0ec1738b..7ba1c79cd054 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; - md5 = "a72c6b66df782ca1d4950959d2aad292"; + sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; inherit python; diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch new file mode 100644 index 000000000000..6cd25babb332 --- /dev/null +++ b/pkgs/development/python-modules/searx.patch @@ -0,0 +1,25 @@ +diff --git a/requirements.txt b/requirements.txt +index 0d2f61b..46481b3 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,12 +1,12 @@ + certifi==2016.2.28 +-flask==0.11.1 +-flask-babel==0.11.1 +-lxml==3.6.0 +-ndg-httpsclient==0.4.1 ++flask==0.* ++flask-babel==0.* ++lxml==3.* ++ndg-httpsclient==0.4.* + pyasn1==0.1.9 + pyasn1-modules==0.0.8 +-pygments==2.1.3 ++pygments==2.* + pyopenssl==0.15.1 +-python-dateutil==2.5.3 ++python-dateutil==2.* +-pyyaml==3.11 ++pyyaml==3.* +-requests[socks]==2.10.0 ++requests[socks]==2.* diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 683677d05fc3..a9b16f0db2c5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,8 +21,8 @@ , 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 -}: +, libmsgpack, qt48, libsodium, snappy +}@args: let v8 = v8_3_16_14; @@ -145,6 +145,10 @@ in buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; }; + snappy = attrs: { + buildInputs = [ args.snappy ]; + }; + sqlite3 = attrs: { buildFlags = [ "--with-sqlite3-include=${sqlite.dev}/include" diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 48ab5270c22f..8eac766554e1 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -6,6 +6,11 @@ require 'fileutils' require 'pathname' require 'tmpdir' +if defined?(Encoding.default_internal) + Encoding.default_internal = Encoding::UTF_8 + Encoding.default_external = Encoding::UTF_8 +end + # Options: # # name - the gem name diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d42227198ce3..6b7ba2a81cb2 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [pkgconfig readline libusb perl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 7e199c29aed9..4b57e15d0884 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, lua ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e49697084e45..002d3bde201e 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }: - +{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf3_0, pkgconfig, libarchive, unzip, which, makeWrapper }: stdenv.mkDerivation rec { - name = "bazel-20150326.981b7bc1"; + version = "0.3.1"; + name = "bazel-${version}"; src = fetchFromGitHub { owner = "google"; repo = "bazel"; - rev = "981b7bc1"; - sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; + rev = version; + sha256 = "1cm8zjxf8y3ai6h9wndxvflfsijjqhg87fll9ar7ff0hbbbdf6l5"; }; - buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ]; + buildInputs = [ pkgconfig protobuf3_0 zlib zip libarchive unzip which makeWrapper jdk ]; + + buildPhase = '' + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + + bash compile.sh + ''; installPhase = '' - PROTOC=protoc bash compile.sh mkdir -p $out/bin $out/share cp -R output $out/share/bazel ln -s $out/share/bazel/bazel $out/bin/bazel diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix deleted file mode 100644 index a5f86d105c3f..000000000000 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }: - -buildPythonApplication (rec { - name = "buildbot-slave-0.8.10"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://pypi/b/buildbot-slave/${name}.tar.gz"; - sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg"; - }; - - patchPhase = '' - substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail - ''; - - propagatedBuildInputs = [ twisted ]; - - # What's up with this?! 'trial' should be 'test', no? - # - # running tests - # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] - # or: setup.py --help [cmd1 cmd2 ...] - # or: setup.py --help-commands - # or: setup.py cmd --help - # - # error: invalid command 'trial' - doCheck = false; - - postInstall = '' - mkdir -p "$out/share/man/man1" - cp docs/buildslave.1 "$out/share/man/man1" - ''; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - - license = stdenv.lib.licenses.gpl2Plus; - - description = "Continuous integration system that automates the build/test cycle"; - - longDescription = - '' The BuildBot is a system to automate the compile/test cycle - required by most software projects to validate code changes. By - automatically rebuilding and testing the tree each time something - has changed, build problems are pinpointed quickly, before other - developers are inconvenienced by the failure. The guilty - developer can be identified and harassed without human - intervention. By running the builds on a variety of platforms, - developers who do not have the facilities to test their changes - everywhere before checkin will at least know shortly afterwards - whether they have broken the build or not. Warning counts, lint - checks, image size, compile time, and other build parameters can - be tracked over time, are more visible, and are therefore easier - to improve. - - The overall goal is to reduce tree breakage and provide a platform - to run tests or code-quality checks that are too annoying or - pedantic for any human to waste their time with. Developers get - immediate (and potentially public) feedback about their changes, - encouraging them to be more careful about testing before checking - in code. - ''; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/build-managers/buildbot/9.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 0f33cd0c6642..4431105d18f8 100644 --- a/pkgs/development/tools/build-managers/buildbot/9.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -7,10 +7,10 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0rc2"; + version = "0.9.0rc3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "06xzbjzji3by4hldwr850fc989ymsfl2s8nil21klv2g00dgmcmk"; + sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb"; }; buildInputs = with pythonPackages; [ @@ -59,19 +59,20 @@ pythonPackages.buildPythonApplication (rec { ] ++ plugins; preInstall = '' - # buildbot tries to import 'buildslaves' but does not - # include the module in it's package, so get rid of those references - sed -i.bak -e '66,$d' buildbot/test/__init__.py - sed -i.bak -e '506,$d' buildbot/test/unit/test_worker_base.py - sed -i.bak -e '648,$d' buildbot/test/unit/test_worker_ec2.py - sed -i.bak -e '289,$d' buildbot/test/unit/test_worker_libvirt.py - sed -i.bak -e '190,$d' buildbot/test/unit/test_worker_openstack.py - sed -i.bak -e '60,84d' buildbot/test/integration/test_configs.py - # writes out a file that can't be read properly sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py ''; + postFixup = '' + buildPythonPath "$out" + patchPythonScript "$out/bin/buildbot" + mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot + echo "#!/bin/bash" > $out/bin/buildbot + echo "export PYTHONPATH=$out/lib/python2.7/site-packages:$PYTHONPATH" >> $out/bin/buildbot + echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot + chmod -c 755 $out/bin/buildbot + ''; + meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 177b7b3d946b..384452e27d9c 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -5,21 +5,17 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { - name = "buildbot-pkg-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-pkg"; + version = "0.9.0rc3"; src = fetchurl { - url = "https://pypi.python.org/packages/95/47/1fef931d410cc24127564c2e193e7c1c184f5c5f481930f77c6d6840cfab/${name}.tar.gz"; - sha256 = "01wc9bmqq1rfayqnjm7rkjhbcj7h6ah4vv10s6hglnq9s4axvxp6"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; - # doesn't seem to break without this... - patchPhase = '' - sed -i.bak -e '/"setuptools >= 21.2.1",/d' setup.py - ''; - meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; @@ -31,14 +27,15 @@ let in { www = pythonPackages.buildPythonPackage rec { - name = "buildbot_www-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot_www"; + version = "0.9.0rc3"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; src = fetchurl { - url = "https://pypi.python.org/packages/e0/d7/f1023cdb7340a15ee1fc9916e87c4d634405a87164a051e2c59bf9d51ef1/${name}-py2-none-any.whl"; - sha256 = "1006x56x4w4p2mbrzm7jy51c0xxz48lzhdwvx7j4hrjs07mapndj"; + url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl"; + sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -52,12 +49,13 @@ in { }; console-view = pythonPackages.buildPythonPackage rec { - name = "buildbot-console-view-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-console-view"; + version = "0.9.0rc3"; src = fetchurl { - url = "https://pypi.python.org/packages/f4/51/e24cc1b596e5b262a272cba3687476a13ec7d9ea24bf1f4fd0cd72902bb6/${name}.tar.gz"; - sha256 = "0970gq1sxnfd0nlrnd3mj25i3cginlw2pj5ffqsd57n5hlqg48ib"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -71,12 +69,13 @@ in { }; waterfall-view = pythonPackages.buildPythonPackage rec { - name = "buildbot-waterfall-view-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-waterfall-view"; + version = "0.9.0rc3"; src = fetchurl { - url = "https://pypi.python.org/packages/c2/21/3895355b05f91977a8b8e5435f85354e927c2ef547a25432a6bacf792a67/${name}.tar.gz"; - sha256 = "1zybrbbsyplv93zkin8cb3z1bqqr6px4p203ldcpn7lds5s9vk00"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 36b57a41aa73..2c8e17a37c00 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -4,12 +4,13 @@ }: pythonPackages.buildPythonApplication (rec { - name = "buildbot-worker-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-worker"; + version = "0.9.0rc3"; src = fetchurl { - url = "https://pypi.python.org/packages/6a/be/ae80e5e87bc92ac813cd944c08d3b6168090145fc168e7a553e88c07067a/${name}.tar.gz"; - sha256 = "19l28s2fyzln6nv2ypbdg11xiz7lrjy0n64fzhngfalv61x2bp8j"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 919c80e7ce58..d824c3e2c964 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); - buildInputs = [ curl expat zlib bzip2 libarchive ] + buildInputs = [ curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive" + stdenv.lib.optionalString useQt4 " --qt-gui"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index 08dd0acb42be..ad855df73534 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/make-3.80.tar.bz2; - md5 = "0bbd1df101bc0294d440471e50feca71"; + sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; }; patches = [./log.patch]; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 98ddd9d34e9f..f510752d385a 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { url = http://tarballs.nixos.org/mk-20060131.tar.gz; - md5 = "167fd4e0eea4f49def01984ec203289b"; + sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index e252362a0592..cdc4e6db2c2d 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "24cc47099d2e9cc1d3983e1ab65957316770f791632e572189b1e6c0183403b7"; + sha256 = "1xcwwjf2khhng6v1y7dvi579y2j643al9n0x80m0c46qb9mzd04x"; }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 474bcba6c712..8982ca5f77ad 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "3fae89741726eac69adab8dd64cd18918343188eeb43496e88d4f3abbe0998ad"; + sha256 = "0x5pmjbhrka6p27drkrca7872vgsjxaa5j0cbxsa2ds02wrn57a7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 471cc80663da..5c76fc69ac3a 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -21,5 +21,5 @@ buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json deleted file mode 100644 index b28ce075e81f..000000000000 --- a/pkgs/development/tools/deis/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/docopt/docopt-go", - "fetch": { - "type": "git", - "url": "https://github.com/docopt/docopt-go", - "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix new file mode 100644 index 000000000000..5a1b30a7e662 --- /dev/null +++ b/pkgs/development/tools/deis/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index c3d9104018df..66335412b497 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,16 +1,22 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "glide-${version}"; - version = "0.10.2"; - rev = "${version}"; + version = "0.12.2"; goPackagePath = "github.com/Masterminds/glide"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "Masterminds"; repo = "glide"; - sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl"; + sha256 = "15cdrcslkiggd6sg5j40amflydpqz1s63f13mvlg309adfhsk4qz"; + }; + + meta = with stdenv.lib; { + homepage = https://glide.sh; + description = "Package management for Go"; + license = licenses.mit; + maintainers = [ maintainers.rushmorem ]; }; } diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix new file mode 100644 index 000000000000..98813f143cbb --- /dev/null +++ b/pkgs/development/tools/glock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "glock-${version}"; + version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; + + goPackagePath = "github.com/robfig/glock"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "glock"; + sha256 = "10jwn3k71p340g8d43zjx7k1j534rcd7rss8pif09mpfrn9qndhh"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/robfig/glock; + description = "A command-line tool to lock Go dependencies to specific revisions"; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/development/tools/glock/deps.nix new file mode 100644 index 000000000000..b7392d757cfc --- /dev/null +++ b/pkgs/development/tools/glock/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/agtorre/gocolorize"; + fetch = { + type = "git"; + url = "https://github.com/agtorre/gocolorize"; + rev = "f42b554bf7f006936130c9bb4f971afd2d87f671"; + sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; + }; + } +] diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index d6ae032f0782..e47b84354d62 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; }; - buildInputs = [ gotools ]; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/go-repo-root/deps.nix b/pkgs/development/tools/go-repo-root/deps.nix new file mode 100644 index 000000000000..2554b3cad1a5 --- /dev/null +++ b/pkgs/development/tools/go-repo-root/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } + { + goPackagePath = "code.google.com/p/go.tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index e0e9fe8c3fc5..f12497eb78c6 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "0.1.0"; + version = "1.1.0"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,10 +12,10 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf"; + sha256 = "0asbbcyf1hh8khakych0y09rjarjiywr8pyy1v8ghpr1vvg43a09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json deleted file mode 100644 index ab9d0d39fce8..000000000000 --- a/pkgs/development/tools/go2nix/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - } -] diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix new file mode 100644 index 000000000000..8fc784f4b7f8 --- /dev/null +++ b/pkgs/development/tools/go2nix/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; + sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; + }; + } + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "772320464101e904cd51198160eb4d489be9cc49"; + sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; + }; + } +] diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix new file mode 100644 index 000000000000..04c35f7b8bb7 --- /dev/null +++ b/pkgs/development/tools/goa/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: + +buildGoPackage rec { + name = "goa-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/goadesign/goa"; + subPackages = [ "goagen" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "goadesign"; + repo = "goa"; + sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + }; + + buildInputs = [ makeWrapper ]; + + allowGoReference = true; + + outputs = [ "out" ]; + + preInstall = '' + export bin=$out + ''; + + postInstall = '' + # goagen needs GOPATH to be set + wrapProgram $out/bin/goagen \ + --prefix GOPATH ":" $out/share/go + + # and it needs access to all its dependancies + mkdir -p $out/share/go + cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/ + ''; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://goa.design; + description = "A framework for building microservices in Go using a unique design-first approach"; + license = licenses.mit; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix new file mode 100644 index 000000000000..14e9234be8a2 --- /dev/null +++ b/pkgs/development/tools/goa/deps.nix @@ -0,0 +1,111 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "3df31a1ada83e310c2e24b267c8e8b68836547b4"; + sha256 = "1l99f1bzvdhyqhnsrpi1pd07bps0msilzilrd7m4w7i1m5kra529"; + }; + } + { + goPackagePath = "github.com/dimfeld/httppath"; + fetch = { + type = "git"; + url = "https://github.com/dimfeld/httppath"; + rev = "c8e499c3ef3c3e272ed8bdcc1ccf39f73c88debc"; + sha256 = "0452zvrzjvy8pk5q6ykivz2cks082r4lmh7hghscxfqw6gf3siwi"; + }; + } + { + goPackagePath = "github.com/dimfeld/httptreemux"; + fetch = { + type = "git"; + url = "https://github.com/dimfeld/httptreemux"; + rev = "96acf0909c0b45ebf4a25a816cedc6d317e63679"; + sha256 = "0f9qbm1b8l7b21i2v8vmjyzfwf1mgkvxlk5250bwkp5i8n4ml2r6"; + }; + } + { + goPackagePath = "github.com/goadesign/goa"; + fetch = { + type = "git"; + url = "https://github.com/goadesign/goa"; + rev = "ea323df387ea68f8ac9fd79336f523c25e12c92e"; + sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + }; + } + { + goPackagePath = "github.com/manveru/faker"; + fetch = { + type = "git"; + url = "https://github.com/manveru/faker"; + rev = "717f7cf83fb78669bfab612749c2e8ff63d5be11"; + sha256 = "1p6laz0hnb2vhfvam83rz6vl2amajqa6nifnsj2lg3mcs9ga8c0f"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; + sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/zach-klippenstein/goregen"; + fetch = { + type = "git"; + url = "https://github.com/zach-klippenstein/goregen"; + rev = "795b5e3961ea1912fde60af417ad85e86acc0d6a"; + sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "71a035914f99bb58fe82eac0f1289f10963d876c"; + sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; + sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + }; + } +] diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 29e5b28ad57f..c54a924a1a65 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json deleted file mode 100644 index 387adc6cf069..000000000000 --- a/pkgs/development/tools/golint/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/tools", - "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", - "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" - } - } -] diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 000000000000..f03bf9b5b23b --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index f00794a7eb0f..3408c90cda6a 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json deleted file mode 100644 index 64ae72eb3ed4..000000000000 --- a/pkgs/development/tools/gotools/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix new file mode 100644 index 000000000000..d4be771e8d6b --- /dev/null +++ b/pkgs/development/tools/gotools/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 030a59ed20c5..92bb619be70a 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json deleted file mode 100644 index 3406194137cd..000000000000 --- a/pkgs/development/tools/gox/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mitchellh/iochan", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/iochan", - "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", - "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" - } - } -] diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix new file mode 100644 index 000000000000..d15b8e7c0916 --- /dev/null +++ b/pkgs/development/tools/gox/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mitchellh/iochan"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } +] diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 2620a5b7741a..29d2f13ca9a8 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }: +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }: stdenv.mkDerivation rec { name = "visualvm-1.3.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # To get the native LAF, JVM needs to see GTK’s .so-s. wrapProgram $out/bin/visualvm \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk2 ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index d3e820767884..6db999eea543 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { fetchSubmodules = false; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json deleted file mode 100644 index 60141d5eeeeb..000000000000 --- a/pkgs/development/tools/leaps/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf", - "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w" - } - } -] diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix new file mode 100644 index 000000000000..0a6214a76d0b --- /dev/null +++ b/pkgs/development/tools/leaps/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + }; + } +] diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 0fd9f143ce9a..359ab125be99 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }: +{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { name = "bsdbuild-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; - buildInputs = [ perl groff ed ]; + buildInputs = [ perl mandoc ed ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; prePatch = '' diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f538c2138926..99348e907a94 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, zlib }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; @@ -15,43 +15,49 @@ let ccache = stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' ''; - doCheck = true; + doCheck = !stdenv.isDarwin; - passthru = { + passthru = let + unwrappedCC = stdenv.cc.cc; + in { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir links = extraConfig: stdenv.mkDerivation rec { name = "ccache-links"; passthru = { - inherit gcc; - isGNU = true; + isClang = unwrappedCC.isClang or false; + isGNU = unwrappedCC.isGNU or false; }; - inherit (gcc.cc) lib; + inherit (unwrappedCC) lib; buildCommand = '' mkdir -p $out/bin - if [ -x "${gcc.cc}/bin/gcc" ]; then - cat > $out/bin/gcc << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@" - EOF - chmod +x $out/bin/gcc - fi - if [ -x "${gcc.cc}/bin/g++" ]; then - cat > $out/bin/g++ << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@" + + wrap() { + local cname="$1" + if [ -x "${unwrappedCC}/bin/$cname" ]; then + cat > $out/bin/$cname << EOF + #!/bin/sh + ${extraConfig} + exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@" EOF - chmod +x $out/bin/g++ - fi - for executable in $(ls ${gcc.cc}/bin); do + chmod +x $out/bin/$cname + fi + } + + wrap cc + wrap c++ + wrap gcc + wrap g++ + wrap clang + wrap clang++ + + for executable in $(ls ${unwrappedCC}/bin); do if [ ! -x "$out/bin/$executable" ]; then - ln -s ${gcc.cc}/bin/$executable $out/bin/$executable + ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable fi done - for file in $(ls ${gcc.cc} | grep -vw bin); do - ln -s ${gcc.cc}/$file $out/$file + for file in $(ls ${unwrappedCC} | grep -vw bin); do + ln -s ${unwrappedCC}/$file $out/$file done ''; }; @@ -63,7 +69,7 @@ let ccache = stdenv.mkDerivation rec { downloadPage = https://ccache.samba.org/download.html; license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; }; in ccache diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 4685787af5f7..2dff98a212d6 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,29 +1,28 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, emacs}: +{ fetchurl, stdenv, ncurses +, emacsSupport ? true, emacs +}: stdenv.mkDerivation rec { - name = "cscope-15.8a"; + name = "cscope-15.8b"; src = fetchurl { url = "mirror://sourceforge/cscope/${name}.tar.gz"; - sha256 = "07jdhxvp3dv7acvp0pwsdab1g2ncxjlcf838lj7vxgjs1p26lwzb"; + sha256 = "1byk29rcpyygrnr03h5j3y8j0aqxldd9dr5ihi9q982sy28x12a8"; }; - preConfigure = '' - sed -i "contrib/xcscope/cscope-indexer" \ - -"es|^PATH=.*$|PATH=\"$out/bin:\$PATH\"|g" - sed -i "contrib/xcscope/xcscope.el" \ - -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; - ''; - configureFlags = "--with-ncurses=${ncurses.dev}"; buildInputs = [ ncurses ]; - nativeBuildInputs = [ pkgconfig emacs ]; + nativeBuildInputs = stdenv.lib.optional emacsSupport emacs; - postInstall = '' - # Install Emacs mode. + postInstall = stdenv.lib.optionalString emacsSupport '' cd "contrib/xcscope" + sed -i "cscope-indexer" \ + -"es|^PATH=.*$|PATH=\"$out/bin:\$PATH\"|g" + sed -i "xcscope.el" \ + -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; + mkdir -p "$out/libexec/cscope" cp "cscope-indexer" "$out/libexec/cscope" diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 7a2796b48ca8..32e212a09214 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand +{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false @@ -16,7 +16,7 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -28,7 +28,7 @@ let ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi - --with${if gtk != null then "" else "out"}-gtk + --with${if gtk2 != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b9d034452861..2641a1ed04fc 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk pkgconfig hicolor_icon_theme ]; + buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix new file mode 100644 index 000000000000..9e458f2aca5a --- /dev/null +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: + +with lib; + +buildGoPackage rec { + name = "go-md2man-${version}"; + version = "1.0.6"; + + goPackagePath = "github.com/cpuguy83/go-md2man"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "cpuguy83"; + repo = "go-md2man"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + }; + + meta = { + description = "Go tool to convert markdown to man pages"; + license = licenses.mit; + homepage = https://github.com/cpuguy83/go-md2man; + maintainers = with maintainers; [offline]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix new file mode 100644 index 000000000000..5f434c13abc6 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "patchelf-0.10-pre-20160920"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "patchelf"; + rev = "327d80443672c397970738f9e216a7e86cbf3ad7"; + sha256 = "0nghzywda4jrj70gvn4dnrzasafgdp0basj04wfir1smvsi047zr"; + }; + + setupHook = [ ./setup-hook.sh ]; + + buildInputs = [ autoreconfHook ]; + + doCheck = true; + + meta = { + homepage = http://nixos.org/patchelf.html; + license = "GPL"; + description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index cd027c7b08d7..50e35928bba4 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -6,7 +6,7 @@ # # In NixOS, simply add this package to services.udev.packages. -{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft +{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils , makeDesktopItem, xkeyboardconfig @@ -15,7 +15,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - glib libSM libICE gtk libXext libXft fontconfig libXrender libXfixes libX11 + glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib ]; diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 1fcda13dab8f..5028ac9580c5 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 18fdf7bca3bc..30c40331a0f9 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index db5d6ee6b6fe..ba5d6c8e3343 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,7 +8,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xorg.libXtst xorg.libXi diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0d765ec93bbb..afa480296f6f 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, fetchgit, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, + aspcudSupport ? !stdenv.isDarwin, aspcud +}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; @@ -45,7 +48,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper]; src = srcs.opam; @@ -69,6 +72,13 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + postInstall = + if aspcudSupport then '' + wrapProgram $out/bin/opam \ + --suffix PATH : ${aspcud}/bin + '' + else ""; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index e3dc3d77abcc..4be334e20ed9 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, binutils -, pkgconfig, gtk, glib, pango, libglade }: +, pkgconfig, gtk2, glib, pango, libglade }: stdenv.mkDerivation rec { name = "sysprof-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk glib pango libglade ]; + buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 49de886654c8..ecf919a98298 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json deleted file mode 100644 index 1cc264181c4c..000000000000 --- a/pkgs/development/tools/remarshal/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - } -] diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix new file mode 100644 index 000000000000..32f9f6eb0bb5 --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } +] diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix new file mode 100644 index 000000000000..b6cbeb88402b --- /dev/null +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: + +with rustPlatform; + +buildRustPackage rec { + name = "rainicorn-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "RustDT"; + repo = "Rainicorn"; + rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4"; + sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; + }; + + depsSha256 = "1ckrf77s1glrqi0gvrv9wqmip4i97dk0arn0iz87jg4q2wfss85k"; + + meta = with stdenv.lib; { + description = "Rust IDEs. parse-analysis"; + homepage = https://github.com/RustDT/Rainicorn; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index e93006b89ce3..d573a6c5b60c 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,27 +4,24 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.3.16"; + version = "4.4.0"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0i4nvb1yd9qnbgbfc8wbl7ghpmba2jr98hj4y4j4sbjfk65by3xw"; + sha256 = "19zgnw0qn5f775p581mq5ry086rhcnnhqc6x82hzmwfysbsyl7xs"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1w9b1584kh1n4fw0wxbyslxp6w09if53fv4p9zz7vn4smm79ndfz"; + sha256 = "1m4nf1yidwkmlwald0ycwzvnsp5p93nc4bs1xh67phw0b2db99x9"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1vhz2j30p285blspg7prr9bsah6f922p0mv7mhmk6xzgf6fgn764"; + sha256 = "1bpdpwqa9sw2n7vw2g8q4c1mzgh8wgwn4p7sbryc2ki90yz8ibga"; } ); buildInputs = [ unzip ]; - phases = [ "unpackPhase" ] - ++ (lib.optionals (stdenv.system != "x86_64-darwin") [ "patchPhase" ]) - ++ [ "installPhase " ]; - patchPhase = '' + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 1f2153bf3375..6a10f73cfe4f 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib -, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf , libXi, libXrender, libXext }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 4caa659c17a3..65c0bb8e41e5 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json deleted file mode 100644 index 01c5de1cdc62..000000000000 --- a/pkgs/development/tools/textql/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix new file mode 100644 index 000000000000..e166e73a61fc --- /dev/null +++ b/pkgs/development/tools/textql/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a59d656b625a..91a01edc23a6 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -7,7 +7,7 @@ let thrustEnv = buildEnv { name = "env-thrust"; paths = [ - stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk_pixbuf cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 0a72e6bb91eb..b2c96beeeb34 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb -, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium +, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp-2_0, chromium }: let @@ -19,10 +19,10 @@ let binPath = lib.makeBinPath [ nodejs gnutar ]; developBinPath = lib.makeBinPath [ mono ]; developLibPath = lib.makeLibraryPath [ - glib libgnomeui gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk + glib libgnomeui gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]; developDotnetPath = lib.concatStringsSep ":" [ - gnome-sharp gtk-sharp + gnome-sharp gtk-sharp-2_0 ]; ver = "5.3.5"; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 418e23eb0e71..a116e8b73e22 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,38 +1,40 @@ -{ stdenv, lib, writeText, bash, fetchurl, php }: +{ stdenv, lib, writeText, writeScript, fetchurl, php }: let + version = "0.24.1"; + name = "wp-cli-${version}"; + phpIni = writeText "wp-cli-php.ini" '' [Phar] phar.readonly = Off ''; -in stdenv.mkDerivation rec { - version = "0.23.1"; - name = "wp-cli-${version}"; + wpBin = writeScript "wp" '' + #! ${stdenv.shell} -e + exec ${php}/bin/php \ + -c ${phpIni} \ + -f ${src} "$@" + ''; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1sjai8gjsx6j82lsxq9m827bczp4ajnldk6ibj4krcisn9pjva5f"; + sha256 = "027nclp8qbfr624ja6aixzcwnvb55d7dskk9l1i042bc86hmphfd"; }; - propagatedBuildInputs = [ php ]; +in stdenv.mkDerivation rec { + + inherit name; buildCommand = '' mkdir -p $out/bin - - cat >$out/bin/wp <<EOF - #! ${bash}/bin/bash -e - exec ${php}/bin/php -c ${phpIni} -f ${src} "\$@" - EOF - - chmod +x $out/bin/wp + ln -s ${wpBin} $out/bin/wp ''; - meta = { + meta = with stdenv.lib; { description = "A command line interface for WordPress"; - maintainers = [ stdenv.lib.maintainers.peterhoeg ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; homepage = https://wp-cli.org; - license = stdenv.lib.licenses.mit; + license = licenses.mit; }; } diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3248258d5523..0220fbd8df82 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/web/minify/deps.json b/pkgs/development/web/minify/deps.json deleted file mode 100644 index 0575578b43c0..000000000000 --- a/pkgs/development/web/minify/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0", - "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0" - } - }, - { - "goPackagePath": "github.com/tdewolff/buffer", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/buffer", - "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5", - "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl" - } - }, - { - "goPackagePath": "github.com/tdewolff/parse", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/parse", - "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3", - "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v" - } - }, - { - "goPackagePath": "github.com/tdewolff/strconv", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/strconv", - "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3", - "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp" - } - }, - { - "goPackagePath": "github.com/matryer/try", - "fetch": { - "type": "git", - "url": "https://github.com/matryer/try", - "rev": "93d30e50512f879b73829eb79867df38084bcd31", - "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/ogier/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/ogier/pflag", - "rev": "45c278ab3607870051a2ea9040bb85fcb8557481", - "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l" - } - } -] diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix new file mode 100644 index 000000000000..4efaec46d571 --- /dev/null +++ b/pkgs/development/web/minify/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; + sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; + }; + } + { + goPackagePath = "github.com/tdewolff/buffer"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/buffer"; + rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5"; + sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "34d5c1160d4503da4b456e5094609f2331d6dde3"; + sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"; + }; + } + { + goPackagePath = "github.com/tdewolff/strconv"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/strconv"; + rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3"; + sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "93d30e50512f879b73829eb79867df38084bcd31"; + sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } +] diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c0a906aeb717..ad941f80d50e 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -8,8 +8,8 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; in import ./nodejs.nix (args // rec { - version = "6.4.0"; - sha256 = "1b3xpp38fd2y8zdkpvkyyvsddh5y4vly81hxkf9hi6wap0nqidj9"; + version = "6.6.0"; + sha256 = "0cqswab9idbz5kzj50fnalg1zrircmbn9qga0cr33lvjnv98a134"; extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 1d151b66920a..47ab73ca269e 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk, curl }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: stdenv.mkDerivation rec { name = "ckan-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; - libraries = stdenv.lib.makeLibraryPath [ gtk curl ]; + libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index eb20c0b329e8..2044782c1bde 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, freeglut, SDL, mesa, libXi, libXmu}: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, mesa, libXi, libXmu}: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = [ pkgconfig gtk freeglut SDL mesa libXi libXmu ]; + buildInputs = [ pkgconfig gtk2 freeglut SDL mesa libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 7915822589c3..bed3abccf9b4 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk }: +{ stdenv, fetchurl, perl, pkgconfig, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./eboard.patch ]; - buildInputs = [ gtk ]; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ perl pkgconfig ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 69d87411da67..519b7c2ac247 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm +{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, mesa, nasm , pkgconfig, SDL2, SDL2_mixer }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx mesa SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index bb6cffdb1224..b7a25a29c1c9 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.13.13"; + version = "0.13.20"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -27,12 +27,12 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "1ip0h2kh16s07nk6xqpm0i0yb0x32zn306414j15gqg3j0j0mzpn"; }; - alpha = authenticatedFetch { inherit url; sha256 = "1hvj51cggp6cbxyndbl4z07kadzxxk3diiqkkv0jm9s0nrwvq9zr"; }; + headless = fetchurl { inherit name url; sha256 = "0nf1sxcgnbx52iwx7jgkjxass10lzz1iyskvgk0gq3ky9cg4ixfb"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0rgjdxdcqf9m3ghzr076q3xi1g01ix14jldjwn6jgnvggzqkph9l"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "14dwlakn7z8jziy0hgm3nskr7chp7753z1dakxlymz9h5653cx8b"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0hda2z1q22xanl328kic5q09ck59mr3aa5cy4dbjv86s4dx9kxfq"; }; }; }; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index af785d0e4a9e..b5619644bd81 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? false, gtk +, gtkClient ? false, gtk2 , server ? true, readline }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ zlib bzip2 curl lzma gettext ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] - ++ optionals gtkClient [ gtk ] + ++ optionals gtkClient [ gtk2 ] ++ optional server readline; configureFlags = [] diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index f6f52aabb6b0..4269d3a74dbb 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib pkgconfig mesa wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index b3b56c03fa3e..9aee664a50eb 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.2"; + version="6.2.3"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="1a41ag03q66pwy3pjrmbxxjpzi9fcaiiaiywd7m9v25mxqac2xkp"; + sha256="10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq"; }; buildInputs = [ flex diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix deleted file mode 100644 index 1c8f0334bf19..000000000000 --- a/pkgs/games/gsb/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, config, requireFile -, curl3, SDL, SDL_image, libpng12, libjpeg62, libvorbis, libogg, openal, mesa -, libX11, libXext, libXft, fontconfig, zlib }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "gsb-1.56.0"; - - goBuyItNow = '' - We cannot download the full version automatically, as you require a license. - Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://gsb1324679796.tar.gz" in the - directory where you saved it. - ''; - - src = requireFile { - message = goBuyItNow; - name = "gsb1324679796.tar.gz"; - sha256 = "12jsz9v55w9zxwiz4kbm6phkv60q3c2kyv5imsls13385pzwcs8i"; - }; - - arch = if stdenv.system == "i686-linux" then "x86" else "x86_64"; - - phases = "unpackPhase installPhase"; - - # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ] - + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ] - + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ] - + ":" + stdenv.cc.cc + "/lib64"; - - installPhase = '' - mkdir -p $out/libexec/positech/GSB/ - mkdir -p $out/bin - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - ./GSB.bin.$arch - - cp -r * $out/libexec/positech/GSB/ - rm -rf $out/libexec/positech/GSB/lib64/ - rm -rf $out/libexec/positech/GSB/lib/ - - #makeWrapper doesn't do cd. :( - - cat > $out/bin/GSB << EOF - #!/bin/sh - cd $out/libexec/positech/GSB - exec ./GSB.bin.$arch - EOF - chmod +x $out/bin/GSB - ''; - - meta = with stdenv.lib; { - description = "Gratuitous Space Battles"; - longDescription = '' - a strategy / management / simulation game that does away with all the - base building and delays and gets straight to the meat and potatoes of - science-fiction games : The big space battles fought by huge spaceships with - tons of laser beams and things going 'zap!', 'ka-boom!' and 'ka-pow!'. In GSB - you put your ships together from modular components, arrange them into fleets, - give your ships orders of engagement and then hope they emerge victorious from - battle (or at least blow to bits in aesthetically pleasing ways). - ''; - homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = licenses.unfree; - maintainers = with maintainers; [ jcumming ]; - platforms = [ "x86_64-linux" "i686-linux" ] ; - broken = true; - }; - -} diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 18e13b8be949..f9be01aa9289 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -2,11 +2,7 @@ , giflib, libXt, pkgconfig }: let - openscenegraph_ = openscenegraph.override { - inherit ffmpeg giflib; - withApps = false; - }; - openscenegraph__ = openscenegraph_.overrideDerivation (self: { + openscenegraph_ = openscenegraph.overrideDerivation (self: { src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; @@ -15,19 +11,19 @@ let }; }); in stdenv.mkDerivation rec { - version = "0.39.0"; + version = "0.40.0"; name = "openmw-${version}"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0haz8p0hwzgpj634q34if6x57rkc3zsndry5pz4a25m23sn1i72y"; + sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w"; }; enableParallelBuilding = true; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig libXt ]; + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal pkgconfig libXt ]; meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 3f1735c31aa1..254b65cc4d91 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, intltool } : +{stdenv, fetchurl, gtk2, pkgconfig, intltool } : stdenv.mkDerivation rec { name = "pioneers-0.12.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 5e5da9497e58..bd7e11889280 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,9 +34,9 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 2eb3a916eb3c..ca1721e8ed59 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, - gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, + gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = - [ boost cmake ffmpeg freeglut glib gtk libjpeg libpng + [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal pixman pkgconfig python27Full SDL ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index c4477ab01d9e..ac658ee1367a 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig - libuuid openal ogre ois curl gtk mygui unzip angelscript + libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; meta = { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 78b9e155642c..6ba91feced83 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar -, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring +, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure + boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed diff --git a/pkgs/games/steam/build-runtime.py b/pkgs/games/steam/build-runtime.py index 3f23d53b9846..e0ff5cebd933 100644 --- a/pkgs/games/steam/build-runtime.py +++ b/pkgs/games/steam/build-runtime.py @@ -20,20 +20,12 @@ def parse_args(): return parser.parse_args() -def install_deb (basename, deb, md5, dest_dir): +def install_deb (basename, deb, dest_dir): installtag_dir=os.path.join(dest_dir, "installed") if not os.access(installtag_dir, os.W_OK): os.makedirs(installtag_dir) # - # Write the tag file and checksum to the 'installed' subdirectory - # - with open(os.path.join(installtag_dir,basename),"w") as f: - subprocess.check_call(['dpkg-deb', '-c', deb], stdout=f) - with open(os.path.join(installtag_dir,basename+".md5"),"w") as f: - f.write("%s %s.deb\n" % (md5, basename)) - - # # Unpack the package into the dest_dir # os.chdir(top) @@ -98,7 +90,7 @@ print ("Creating Steam Runtime in %s" % args.runtime) with open(args.input) as pkgfile: pkgs = json.load(pkgfile) for pkg in pkgs: - install_deb(pkg["name"], pkg["source"], pkg["md5"], args.runtime) + install_deb(pkg["name"], pkg["source"], args.runtime) fix_debuglinks() fix_symlinks() diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9a7664550552..8c86371ecab3 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -51,6 +51,7 @@ in buildFHSUserEnv rec { gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm + mono (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 260b7a9b8d83..694274053bfe 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -5,1747 +5,1747 @@ amd64 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - md5 = "cbbb1118a27ed0dfb126a109d1d265b3"; + sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - md5 = "c54e97c2023e1d1d5df16eb2c426c0be"; + sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "1c719a43eb7fa0745eabcea972b0c473"; + sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - md5 = "3870b0a51a7614f28bc40e3e58d39a9c"; + sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - md5 = "607f89071971116adf22fe989408a395"; + sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "ea6e6b0f99808a2cc8135036824bcfca"; + sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - md5 = "5a11378ebba911b6e139c1dc3fee7990"; + sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - md5 = "2ab7433f1e12be2d35c3916e2530b969"; + sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aaf2e682393b856d25619d05c44c2108"; + sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - md5 = "9e32b15b95be699bc9270dac78fd384c"; + sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - md5 = "82b9f608c4e02ae70542466690ddb904"; + sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_amd64"; - md5 = "f318986e6b639fd680117e27e60ab497"; + sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - md5 = "36b951c9e4bb13126bd12f4a895c77ce"; + sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - md5 = "4bfcd91866196506d53c114d81b5bf90"; + sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "e2f370e89883d69abdf4cae6151bb22d"; + sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "154923fce5cea989b98ca1c11fe35196"; + sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "6d9d47d9695b5ece354c5a6cbcde905d"; + sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "f5d71b18f095842d8f881e3362d031ac"; + sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "88181968144020fb0fbf90ae740456d8"; + sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "790046586a22c706ab561ad5f3c94ac6"; + sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - md5 = "9e9dc9f5739feb34dbabc4e471317a5a"; + sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - md5 = "a474e80d3f221776d59084f2ac60ef00"; + sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "18a66b67dce65dad49c374965e0921f0"; + sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "2b756be54454a87929c5d3a724297496"; + sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "bc12bbc912b3d71dc8c6340e9f43136c"; + sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - md5 = "d8264c1c6f71865f4357d7f59062098f"; + sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "c0c923294f11ba74f0ef566e1effb4e6"; + sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - md5 = "12cd8bbe50da1b698d5280c8cd1efe38"; + sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - md5 = "bf3f1fd3fb7376ac8a4de5837d0b24a3"; + sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "12acf5241daf7ff86e9dc23c64a2f71b"; + sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "0fddfa641103922bdc38ec71c61ba681"; + sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - md5 = "5082143b56f4d6a72c21244c4b7bc653"; + sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - md5 = "28cf6b803847aa977ce557f479f52846"; + sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "85833a32196fb585db2bbb65fdd28c1d"; + sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "ee79e60c712f7139a305d929c51974e1"; + sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - md5 = "6234ec87a59fb9a534e53efb3978347a"; + sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - md5 = "a7148db45279001346cebc02a7d7c1af"; + sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - md5 = "522cb933493dd7ad25b35381325579aa"; + sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_amd64"; - md5 = "87dcbc179e3d5ba43629b3d3045d9253"; + sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_amd64"; - md5 = "4d89126341f2e70a7a248e20dc024240"; + sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - md5 = "d90eb7f1c85b5c1c256e87ae0f840986"; + sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - md5 = "06f7ccb54bba06c1e2673471866039a0"; + sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "a16aa8ab25b2d926085b686bdccfd31d"; + sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - md5 = "54e9d0b216e195c52491aa6714262abc"; + sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - md5 = "502feac74b4fdda9c2b4a12efd15c82e"; + sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - md5 = "6becfe1861ebea500d23273acece2eb7"; + sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_amd64"; - md5 = "f61ea5e775178ce123d40198c1157b9f"; + sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_amd64"; - md5 = "bdff67db0a4d67674896f13bbc6effd3"; + sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - md5 = "a1a4af8a6ecf974bfdac345319a2e953"; + sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - md5 = "170edcba12461120395cfae26db8ef39"; + sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - md5 = "ddae75bcd90b6e11cde2071ccb05799d"; + sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - md5 = "5393d7b8c652fcdb4bc7b0063e7bc595"; + sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "0a2b96a562ddf2e2e8018ee42fc44697"; + sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2732fe5e798a8355f1f42ce803144b5e"; + sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "68cc7194070bc391898a2ac64f60238d"; + sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aec9eef24bdbf46a564a8c3a2e5e9996"; + sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - md5 = "d7d638c9706de787b067b90538f5d161"; + sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - md5 = "5b1d88d1613f8a15dbcf4721006a928e"; + sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "3967c473e9250f043ce694f0f0881b95"; + sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - md5 = "042f301b15c2213e918332b827ed876e"; + sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c714f66ed7629e5ea8da89b301314dbf"; + sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "adc4837d7e7a8bb59d1eff8dc009a787"; + sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c9832147e9399447d25db46b932009d5"; + sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "ec9e8fc0b860a9e67a75965a684a1b10"; + sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_amd64"; - md5 = "165e91c5ea7d2268e54c4483d6bfee21"; + sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - md5 = "6039786cec09e8196f0344a0eaba4b35"; + sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - md5 = "e50b84332411dfe83f3cdb280a340659"; + sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - md5 = "9e2fbb98f0a36c193b7de2e0aedf504c"; + sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - md5 = "214eaa463aeef6e881231c3bd902fb97"; + sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - md5 = "fc7df95d832fea01fa6ec6134518f785"; + sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - md5 = "9181b67bd4b26368f29922a872998ad6"; + sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "14a85bce181c6fe78bd00c156bd71033"; + sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_amd64"; - md5 = "cc6a001e351c3e4e0ece1f59c92fe9a9"; + sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "6de94826e9407f5ebf3880ba4306e287"; + sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "39ce748ff830b7e01f93e12e3829c90e"; + sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "dda5082adc17603046892b6c9a6f8d96"; + sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - md5 = "6aa3befa823b58e2ef17137c6ce4ed26"; + sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "736acf677d1bc728947297ae33d8d53c"; + sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - md5 = "eeb2a0afa5eb25eb240a7a5aac1fc6eb"; + sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_amd64"; - md5 = "aaf3c4e2d1c733dc9847d1b4b160faba"; + sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_amd64"; - md5 = "a1e80e9cb80e7de986ce7730ae0e27d9"; + sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_amd64"; - md5 = "69f8d641d346520d794ed925961df35c"; + sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "f227e6607d7b84cbe99e3eaf7fa726c8"; + sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "da911ace3dc8956ae2d776a9de38491c"; + sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_amd64"; - md5 = "d75b12a9714d3e5bf5513e43cfecb9e1"; + sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - md5 = "189258c833f8ddf0eb22fe26ad3fa3b9"; + sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - md5 = "9e73637724364e1e0f95df26ccee054a"; + sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - md5 = "bf9932f2354ee1026d636d3cb7026b05"; + sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - md5 = "286033d0e031389e350644f2979f7b62"; + sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - md5 = "838a5f35acfc6e454954ed9ae776ef7d"; + sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - md5 = "5834045994d6e316a68568a01257bed9"; + sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - md5 = "6f81b9ab5fa21dd99eae337be3ed546e"; + sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - md5 = "6ebc019119624fb5f776d9829ee49478"; + sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_amd64"; - md5 = "134666c4e50fb2422a12018f061dc2ce"; + sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_amd64"; - md5 = "f4beb4a2b0d24d1bf3a75f5794580d9a"; + sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - md5 = "52134e1b8190957f069268827f2bde74"; + sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - md5 = "0e79e11954e9dd12b345de34ae9dda6d"; + sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - md5 = "e5314b3129eda4940896d1cad7701a22"; + sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "3cdc654725b6fd08c96eee54041b2ce3"; + sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - md5 = "d5ad690e85842798c27c8afb8c0c9d53"; + sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_amd64"; - md5 = "1680e147372fd0500aa6a27a9a557662"; + sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - md5 = "d51e140f457c694957bc476128dfa965"; + sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - md5 = "965cbe12d8b1b31eae47d0eb9651c72c"; + sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - md5 = "b60fff841525e6097f0bd3f9e224e8a1"; + sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - md5 = "30bd93bf4d524594021b8b3f9b35eb2c"; + sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - md5 = "ea14d71381e1d55c59b5790f37531900"; + sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - md5 = "b648fbaea74b0d76b020c6abb78b46ce"; + sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - md5 = "7a16e55edbcc24311753260947eb2574"; + sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - md5 = "00c0fceba317e355e52353f1b453419c"; + sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_amd64"; - md5 = "9544e9d02e1aacdaaefcae68f57baa44"; + sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_amd64"; - md5 = "7bdbbba9e9150b8596a28afb4c49dd13"; + sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - md5 = "cb3455f005e98fd8eb7aa5d4a72e7458"; + sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_amd64"; - md5 = "7682f5ffd1f30dc5818b3759be85e21a"; + sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_amd64"; - md5 = "e7a184667cc034127615e7bc15bc050b"; + sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "95acf2dbab5d8c6d7c0cd4b809025b87"; + sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "38f8216be0d2b2dfd2850d87c7e306df"; + sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6"; + sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - md5 = "eabb32b42b50ae68d5a4b2ef0b323c95"; + sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "c5d4ad341622e56660a5202500af4930"; + sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "0776afbc253637cb3491d08d65601a7e"; + sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "0aac40ddee7040acf921dbacc2776bea"; + sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd"; + sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_amd64"; - md5 = "ccd7521c751d0e3596ef200a3363df4b"; + sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_amd64"; - md5 = "56b46df3ed2af08c54838cbe67c0b937"; + sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - md5 = "c1381636444b1d35be7898611fbc4150"; + sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - md5 = "7c44d58a6acf73b6c298cfa03e982e0f"; + sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_amd64"; - md5 = "708d85139b45dc5e93a3ca00990204ab"; + sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - md5 = "89d4fbfa14053514448ecaff1d8cb2c4"; + sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - md5 = "3d2612fa64d30aa01a477e02886f9ea1"; + sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - md5 = "0d0a1e7e54df9e10e758ee90e96a8f55"; + sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "21794fa4d2936f13999455ea16575df4"; + sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "ebf9276cc75fddbc81958aa8e7a2f285"; + sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "6d8d1a89d63c536e4ba77cffb9af7df9"; + sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - md5 = "d31594fc832bfd0bc65c43f2e7f40ac5"; + sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "6acf08e8df17c93563dae9a381cc26ac"; + sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "b6a1ab86060a3c4e1963d513ae68376b"; + sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "56218bd8b7278303574f6f4bc23fac1a"; + sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_amd64"; - md5 = "7ecb41c7e23f1caa6764abed122a2f6b"; + sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - md5 = "4d9ac7966de8160a13817291206b51a4"; + sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "a1e5b4a8f8200feef82dab976f1b4e5d"; + sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_amd64"; - md5 = "52c3a2c8395cbba79e65c3d60a82e1fd"; + sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "22ca2e28aa3f3d70b77632a8772a4a9d"; + sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "e94af0629e0b59f21c1ccc4f4d4088b5"; + sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_amd64"; - md5 = "a1de8ce9992f09ca56f20ab8327c34a2"; + sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - md5 = "57942d64120a191d0a1ca3bcb1fb2b8f"; + sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec25a999e0cd681955ef2f9b06161dfe"; + sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - md5 = "a34a6950609570a554e574b086b73c7f"; + sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ba4c437f0ab6f71284dca7d61b0e6df0"; + sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea4e1ff16a644f136ae45c7e2b9849c8"; + sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "386ba46c8f015d642d9351d690f0a822"; + sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2eeda427ea95e90068f4434a926fd25"; + sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - md5 = "0519bd96e7af25f6acf1a6cd63536d38"; + sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - md5 = "bc24264b0ca68cc209e66f1620aeb232"; + sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2ee93429107681f1afddcd932b55710b"; + sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec46d80b43969cffd7aebbef27359897"; + sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - md5 = "74a13db70ec5ab4a0be7ea5afababa8b"; + sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e20c88e8b39404b5e60841ea24860c48"; + sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - md5 = "64773ffa7219574d1356fa2b621d5f4f"; + sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d263f46ada805900e88deb8bd6e7016e"; + sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - md5 = "df0ce39512e455f442268bf9f9c0c52e"; + sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - md5 = "dfd64e3afb9c3eb4c2938bbf8288323a"; + sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - md5 = "09107ec941a6361acb73922f49905edf"; + sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - md5 = "cf8ee2c9b5459dd229f2967ab28b7bba"; + sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - md5 = "c418c00f009cdb7e4ed25a0fc4059a1e"; + sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "c06f25c1c69e78e0f0fe39f0e20ca796"; + sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - md5 = "760966200beff9f7c9ff0f4af224e65a"; + sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2f30b8aaf1cdc0bf7d234db9bbbf50e"; + sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d16c7873af0ffc0b370332ce1d562755"; + sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea26ad6eef4b71fff944008f542eed5d"; + sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "93dbb1e6d32178cc1a2e994b6d87d8d3"; + sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - md5 = "e817d11de4660b9fd4a66db90cdc2588"; + sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - md5 = "7055ec097c7ed9cc6497f111311b4f75"; + sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - md5 = "2b3f144fdbd30408c25379a7409ba045"; + sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_amd64"; - md5 = "201844de38f2d957a5ced6a28d2c80cb"; + sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - md5 = "b6dcf651f5b9dda20fd39912bf03a4c3"; + sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - md5 = "a80bcd458215e445daddf4cf0d625758"; + sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - md5 = "de249fadd51c61b98bada7eb7cff8d29"; + sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - md5 = "f25d86e540477fe044c0294670b5f1b5"; + sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - md5 = "44dc2b8d96d4d3db048e358174500584"; + sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - md5 = "cca32ece7e930886fc2667e6f4849af5"; + sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_amd64"; - md5 = "8f6657584a244c039bcfa24ad8934e75"; + sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_amd64"; - md5 = "807b3e86250c3640175da4980db87ab5"; + sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - md5 = "bde5d98946e1bfd60a42482339e29787"; + sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - md5 = "6781fa18b873dc95da21e82cc61609d6"; + sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_amd64"; - md5 = "3d034c5c118d8794e2b76207c52a198e"; + sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e4d13d933531f436c56e3245c94be638"; + sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - md5 = "75a55367e5185eac420f89807e39faa2"; + sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e8e91fa6a42cfce330883dc1286f3d78"; + sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "d9d307b821b71b3cdd91cb8d2137c527"; + sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - md5 = "44a2bda05acf6d10aaad2216a69507db"; + sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - md5 = "3370614dc8c2667679aefb4c1e4c07af"; + sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } @@ -1753,1747 +1753,1747 @@ i386 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - md5 = "2ec67bae5e0c088d1ac13ba4eee194bf"; + sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - md5 = "8fc95adac306cc313523179824b43835"; + sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - md5 = "499ec92726b0ce7115697d2553d0176d"; + sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - md5 = "2c7feb2392d943f07c985d8cf83ed067"; + sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - md5 = "73bc5a4840f1ab72d715964721e97f75"; + sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "cf294afff2a4d5893e48beb4d308f7b8"; + sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - md5 = "b335451ab178fabccf1ea5d3fc3bf17e"; + sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - md5 = "e1998f1e6dfd34d993ae2cb1a2621c05"; + sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "49228f60eedb525d344a8f756ac18df0"; + sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - md5 = "b9712e5765c6dc66683e4c7f62090a71"; + sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - md5 = "eee45bd08e763a5e702707a87b2ee127"; + sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_i386"; - md5 = "59ed0cdc4eb0cae2355c368dbdd5103b"; + sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - md5 = "7fbe2a86e8e8a547626b9dc42edd6c83"; + sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - md5 = "cd9827abda30e1bf97c78a7d3dffc150"; + sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "b62360b70b965c13c86536fbcd5c3dd2"; + sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "ef91c00328996a43243b7de90f60d145"; + sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "4787c81afc9a17c9b9f7700249d42e9d"; + sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "396ec91c52c5f3bd22d53c6f9ec58836"; + sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "a0b3c36045eaa4b93ec0c8db5999e95c"; + sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "21589331257b33edf01f06f2cea89494"; + sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_i386"; - md5 = "6af7e943feae8691d7331c8e616ea402"; + sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - md5 = "33c0e1be296288e7681d88d5775cd3c1"; + sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "53b3f4d615e0571aefec5ba4990c246d"; + sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "af77180b67e083ca1c7c16f125d773d8"; + sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "ffca46ec6dc8f075f3bd224ae0e4e535"; + sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_i386"; - md5 = "21af02a5fe56b6ec332eb0c6f1e1d187"; + sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "5d8b9bd239ea094bc25041c7437a60d7"; + sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - md5 = "a7450fa3b218cc993b252f7f51b4f83a"; + sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - md5 = "134c7e63ef61bb469ebc61c26309e42e"; + sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "b2dc62a422bf1ebc4014073664d38b3b"; + sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "f95df746d4c7319e4cb83f082d39ab38"; + sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - md5 = "36d5b7a27a90cc6069c14317c5b182e8"; + sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - md5 = "4082582c368e35112478847ca5afad30"; + sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "593ce60da5a985932e8a43802e662237"; + sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "1982414c7f72db3106ab8446596cdbb9"; + sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - md5 = "eb203ec5c79ed77e053efaa1bc8d65d4"; + sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - md5 = "44b8336cf9a2340a693528f2ebe19da2"; + sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_i386"; - md5 = "4a07d2ad9dc8e67ad6edaccad85170ae"; + sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_i386"; - md5 = "543202e74de54764bd9ca25548d4bd86"; + sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_i386"; - md5 = "8be404e25f342918fb99b40320f8bc4c"; + sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - md5 = "57d781f78fc1c75d947208e09a58a39b"; + sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - md5 = "2b1dd9e53e6a94443e9959de83d8621f"; + sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "61f4822f145d812c453b2fc5d71f5eae"; + sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - md5 = "1c0863073b6fdbdbe5ff911ed3cc781d"; + sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - md5 = "a77e997aabfde09c5cdf4b5f5d8e305f"; + sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - md5 = "9108b1542d78b682f141c3b488f33821"; + sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_i386"; - md5 = "cbd2c842295be412d25bf35ad4329c7a"; + sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_i386"; - md5 = "36344ae65699fdfac8d169c54f45dabf"; + sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - md5 = "2bb8b70952f8f6d724700e72db8bbef8"; + sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - md5 = "bbdb5055ac6164380a6c344bdca59a74"; + sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - md5 = "669fcbbac0ba7510cb5df1ed7a4b58a8"; + sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - md5 = "360d15ec7d327371bcb69a8b51b1e556"; + sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "d52479b3e735785256c8b6ba2a278ed3"; + sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - md5 = "8cda79074a80e9c079251962c86cc5cf"; + sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "bba863478cbafe60780618b9e2e3ba39"; + sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "1160d5fb86160631a7e699d66f1d6805"; + sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - md5 = "b3e0cb34c2b21fb68fe4fbde8ae640a7"; + sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - md5 = "633c94c28db5caa2001fce91ca6a726f"; + sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "a903c62e138ca58cc32aa7412ec4a3ec"; + sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - md5 = "a120c25c89a1136ef0daa25644387d26"; + sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "14714cd92839ae0a1716929840bd340f"; + sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "9be4a5f3f6735aa3b9153c8cb5ba4ff9"; + sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "363aac3460da3724144165325f29f52a"; + sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "5591041cf73d1593730ff40428b407dc"; + sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_i386"; - md5 = "ed56f05e4b1fcf06189374a60aa740eb"; + sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_i386"; - md5 = "79c6f01961c13e74d48978fe94aecce3"; + sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - md5 = "a365d22a80311e9875bde88c9b7b5146"; + sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - md5 = "c0e59176b50a2da0ec61d48902014ce5"; + sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - md5 = "83c82f7924110b659b8786b54ca6fb27"; + sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - md5 = "5084441d1da0b2d77de32cfadc21ee5f"; + sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - md5 = "358ed87729682d1d5a44b04a99f9cca8"; + sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "09e0b933d71e0b842906f22334845104"; + sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_i386"; - md5 = "77b6a1fdfe5d2976650e882df68f1bb7"; + sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "94eb595546d5b421504c6df661d29975"; + sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "4efd6dd3da5e989b7aaf990cb5dae9a4"; + sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "ce8372e9411aa5d734ef44773820cd3b"; + sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - md5 = "aea8d6beda7f992becfdbb3880b5b3c6"; + sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - md5 = "770471a9c33a9b708427dfa5d8b944b4"; + sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - md5 = "ab9d4dabd065bcc31430d839a04a5844"; + sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_i386"; - md5 = "fb5286eb01a90318bb95bdd671c6c512"; + sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_i386"; - md5 = "f3343e67c571b9f279ca0f9ce27f8981"; + sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_i386"; - md5 = "aa693feffb52a101beda0d578de71db3"; + sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "361fba889b4a4fb66c7fc59f7e837f6e"; + sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "39d620f28e9ecee9dc25e7ac4e679a81"; + sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_i386"; - md5 = "a4207e3d76879a94430cb641fe2001be"; + sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - md5 = "6d15e2401761ea09428c7170381a3ff3"; + sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - md5 = "bc611346e46985b47d0cf7fe0464e4af"; + sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - md5 = "bc3afb09d1ea93764c808c7a268c1cd2"; + sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - md5 = "2548d953611d999a85463581df4efac5"; + sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - md5 = "d2cd63e1f984b45561128d7d4d67bd06"; + sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - md5 = "e5dacb77c07e97db660bc5312387a9d6"; + sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - md5 = "dbc50fdd82e6df45bb9bb8ce18f1fe2c"; + sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - md5 = "cdf2a41b3ba93c2061f196920420b99d"; + sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_i386"; - md5 = "d4134108e9b21b6e623eafeaaa84e37f"; + sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_i386"; - md5 = "e1bd40c3840669cbfb0b12e6dd07629d"; + sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - md5 = "630fa4416398e12dfae1816acdac1d89"; + sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - md5 = "978502e6116df1c98dd985dd07bc1022"; + sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - md5 = "4591d057af7dc6709d1960c5ce590560"; + sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "cc8d8e5b7a4e002de9e86633b2c53804"; + sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - md5 = "3ccb52ce883b4c1885857c80cbd11e56"; + sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_i386"; - md5 = "e218128429da602e392c047940b62a23"; + sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - md5 = "963632ad4d1477ef230dc4c68dc7ffa2"; + sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - md5 = "1adfd99b505fe3ff6fd08a2919277780"; + sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - md5 = "8687aaa0fb6981d674ade4062884ff52"; + sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - md5 = "887ac0bbaa344b203d9effdd32dd072a"; + sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - md5 = "7b4319a41a9dcb24aab37be255579ce7"; + sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - md5 = "e56c66c0719d067589f7f13e01815274"; + sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - md5 = "076b0df6aff11c3a828eb5978be1ff66"; + sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - md5 = "1883cd445c1e5d3ad12bbb7f8d1932cc"; + sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_i386"; - md5 = "f97097f7e4594a691f7e866e1f4bd6d4"; + sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_i386"; - md5 = "6b4c6e4c15de54d5222da1ccab849b69"; + sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - md5 = "f96dd8143f7f3bb2600d761f5fb6e854"; + sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_i386"; - md5 = "fcdebe0131ecd0b0777e52b06ad99055"; + sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_i386"; - md5 = "0a2518a2d66430e20d660883c71b84a2"; + sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "f34f05ac30f3c11bde9b20cdc219c676"; + sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "239a3b273c387ca41ecff1e371b90d41"; + sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - md5 = "6653a03901b263af6fce56e6c394e9b3"; + sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - md5 = "abed18b597fc44363a47caf1f4d760c4"; + sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "76c7adc814605b316426ef1d9ffab195"; + sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - md5 = "2a5142925aeb5054395edd56112e83a9"; + sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "facd5280993d266f3f1f1809138e6cd2"; + sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - md5 = "c24dd57cc16746dbead2fbfa571f978a"; + sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_i386"; - md5 = "99dd92dba5e3f93e0e349ee9f3ebe22a"; + sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_i386"; - md5 = "8d165fc985106bb4b3df301bda4a8c22"; + sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - md5 = "966fee9cbc71519350a2730e34a1d8e6"; + sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - md5 = "8374a1fc7909c42faa5ee585eb967b20"; + sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_i386"; - md5 = "9c5ab1104d91b8bd6cd2fd21c06eb9ee"; + sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_i386"; - md5 = "f2dfa9304cacc609abce0c85f984b48f"; + sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - md5 = "f4328e5fa069f3b43d301992719b2d8e"; + sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - md5 = "d5ef9ef9c92b5b7edfd2bac2853d00ad"; + sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "6ef48bb25671111d17d696ff4db2c684"; + sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "90e2e7271ca563cd66993ea4652018c3"; + sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "dfc1877ecc94d01b4cdae6b527bee3a9"; + sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - md5 = "61cd2560476f54dc11b3e859e104daec"; + sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - md5 = "03077bd7302ea56045c0548c6b2cb983"; + sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - md5 = "6efe364cedbc437ddb1446cb846ad532"; + sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - md5 = "7521e4dcb5378621ee56ea860f0f00ca"; + sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_i386"; - md5 = "97cc2ca1fd5a0e8134d33884fbd8decd"; + sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - md5 = "de2c787fcc443fb989b1862367a2e0c7"; + sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "6265aab9d541aea8aad3496ebcc5908e"; + sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_i386"; - md5 = "a0ac6fa38ef4664b1dc1e3255788852c"; + sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "cc208840d2883eec6f9770b623c24b9d"; + sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "2ef2ffe569708f8433cfb36e754526ec"; + sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_i386"; - md5 = "9274a9813575848a1646d67b44e10bac"; + sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - md5 = "70fa4b78b06a4d4b194cfb6baf1cdef1"; + sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - md5 = "a72a94bc35581c25ef827023f643489d"; + sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - md5 = "50f4656bbcb193c3a3047c45db06a4f7"; + sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - md5 = "f805af07ee88d28de1fd06209aa42fc8"; + sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - md5 = "85812dd4c61ff7d99060c495f4d17669"; + sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - md5 = "70e2618de627e6e8308e4afda77b0966"; + sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - md5 = "850f3cb9ed1d79a9bdec55960a74611c"; + sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - md5 = "e86ec58c992441124622921b38685d01"; + sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - md5 = "4acaa6b473aba1684731f529506e2ff8"; + sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - md5 = "1e28443a65256cd013b2dc0c937badcd"; + sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - md5 = "b6362e8ca7da70c873c08e9849ac79ca"; + sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - md5 = "1bd0d0e0f5134651c350ba4955463b02"; + sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - md5 = "8b51441ce72d20a788a8e12149ea2cf8"; + sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - md5 = "470deea0b247279c51c2c76265263980"; + sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - md5 = "abb2fe37023253653d404dd6116829a0"; + sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - md5 = "3bf95ebc0bd67e4200f754b7282c4608"; + sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - md5 = "e0a5eda95251b20499a85f4bcec888a5"; + sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - md5 = "1b227b824b6270407594b25b2dc12769"; + sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - md5 = "c0170a7d5ae40f1c0a4b4680991bc4ff"; + sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - md5 = "4de2e06a592ac634b109affebc31fb07"; + sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - md5 = "2e154033ce7657e58f3a8e18d35ff5e3"; + sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - md5 = "ca610d0695befd4442145e037f6a6f94"; + sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - md5 = "813f01d8e7012bd8f58df239c2df47b0"; + sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - md5 = "1ccea01cd8c2549e5cb5b13b90d986d6"; + sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - md5 = "4cbe887cb4ed19e79970ea076cc171c8"; + sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - md5 = "5fcdea3958e6f0d60b841ecec606c3c0"; + sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - md5 = "dce0aac7322e5d9e7d74ca464c5db1f5"; + sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - md5 = "97a5238d1048e8b005d535b14720039e"; + sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_i386"; - md5 = "3d1d3d865c89c97e5cf980df806966ec"; + sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_i386"; - md5 = "eeefcc12cc694b069acec7937e4a6650"; + sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - md5 = "7f18f7c6fb6bca8a033e243ca4222057"; + sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - md5 = "25d8be35a5e5a6bac479d4bdce8dceba"; + sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - md5 = "44bf95c720b8634f0ea8419fa939f71e"; + sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - md5 = "5f82357fd11b009d7fee5020e8ff2c8a"; + sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - md5 = "eb23a3d322ff57ff5cad1ae062201b89"; + sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - md5 = "426d497ed13c731342e5af754975e6ef"; + sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_i386"; - md5 = "8e7fae57eec7ef0eae90c7573bde46a9"; + sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_i386"; - md5 = "dc095202dcca66b471d2619af7164135"; + sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - md5 = "659bfe8b731e831f32b047e66643ae05"; + sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - md5 = "e5ea9172d234d61d6a31d86465428b05"; + sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_i386"; - md5 = "83aeab12e6c75d38be99d9df3ad1b632"; + sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "a15335885d70016c10c88b20e65ac677"; + sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - md5 = "60cf7b25685a4bce2bbf031778831468"; + sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "7b97be0b67b400eba70eec57f50a92ac"; + sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "65ed88dfc8eaa02cd5373308826f540b"; + sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - md5 = "58ba7752e14f61f59698ce4aba860cd8"; + sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - md5 = "c2c51ba06c022ea81a6af843f27b34b0"; + sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index 0292e725cea1..c225d6bf8adc 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -36,13 +36,13 @@ def parse_args(): def download_file(file_base, file_name, file_url): file_shortname = file_base + ".deb" - md5 = subprocess.check_output(["nix-prefetch-url", "--type", "md5", "--name", file_shortname, file_url]) + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--name", file_shortname, file_url]) out.write(" rec {\n") out.write(" name = \"%s\";\n" % file_name) - out.write(" md5 = \"%s\";\n" % md5.strip()) + out.write(" sha256 = \"%s\";\n" % sha256.strip()) out.write(" url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1)) out.write(" source = fetchurl {\n") - out.write(" inherit url md5;\n") + out.write(" inherit url sha256;\n") out.write(" name = \"%s\";\n" % file_shortname) out.write(" };\n") out.write(" }\n") diff --git a/pkgs/games/ut2004/default.nix b/pkgs/games/ut2004/default.nix new file mode 100644 index 000000000000..3f306ac6eb54 --- /dev/null +++ b/pkgs/games/ut2004/default.nix @@ -0,0 +1,9 @@ +{ callPackage }: + +{ + ut2004-demo = callPackage ./demo.nix { }; + + ut2004 = gamePacks: callPackage ./wrapper.nix { + inherit gamePacks; + }; +} diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix new file mode 100644 index 000000000000..f5fcdc088c8f --- /dev/null +++ b/pkgs/games/ut2004/demo.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl }: + +let + arch = + if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "i686-linux" then "x86" + else throw "Unsupported architecture"; + +in stdenv.mkDerivation rec { + name = "ut2004-demo-${version}"; + version = "3334"; + + src = fetchurl { + url = "http://treefort.icculus.org/ut2004/UT2004-LNX-Demo${version}.run.gz"; + sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7"; + }; + + buildCommand = '' + cat $src | gunzip > setup.run + chmod +x setup.run + ./setup.run --noexec --target . + mkdir $out + tar -xaf ut2004demo.tar.bz2 -C $out + tar -xaf linux-${arch}.tar.bz2 -C $out + + rm $out/System/libSDL-1.2.so.0 + rm $out/System/openal.so + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; + homepage = "http://www.unrealtournament2004.com"; + license = licenses.unfree; + maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix new file mode 100644 index 000000000000..31d0763be4d2 --- /dev/null +++ b/pkgs/games/ut2004/wrapper.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, runCommand, buildEnv, makeWrapper, makeDesktopItem, gamePacks, libstdcxx5, SDL, openal }: + +let + game = buildEnv { + name = "ut2004-game"; + paths = gamePacks; + ignoreCollisions = true; + pathsToLink = [ "/" "/System" ]; + postBuild = '' + ln -s ${lib.getLib SDL}/lib/libSDL-1.2.so.0 $out/System + ln -s ${lib.getLib openal}/lib/libopenal.so $out/System/openal.so + for i in $out/System/*-bin; do + path="$(readlink -f "$i")" + rm "$i" + cp "$path" "$i" + chmod +w "$i" + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "$out/System:${lib.makeLibraryPath [ libstdcxx5 ]}" \ + "$i" + done + ''; + }; + + desktop = makeDesktopItem { + name = "ut2004"; + desktopName = "Unreal Tournament 2004"; + comment = "A first-person shooter video game developed by Epic Games and Digital Extreme"; + genericName = "First-person shooter"; + categories = "Application;Game;"; + exec = "ut2004"; + }; + +in runCommand "ut2004" { + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + for i in ${game}/System/*-bin; do + name="$(basename "$i")" + makeWrapper $i $out/bin/''${name%-bin} \ + --run "cd ${game}/System" + done + + mkdir -p $out/share/applications + ln -s ${desktop}/share/applications/* $out/share/applications +'' diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh deleted file mode 100644 index ca6b4fe1092c..000000000000 --- a/pkgs/games/ut2004demo/builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -skip=7976 - -bunzip2 < $src | (dd bs=1 count=$skip of=/dev/null && dd bs=1M) | tar xvf - ut2004demo.tar - -mkdir $out - -(cd $out && tar xvf -) < ut2004demo.tar - - -# Patch the executable from ELF OS/ABI type `Linux' (3) to `SVR4' (0). -# This doesn't seem to matter to ld-linux.so.2 at all, except that it -# refuses to load `Linux' executables when invokes explicitly, that -# is, when we do `ld-linux.so.2 $out/System/ut2004-bin', which we need -# to override the hardcoded ELF interpreter with our own. - -# This is a horrible hack, of course. A better solution would be to -# patch Glibc so it accepts the `Linux' ELF type as well (why doesn't -# it?); or to use FreeBSD's `brandelf' program to set to ELF type -# (which is a bit cleaner than patching using `dd' :-) ). - -#(cd $out/System && (echo -en "\000" | dd bs=1 seek=7 of=ut2004-bin conv=notrunc)) - - -# Set the ELF interpreter to our own Glibc. -for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" -done diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix deleted file mode 100644 index 27b81edf630b..000000000000 --- a/pkgs/games/ut2004demo/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{stdenv, fetchurl, xorg, mesa}: - -assert stdenv.system == "i686-linux"; - -let { - - raw = stdenv.mkDerivation { - name = "ut2004-demo-3120"; - src = fetchurl { - urls = [ - ("http://store.node-10.ds-servers.com/file/BcFLgoIgAADQA7kw0qZctDAF+4cj" - + "mbnDMFOJTAyM0-cejkEIuDvQ6Uv9ZbvcWMnRmXXxhA0LyvzoKdvsnXne0D1DGTLiR0" - + "I1CmM2M-E5ryH-tD3yweCXyNyH1WGI3Wh09ja29mHtzGF1rxEyhRfQ7ggCKdfCrhvz" - + "H9oTJXSCAtGuSKdVDhe6tNtrqa151MIircZtRLPxQcGmJ+n3-iUeWYgHuqbmrK4ur7" - + "Qcy6QrAhYa+e5jcfYjgPF3VGsw4qx+0ilxJUCiuYCX2H8A6X3rxJILa26w3O425W2G" - + "kHPiQWrhFT8cIOyqSr8+dMO5Xi5-/ut2004-lnx-demo-3120.run.bz2") - http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2 - ]; - sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli"; - }; - builder = ./builder.sh; - }; - - body = stdenv.mkDerivation { - name = raw.name; - builder = ./make-wrapper.sh; - inherit raw mesa; - inherit (xorg) libX11 libXext; - }; - -} - -# http://mirror1.icculus.org/ut2004/ut2004-lnxpatch3204.tar.bz2 -# 5f659552095b878a029b917d216d9664 diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh deleted file mode 100644 index 53ef90a615b0..000000000000 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/bin - -cat > $out/bin/ut2004demo <<EOF -#! $SHELL -e - -cd $raw/System - -LD_LIBRARY_PATH=$libX11/lib:$libXext/lib\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH ./ut2004-bin "\$@" -EOF - -chmod +x $out/bin/ut2004demo diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 0d6c21bfa823..4fa7ec1b0451 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -8,7 +8,7 @@ , freetype , gdk_pixbuf , glib -, gtk +, gtk2 , libjpeg_turbo , mesa_glu , mesa_noglu @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gtk + gtk2 libjpeg_turbo mesa_glu mesa_noglu diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 1e95d63e5172..adde818efcef 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool , withDebug ? false }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cups automake autoconf glib libxml2 libusb + cups automake autoconf glib libxml2 libusb libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 298cba88a9f1..ae96a946e79d 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 74204cd4e547..6c671b56b7ad 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 0f85331bdd5b..43ace9ca977e 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }: +, gettext, gtk2, SDL, zlib, glib, openal, mesa, lua, freetype }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6"; }; - buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ]; + buildInputs = [ pkgconfig gettext gtk2 SDL zlib glib openal mesa lua freetype ]; phases = "unpackPhase buildPhase installPhase"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 217468c5bd2a..34507a252526 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ]; + buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b8acf36cfd05..8d3537b0ee6d 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , mesa, SDL , libao, openal, libpulseaudio -, gtk, gtksourceview +, gtk2, gtksourceview }: with stdenv.lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 990f1e7106e1..8f232a6023c7 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 07174d76e4e8..0e3c156c16ae 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}: +{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}: stdenv.mkDerivation { name = "mupen64plus-1.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; }; - buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ]; + buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 99de1ae0d177..c6f4df1e5c06 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ceafc714381c..ca1881bdd5fa 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}: +{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk alsaLib SDL ]; + buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index dd2c2380a8e0..6251282aae32 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11 -, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem +, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa - pkgconfig gtk SDL autoreconfHook ]; + pkgconfig gtk2 SDL autoreconfHook ]; configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; desktopItem = makeDesktopItem { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e35e319a57f0..66ea152b2744 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) - ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.gnome.glib ] + ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 92ed55be2de8..72fd3c82a510 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,57 +6,57 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.3"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0v3sq5zzj3z5pw1aicn7i03pgf41cr9fr0vg1sazwfxrmbvwvknp"; + version = "1.8.4"; + url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2"; + sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; }; gecko64 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.5.6"; - url = "mirror://sourceforge/wine/wine-mono-${version}.msi"; - sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; + version = "4.6.3"; + url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; + sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq"; }; }; unstable = fetchurl rec { - version = "1.9.16"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871"; + version = "1.9.18"; + url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; + sha256 = "1n38697v707j489ljd6b2k1yvrarflc0yn847jas1ida1nm4nq96"; inherit (stable) mono; gecko32 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; - sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp"; + sha256 = "0fk4fwb4ym8xn0i5jv5r5y198jbpka24xmxgr8hjv5b3blgkd2iv"; }; gecko64 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; - sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2"; + sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5"; }; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl"; + sha256 = "0gpxzv85x181dz3arp8xmjz2y0gchna54wjv2a1jg3mqaf3bp4dj"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20160622"; - sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q"; + version = "20160724"; + sha256 = "0nl8gnmsqwwrc8773q8py64kv3r5836xjxsnxjv91n4hhmvgyrzs"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 3540119e6656..4217f1d0b1e9 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam + [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 025ef0913bea..b7ff36c0917c 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { version = "2016-06-06"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - configureFlags = "--with-gnome=${gnome3.version}"; + configureFlags = "--with-gnome=${gnome3.version} "; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 05fc2ab61035..6adedcb0d8d0 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, sass, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "Greybird"; - version = "2016-08-16"; name = "${pname}-${version}"; + pname = "Greybird"; + version = "2016-09-13"; src = fetchFromGitHub { repo = "${pname}"; owner = "shimmerproject"; - rev = "fcaa400df68b1a29bb9dc8eb9c772a241f17c9ea"; - sha256 = "02f2zlkhi2als39ajq3v91iik708g5a9iyl3cvd65n80gr4jifmr"; + rev = "1942afc8732f904a1139fd41d7afd74263b87887"; + sha256 = "0qawc7rx5s3mnk5awvlbp6k5m9aj5krb1lasmgl2cb9fk09khf2v"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)"; - homepage = http://shimmerproject.org/our-projects/greybird/; + homepage = https://github.com/shimmerproject/Greybird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 100b280ef576..ad13b5f17ab6 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; }; - buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf + buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.pixman ]; diff --git a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix index 905e26998a07..bea08bcdf141 100644 --- a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.0.7"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f71a2e21a4d6..084925ef5910 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost -{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip -, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip -, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf +{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip +, which, fetchgit, llvmPackages +, xkb_switch, rustracerd, fzf , Cocoa ? null }: @@ -80,7 +80,9 @@ rec { neosnippet = neosnippet-vim; nerdcommenter = The_NERD_Commenter; nerdtree = The_NERD_tree; + polyglot = vim-polyglot; quickrun = vim-quickrun; + repeat = vim-repeat; signature = vim-signature; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 @@ -92,6 +94,7 @@ rec { tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; + unite = unite-vim; vimproc = vimproc-vim; vimshell = vimshell-vim; watchdogs = vim-watchdogs; @@ -101,7 +104,7 @@ rec { fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; - src = "${fzf}/share/go/src/github.com/junegunn/fzf"; + src = fzf.src; dependencies = []; }; @@ -497,6 +500,17 @@ rec { }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "acp-2013-02-05"; + src = fetchgit { + url = "git://github.com/eikenb/acp"; + rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; + sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; + }; + dependencies = []; + + }; + elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "elm-vim-2016-07-25"; src = fetchgit { @@ -838,6 +852,17 @@ rec { }; + rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow-2016-08-08"; + src = fetchgit { + url = "git://github.com/luochen1990/rainbow"; + rev = "eeb35ccece20f2648b44580c484c6e57eec3c92b"; + sha256 = "0s1ygjm5czzj1idrw4f13gg60zljznb6bs7fps4i3wl2mbmw5641"; + }; + dependencies = []; + + }; + vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-xkbswitch-2016-01-31"; src = fetchgit { @@ -1146,6 +1171,17 @@ rec { }; + vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-repeat-2015-05-09"; + src = fetchgit { + url = "git://github.com/tpope/vim-repeat"; + rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415"; + sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6cef8885ce0b..71c65f74a9c5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -33,6 +33,7 @@ "github:ctrlpvim/ctrlp.vim" "github:digitaltoad/vim-jade" "github:eagletmt/neco-ghc" +"github:eikenb/acp" "github:elmcast/elm-vim" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" @@ -64,6 +65,7 @@ "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lokaltog/vim-easymotion" +"github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:mhinz/vim-startify" "github:mkasa/lushtags" @@ -91,6 +93,7 @@ "github:thinca/vim-quickrun" "github:tomasr/molokai" "github:tpope/vim-eunuch" +"github:tpope/vim-repeat" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index f03525304804..51a60a27431b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, gtk, gtk3, fltk13 }: +{ stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +# Comes from upstream as as bundle of several tools, +# some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { name = "alsa-tools-${version}"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ldbaz3qr7z0639xg37ba7cmrb512rrjavap6r5jjl0ab665ad3x"; }; - buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; + buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 902f0e37e35f..3bfd59de7ed6 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -73,8 +73,11 @@ stdenv.mkDerivation rec { ./patches/15.9-kcl_str.patch ./patches/15.9-mtrr.patch ./patches/15.9-preempt.patch - ./patches/15.9-sep_printf.patch - ]; + ./patches/15.9-sep_printf.patch ] + ++ optionals ( kernel != null && + (builtins.compareVersions kernel.version "4.6") >= 0 ) + [ ./patches/kernel-4.6-get_user_pages.patch + ./patches/kernel-4.6-page_cache_release-put_page.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch new file mode 100644 index 000000000000..1e7209ed5ed1 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch @@ -0,0 +1,25 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 9c70211..b2242af 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3220,7 +3220,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +@@ -3238,7 +3238,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +-- +2.9.2 + diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch new file mode 100644 index 000000000000..28820790e492 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch @@ -0,0 +1,16 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index b2242af..586129c 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3249,7 +3249,7 @@ void ATI_API_CALL KCL_UnlockUserPages(unsigned long* page_list, unsigned int pag + unsigned int i; + for (i=0; i<page_cnt; i++) + { +- page_cache_release((struct page*)page_list[i]); ++ put_page((struct page*)page_list[i]); + } + } + +-- +2.9.2 + diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 22b6f5d6354c..de318a9474a0 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ dbus pygobject pygobject3 recursivePthLoader ]; + [ dbus pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix index 829b383e072d..8cd5e064e1ea 100644 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ dbus pygobject pygobject3 recursivePthLoader ]; + [ dbus pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix new file mode 100644 index 000000000000..87cf7c18caf6 --- /dev/null +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }: + +let + arch = + if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" + else throw "Unsupported architecture"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ]; + +in stdenv.mkDerivation rec { + name = "displaylink-${version}"; + version = "1.1.62"; + + src = fetchFromGitHub { + owner = "DisplayLink"; + repo = "evdi"; + rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a"; + sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9"; + }; + + daemon = fetchurl { + name = "displaylink.zip"; + url = "http://www.displaylink.com/downloads/file?id=607"; + sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + buildInputs = [ kernel libdrm ]; + + buildCommand = '' + unpackPhase + cd $sourceRoot + unzip $daemon + chmod +x displaylink-driver-${version}.run + ./displaylink-driver-${version}.run --target daemon --noexec + + ( cd module + export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + export hardeningDisable="pic format" + buildPhase + install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko + ) + + ( cd library + buildPhase + install -Dm755 libevdi.so $out/lib/libevdi.so + ) + + fixupPhase + + ( cd daemon + install -Dt $out/lib/displaylink *.spkg + install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath $out/lib:${libPath} \ + $out/bin/DisplayLinkManager + wrapProgram $out/bin/DisplayLinkManager \ + --run "cd $out/lib/displaylink" + ) + ''; + + meta = with stdenv.lib; { + description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; + platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.unfree; + homepage = "http://www.displaylink.com/"; + }; +} diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 8d2f368bc99a..d3db8ca7d431 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + broken = kernel.features.chromiumos or false; }; } diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f60951f5541e..5cc875f5c90a 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "fanctl-${version}"; - version = "0.9.0"; + version = "0.12.0"; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz"; - sha256 = "03dv5zzb8fkl9kkbhznxm48d6j3fjms74fn0s1zip2gz53l1s14n"; + sha256 = "0lj7371n06sg5mlbbfgvm0qhzgp464n6v55rgs7kmmx4d37gb5fl"; }; # The Ubuntu package creates a number of state/config directories upon diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index ce2f860efc88..30fdbadd87b1 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.42-rc1"; + version="0.9.42"; name="${baseName}-${version}"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42~rc1.tar.bz2"; - sha256="11br6xp86bxs1ic2x683hbvg1hk8v2wp8cw6blj0zz3cdl0pcjqf"; + hash="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42.tar.xz"; + sha256="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix new file mode 100644 index 000000000000..673ef686e488 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, linuxPackages }: + +with lib; + +stdenv.mkDerivation rec { + name = "rtlwifi_new-firmware-${linuxPackages.rtlwifi_new.version}"; + inherit (linuxPackages.rtlwifi_new) src; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out/lib/firmware" + cp -rf firmware/rtlwifi/ "$out/lib/firmware" + ''; + + meta = { + description = "Firmware for the newest Realtek rtlwifi codes"; + inherit (src.meta) homepage; + license = licenses.unfreeRedistributableFirmware; + platforms = with platforms; linux; + maintainers = with maintainers; [ tvorog ]; + }; +} diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index d86eb2a9756a..46f242b2ea0c 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, utillinux }: +{ stdenv, fetchFromGitHub, utillinux + ,autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { - name = "fuse-2.9.5"; + name = "fuse-${version}"; + + version = "2.9.7"; #builder = ./builder.sh; - src = fetchurl { - url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz"; - sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp"; + src = fetchFromGitHub { + owner = "libfuse"; + repo = "libfuse"; + rev = name; + sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; }; - buildInputs = [ utillinux ]; + buildInputs = [ utillinux autoconf automake libtool gettext ]; inherit utillinux; @@ -26,12 +31,15 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c + sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh + + ./makeconf.sh ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://fuse.sourceforge.net/; + homepage = https://github.com/libfuse/libfuse; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 54e6b7822f9a..107c87434de4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -270,6 +270,13 @@ with stdenv.lib; SQUASHFS_LZ4 y ''} + # Native Language Support modules, needed by some filesystems + NLS y + NLS_DEFAULT utf8 + NLS_UTF8 m + NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option + NLS_ISO8859_1 m # VFAT default for the iocharset= mount option + # Runtime security tests DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index e5fa780c6e7b..5574cc937af7 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -91,17 +91,17 @@ sub runConfig { print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; } - + # Some questions lack the option name ("bla bla [Y/n/m/...] "). elsif ($line =~ /(.*) \[(.*)\] ###$/) { print OUT "\n"; } - + else { warn "don't know how to answer this question: $line\n"; print OUT "\n"; } - + $line = ""; %choices = (); } @@ -124,7 +124,10 @@ my %config; open CONFIG, "<.config" or die; while (<CONFIG>) { chomp; - if (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { + if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) { + # String options have double quotes, e.g. 'CONFIG_NLS_DEFAULT="utf8"' and allow escaping. + ($config{$1} = $2) =~ s/\\([\\"])/$1/g; + } elsif (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { $config{$1} = $2; } elsif (/^# CONFIG_([A-Za-z0-9_]+) is not set$/) { $config{$1} = "n"; @@ -136,6 +139,6 @@ foreach my $name (sort (keys %answers)) { my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; - &$f("option not set correctly: $name\n") + &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") if $config{$name} && $config{$name} ne $answers{$name}; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix deleted file mode 100644 index fdc5cc802a1a..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.14.77"; - extraMeta.branch = "3.14"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1v3cc3ddla2b8gkwbms4x3lbjygw87r13150nikf1gc0hf64rqp0"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index ff47e1758c74..54b4469a6080 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.3"; + version = "4.7.4"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "1zc9lwa9anyn0civwzkymaxgx7v4vwgc6aqsg390qslbazkggaa6"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index ff47e1758c74..54b4469a6080 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.7.3"; + version = "4.7.4"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "1zc9lwa9anyn0civwzkymaxgx7v4vwgc6aqsg390qslbazkggaa6"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index b39514d45dd9..52a52562d602 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -29,12 +29,12 @@ import ./generic.nix (args // rec { # ... but use none by default. # The default is safer if source policy routing is not setup. DEFAULT_DUMMY y - DEFAULT_MPTCP_PM "default" + DEFAULT_MPTCP_PM default # MPTCP scheduler selection. # Disabled as the only non-default is the useless round-robin. MPTCP_SCHED_ADVANCED n - DEFAULT_MPTCP_SCHED "default" + DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers TCP_CONG_LIA m diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7b4284028ed8..6b13b45d1ada 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.8-rc4"; - modDirVersion = "4.8.0-rc4"; + version = "4.8-rc6"; + modDirVersion = "4.8.0-rc6"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0is4pzmci1i59fxw9b645c8710zjnx19dfl20m4k06kxdbbs01wg"; + sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 53e7196c5c37..a8197fd49189 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -95,14 +95,10 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_3_14 = throw "grsecurity stable is no longer supported"; - - grsecurity_4_4 = throw "grsecurity stable is no longer supported"; - grsecurity_testing = grsecPatch - { kver = "4.7.3"; - grrev = "201609072139"; - sha256 = "0c70nfsa1bk07z6sivy645d9w0qkq23pwpwdm28160kfy7dampyh"; + { kver = "4.7.4"; + grrev = "201609211951"; + sha256 = "0h5lxl04rvww02ww0y21id6dc8mhglls8dqhjdcxdcpahxq1fb6y"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4b1120afa4e7..69a951875a53 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,11 +1,11 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , libiberty -, zlib, withGtk ? false, gtk ? null }: +, zlib, withGtk ? false, gtk2 ? null }: with lib; -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison libiberty ]; buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ - stdenv.lib.optional withGtk gtk; + stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 163ac1890505..8c2badc3d686 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk }: +{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk ]; + buildInputs = [ ncurses glib pkgconfig gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 10551c080770..083362489add 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bjornfor ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (kernel.features.grsecurity or false); + (kernel.features.grsecurity or false) || + (kernel.features.chromiumos or false); }; } diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2a0e53b39257..350915c55b51 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -6,13 +6,14 @@ let pkgName = "mba6x_bl"; in stdenv.mkDerivation rec { - name = "${pkgName}-2016-02-12"; + name = "${pkgName}-${version}"; + version = "2016-04-22"; src = fetchFromGitHub { owner = "patjak"; repo = pkgName; - rev = "9c2de8a24e7d4e8506170a19d32d6f11f380a142"; - sha256 = "1zaypai8lznqcaszb6an643amsvr5qjnqj6aq6jkr0qk37x0fjff"; + rev = "d05c125efe182376ddab30d486994ec00e144650"; + sha256 = "15h90z3ijq4lv37nmx70xqggcvn21vr7mki2psk1jyj88in3j3xn"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f561c0addc87..e7297b0efe20 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences +, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -52,7 +52,7 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf cairo ] ); + [ gtk2 atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 27c963f4bd9c..d1f6d36a6a7e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}: let @@ -36,7 +36,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 65cf42333e05..63da39e0c231 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -41,7 +41,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index 0682954d558f..e34aaf3c908e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -52,7 +52,7 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix new file mode 100644 index 000000000000..94fc9ca05e78 --- /dev/null +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "nvme-cli-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "linux-nvme"; + repo = "nvme-cli"; + rev = "v${version}"; + sha256 = "16n0gg1zx4fgadcq94kx6bgysqw60jvybjwynk7mj3fzdbvzrqyh"; + }; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "NVM-Express user space tooling for Linux"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ tavyc ]; + }; +} diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index b591c3b002c6..3ce9617ec5b1 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpdk, libpcap, utillinux , pkgconfig -, gtk, withGtk ? false +, gtk2, withGtk ? false }: stdenv.mkDerivation rec { @@ -16,14 +16,12 @@ stdenv.mkDerivation rec { buildInputs = [ dpdk libpcap ] - ++ stdenv.lib.optionals withGtk [gtk]; + ++ stdenv.lib.optionals withGtk [gtk2]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; GUI = stdenv.lib.optionalString withGtk "true"; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-march=core2" ]; postPatch = '' diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 6318654742ee..1cdf9044b8ff 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -7,7 +7,7 @@ , alsaLib , audiofile , pkgconfig -, gtk +, gtk2 , gettext , libXpm }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { audiofile dbus_glib pkgconfig - gtk + gtk2 gettext libXpm ]; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix new file mode 100644 index 000000000000..0c7cb24e4655 --- /dev/null +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +with lib; + +let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; + +in stdenv.mkDerivation rec { + name = "rtlwifi_new-${version}"; + version = "2016-09-12"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtlwifi_new"; + rev = "7a1b37d2121e8ab1457f002b2729fc23e6ff3e10"; + sha256 = "0z8grf0fak2ryxwzapp9di77c4bghzkv8lffv76idkcnxgq6sclv"; + }; + + hardeningDisable = [ "pic" "format" ]; + + makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + ''; + + meta = { + description = "The newest Realtek rtlwifi codes"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ tvorog ]; + priority = -1; + }; +} diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix new file mode 100644 index 000000000000..593c4400b7f4 --- /dev/null +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -0,0 +1,23 @@ +{ stdenv, virtualbox, kernel, strace }: + +stdenv.mkDerivation { + name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; + src = virtualbox.modsrc; + hardeningDisable = [ + "fortify" "pic" "stackprotector" + ]; + + makeFlags = [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; + + enableParallelBuilding = true; + + meta = virtualbox.meta // { + description = virtualbox.meta.description + " (kernel modules)"; + }; +} diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 51b4694b6305..bf0b40e1d7ba 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "v0.9.1"; + version = "0.9.2"; goPackagePath = "github.com/mholt/caddy"; @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mholt"; repo = "caddy"; - rev = version; - sha256 = "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp"; + rev = "v${version}"; + sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; }; buildFlagsArray = '' @@ -20,5 +20,12 @@ buildGoPackage rec { -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://caddyserver.com; + description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + license = licenses.asl20; + maintainers = [ maintainers.rushmorem ]; + }; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json deleted file mode 100644 index 6a6638b44b4e..000000000000 --- a/pkgs/servers/caddy/deps.json +++ /dev/null @@ -1,182 +0,0 @@ -[ - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "99064174e013895bbd9b025c31100bd1d9b590ca", - "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/flynn/go-shlex", - "fetch": { - "type": "git", - "url": "https://github.com/flynn/go-shlex", - "rev": "3f9db97f856818214da2e1057f8ad84803971cff", - "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0", - "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "315de0c1920b18b942603ffdc2229e2af4803c17", - "sha256": "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6" - } - }, - { - "goPackagePath": "github.com/jimstudt/http-authentication", - "fetch": { - "type": "git", - "url": "https://github.com/jimstudt/http-authentication", - "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", - "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/aes12", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/aes12", - "rev": "5a3c52721c1e81aa8162601ac2342486525156d5", - "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/fnv128a", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/fnv128a", - "rev": "393af48d391698c6ae4219566bfbdfef67269997", - "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go", - "rev": "c2af049b8af811a546bfa6b11f362c9c1e706343", - "sha256": "178w1qzpkyrkcnix093lj6dhgg5nylxg0aqmiff6f9ww2xknlw47" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go-certificates", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go-certificates", - "rev": "4904164a1a6479e3b509f616ccd31a7b0e705d52", - "sha256": "1kpl8j4lqwq1xqkyikbczq8dwrybbgz4m9ny21a88v0da6r2bcfk" - } - }, - { - "goPackagePath": "github.com/mholt/caddy", - "fetch": { - "type": "git", - "url": "https://github.com/mholt/caddy", - "rev": "c5aa5843d92a27eaf521e28684111030135d9cdc", - "sha256": "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e", - "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8", - "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/xenolf/lego", - "fetch": { - "type": "git", - "url": "https://github.com/xenolf/lego", - "rev": "823436d61175269716a88cd6627bfa603812f10c", - "sha256": "1j6nkw00d09ys0p4i7k4xad1fxczg3klvnw4x48wr1zaygnpaw7q" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "b3cc7317554b3e708b116d997899e612bab100d6", - "sha256": "1mcrgsvqmghhvf9z99prm15flx9l3irpm20z2zmdmhsprhc0nr5v" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/natefinch/lumberjack.v2", - "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", - "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" - } - }, - { - "goPackagePath": "gopkg.in/square/go-jose.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/square/go-jose.v1", - "rev": "a3927f83df1b1516f9e9dec71839c93e6bcf1db0", - "sha256": "0zbsy6hbv3p0ahcf4hviyv1vnpdywyf1hdspz8l6vj897myd019f" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e", - "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix new file mode 100644 index 000000000000..d7c974ecb162 --- /dev/null +++ b/pkgs/servers/caddy/deps.nix @@ -0,0 +1,201 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "2d1e4548da234d9cb742cc3628556fef86aafbac"; + sha256 = "0n7af8pjjmg5rhb3104lyvn966l1p4dfblmy3g9b0plsmnzrz6g5"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; + sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/jimstudt/http-authentication"; + fetch = { + type = "git"; + url = "https://github.com/jimstudt/http-authentication"; + rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; + sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/aes12"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/aes12"; + rev = "8ee5b5610baca43b60ecfad586b3c40d92a96e0c"; + sha256 = "1lnzrr7f6cyb10gqji6433fvwi8zid0k019m694xyppv4pzgrc93"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/fnv128a"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/fnv128a"; + rev = "393af48d391698c6ae4219566bfbdfef67269997"; + sha256 = "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go"; + rev = "8f7a96dfafd8b03eae5679702a837ed5bdf91327"; + sha256 = "12qc7y8v3g16q3klh852f3v4yvbcp6h8am1q98ds2c1zay9jl50n"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go-certificates"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go-certificates"; + rev = "d2f86524cced5186554df90d92529757d22c1cb6"; + sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "73916ccc3069de4720a77b6b817b0bb77bda6b44"; + sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; + sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/naoina/toml"; + fetch = { + type = "git"; + url = "https://github.com/naoina/toml"; + rev = "751171607256bb66e64c9f0220c00662420c38e9"; + sha256 = "07ivrcdd62y7jj5isrz7jhkqqc29s0wsn005mn0yxain51f8h7ly"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "35eb537633d9950afc8ae7bdf0edb6134584e9fc"; + sha256 = "1hwi1nq5kkpcci7lf4fwhs8jj0mf6xcbdz1vgijpfyyd0zr6mphc"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + }; + } + { + goPackagePath = "github.com/xenolf/lego"; + fetch = { + type = "git"; + url = "https://github.com/xenolf/lego"; + rev = "82ac43327b01319544c050d5d78a4edeff9565d2"; + sha256 = "0zs1l4dm0srkx78a7rqq1g8g4yn84c07177zbaa286jqpzgijahi"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "6ab629be5e31660579425a738ba8870beb5b7404"; + sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; + sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; + sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v1"; + rev = "139276ceb5afbf13e636c44e9382f0ca75c12ba3"; + sha256 = "1f46qka0xzzkbsg01r9c9fi9zlzai7h83mp9hlwg9m5s73h8gzwj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; + sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + }; + } +] diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6ae8e410bf21..311d707e9c59 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl -, ncurses, mysql, gtk, lua, hwloc, numactl +, ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl + curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; configureFlags = [ "--with-munge=${munge}" "--with-ssl=${openssl.dev}" "--sysconfdir=/etc/slurm" - ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; + ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 5254aa8e94b4..f0501fa57d63 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.6.4"; + version = "0.7.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a"; + sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7"; }; # Keep consul.ui for backward compatability diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix new file mode 100644 index 000000000000..1955cce2a9f8 --- /dev/null +++ b/pkgs/servers/dns/coredns/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "coredns-${version}"; + version = "001"; + + goPackagePath = "github.com/miekg/coredns"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "miekg"; + repo = "coredns"; + rev = "v${version}"; + sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; + }; + + patches = [ ./pull-278.patch ]; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://coredns.io; + description = "A DNS server that runs middleware"; + license = licenses.asl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix new file mode 100644 index 000000000000..2aa442a8fef4 --- /dev/null +++ b/pkgs/servers/dns/coredns/deps.nix @@ -0,0 +1,453 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "0a9baebe991e5ff35dd9f35578eb002cf07d229c"; + sha256 = "18palgdg1ldfmjqm4almlcymx9f0kf6vy9lfspl0iwkv3wsnvfb6"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "60ec3488bfea7cca02b021d106d9911120d25fe9"; + sha256 = "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"; + }; + } + { + goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry-incubator/candiedyaml"; + rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; + sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "c016325647ff1837d8e9695bc79837ff7549d31f"; + sha256 = "0jm0kas8c2zhkaqibvzbx7bqfg67b9yb9cs0q8g9r0b9rxjr5prk"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-oidc"; + rev = "fe7346e2e6855bda769d5b3db7d917f159c5613c"; + sha256 = "141h47s2z56pff8fi926m7wzswkr34kj7hzwib8w5s8zxgdp0wld"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; + sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "431cfa3179d9b3766e39f6a74283db8bb5a13209"; + sha256 = "0hwqlqns0igaa3hg1dvz2grgy46q0v8wixyzfsmxsr5xb4ggpf32"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "c795848f1d7f574bbf767a8f17c7357e4003fed6"; + sha256 = "0abnk4055kcz57v3f5d15pd5dvvlkg7bwfy1f22rmsqwzs44ixmz"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "f12c6236fe7b5cf6bcf30e5935d08cb079d78334"; + sha256 = "1h5s03y6b17qj12p8fpm5pdijnsbfvaq38z7b2hfjn5qp45h02xb"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "aa0c862057666179de291b67d9f093d12b5a8473"; + sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "2433d2f0fc794728337e0c5d65716e79e163f04d"; + sha256 = "14kdzfzjs06c2050fsg9vc0mn12b6i72gj45964mzxa5a6i09ph6"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "0e04f5e499b19bf51031c01a00f098f25067d8dc"; + sha256 = "0kbqrfargkx3yb6gj0k5rpi728pcgjyvy1as9x79sh3sgvnrq15f"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "a31fa025390fe54d2af14a04199ed08dea5dc2fd"; + sha256 = "141059khzlkfjx5qsgzryqhl1mgilb13ha7syjm1297m54ch749c"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1f49d83d9aa00e6ce4fc8258c71cc7786aec968a"; + sha256 = "0ny3nvjrsczihzmng2s0awvhq8k389l4lzl3vwgifi6ng34fszbj"; + }; + } + { + goPackagePath = "github.com/google/cadvisor"; + fetch = { + type = "git"; + url = "https://github.com/google/cadvisor"; + rev = "418c181ebad0d592828bd53c5704ed9af9a7c5a6"; + sha256 = "1k3r7a333a6x53fs0anvraf8n93dyanjfwp396sng1zxchb07dk3"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "fd52762d25a41827db7ef64c43756fd4b9f7e382"; + sha256 = "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; + sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "26c6e1184fd5255fa5f5289d0b789a4819c203a4"; + sha256 = "00fd4pa2dq8fala5sc6ics2721hnkh69p7d35w5lb2zf1i41l6dq"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "50d4dbd4eb0e84778abe37cefef140271d96fade"; + sha256 = "06z52vri1ymb0s8nk2qr4xmw068s4abh6b66qj4w92whjxmxsvnh"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "bcac9884e7502bb2b474c0339d889cb981a2f27f"; + sha256 = "1a732411y26arr0pq9j5rfkyql7rqxbkanjs4m59hil8cx8mb068"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "77ed1c8a01217656d2080ad51981f6e99adaa177"; + sha256 = "1r7xdl3bpdzny4d05fpm229864ipghqwv5lplv5im5b4vhv9ryp7"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "e978125a7e335d8f4db746a9ac5b44643f27416b"; + sha256 = "1if7bzxs9ibq1a1d8z96djixqrxnwc2wplcbc67ddk071anrbs8w"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "bbf954cbf2801bc32f4378fe5059eb16de3ae4d3"; + sha256 = "1i5p9xz3lhir5k070a580mi77n4vbjlbglzi92qbn0mxrdvd13lr"; + }; + } + { + goPackagePath = "github.com/miekg/coredns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/coredns.git"; + rev = "a8fb01bfd28e8b57f6d7b7d33f8282d807b2457d"; + sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; + sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; + sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37"; + sha256 = "0y4nxc0kzlmqfqi3w3m7r9h508bx80vxbzj4qn0mksp40mfhjxyv"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5636dc67ae776adf5590da7349e70fbb9559972d"; + sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "9a94032291f2192936512bab367bc45e77990d6a"; + sha256 = "10ligvvdh6v5l7i1khirnhhfdhnlasxrqq39b3hxpnz9fq0fibg5"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "b7eff9abce531d6aeda923e759ae668e56601d21"; + sha256 = "0w84jwpiq0knspc9pp8dfvr5z6h7yl3qdq59ihvlfixl3kczw5k4"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "6ab629be5e31660579425a738ba8870beb5b7404"; + sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; + sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; + sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; + }; + } + { + 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"; + url = "https://go.googlesource.com/text"; + rev = "2df9074612f50810d82416d2229398a1e7188c5c"; + sha256 = "0ibg4pr9hxlvc5m4zn5hl4nsb6v5i0yfr9japsnjm010318df885"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "93fcd402979cfad8a7151f96e016416947c6a3cb"; + sha256 = "1v0kyav7i40wrahg9ng1vfq87xcp8r8hi4y7bspyfg35np6j8wdj"; + }; + } + { + goPackagePath = "k8s.io/kubernetes"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kubernetes"; + rev = "313ef63993017597bd28f5efd23677820274cb58"; + sha256 = "1rl2mwhg20h5ay3crg5jqiwabfwgn8amp4dps6qmzyy3pcrjvsa8"; + }; + } +] diff --git a/pkgs/servers/dns/coredns/pull-278.patch b/pkgs/servers/dns/coredns/pull-278.patch new file mode 100644 index 000000000000..1323f898c785 --- /dev/null +++ b/pkgs/servers/dns/coredns/pull-278.patch @@ -0,0 +1,153 @@ +From 1158d4cb3a3cd43f1d0a72bd35c6dea9b1de345e Mon Sep 17 00:00:00 2001 +From: Manuel de Brito Fontes <aledbf@gmail.com> +Date: Wed, 21 Sep 2016 14:16:52 -0300 +Subject: [PATCH] Fix k8s build + +--- + contrib/kubernetes/testscripts/00_run_k8s.sh | 2 +- + contrib/kubernetes/testscripts/10_setup_kubectl.sh | 2 +- + middleware/kubernetes/controller.go | 38 ++++++++-------------- + middleware/kubernetes/kubernetes.go | 9 +++-- + 4 files changed, 20 insertions(+), 31 deletions(-) + +diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/contrib/kubernetes/testscripts/00_run_k8s.sh +index ef98a8e..7ff6811 100755 +--- a/contrib/kubernetes/testscripts/00_run_k8s.sh ++++ b/contrib/kubernetes/testscripts/00_run_k8s.sh +@@ -5,7 +5,7 @@ set -e + # Based on instructions at: http://kubernetes.io/docs/getting-started-guides/docker/ + + #K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt) +-K8S_VERSION="v1.2.4" ++K8S_VERSION="v1.3.7" + + ARCH="amd64" + +diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/contrib/kubernetes/testscripts/10_setup_kubectl.sh +index 1778671..a7cfc1e 100755 +--- a/contrib/kubernetes/testscripts/10_setup_kubectl.sh ++++ b/contrib/kubernetes/testscripts/10_setup_kubectl.sh +@@ -10,7 +10,7 @@ cd ${BASEDIR} + echo "Setting up kubectl..." + + if [ ! -e kubectl ]; then +- curl -O http://storage.googleapis.com/kubernetes-release/release/v1.2.4/bin/linux/amd64/kubectl ++ curl -O http://storage.googleapis.com/kubernetes-release/release/v1.3.7/bin/linux/amd64/kubectl + chmod u+x kubectl + fi + +diff --git a/middleware/kubernetes/controller.go b/middleware/kubernetes/controller.go +index 126d415..c7f9e9e 100644 +--- a/middleware/kubernetes/controller.go ++++ b/middleware/kubernetes/controller.go +@@ -55,12 +55,15 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse + }, + &api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) + +- dns.svcLister.Store, dns.svcController = cache.NewInformer( ++ dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer( + &cache.ListWatch{ + ListFunc: serviceListFunc(dns.client, namespace, dns.selector), + WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector), + }, +- &api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) ++ &api.Service{}, ++ resyncPeriod, ++ cache.ResourceEventHandlerFuncs{}, ++ cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) + + dns.nsLister.Store, dns.nsController = cache.NewInformer( + &cache.ListWatch{ +@@ -163,47 +166,34 @@ func (dns *dnsController) GetNamespaceList() *api.NamespaceList { + return &nsList + } + +-func (dns *dnsController) GetServiceList() *api.ServiceList { +- svcList, err := dns.svcLister.List() ++func (dns *dnsController) GetServiceList() []*api.Service { ++ svcs, err := dns.svcLister.List(labels.Everything()) + if err != nil { +- return &api.ServiceList{} ++ return []*api.Service{} + } +- +- return &svcList ++ return svcs + } + + // GetServicesByNamespace returns a map of + // namespacename :: [ kubernetesService ] + func (dns *dnsController) GetServicesByNamespace() map[string][]api.Service { + k8sServiceList := dns.GetServiceList() +- if k8sServiceList == nil { +- return nil +- } +- +- items := make(map[string][]api.Service, len(k8sServiceList.Items)) +- for _, i := range k8sServiceList.Items { ++ items := make(map[string][]api.Service, len(k8sServiceList)) ++ for _, i := range k8sServiceList { + namespace := i.Namespace +- items[namespace] = append(items[namespace], i) ++ items[namespace] = append(items[namespace], *i) + } +- + return items + } + + // GetServiceInNamespace returns the Service that matches + // servicename in the namespace + func (dns *dnsController) GetServiceInNamespace(namespace string, servicename string) *api.Service { +- svcKey := fmt.Sprintf("%v/%v", namespace, servicename) +- svcObj, svcExists, err := dns.svcLister.Store.GetByKey(svcKey) +- ++ svcObj, err := dns.svcLister.Services(namespace).Get(servicename) + if err != nil { + // TODO(...): should return err here + return nil + } + +- if !svcExists { +- // TODO(...): should return err here +- return nil +- } +- +- return svcObj.(*api.Service) ++ return svcObj + } +diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go +index 0bd1dc7..eddc58b 100644 +--- a/middleware/kubernetes/kubernetes.go ++++ b/middleware/kubernetes/kubernetes.go +@@ -183,14 +183,14 @@ func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, + + var resultItems []api.Service + +- for _, item := range serviceList.Items { ++ for _, item := range serviceList { + if symbolMatches(namespace, item.Namespace, nsWildcard) && symbolMatches(servicename, item.Name, serviceWildcard) { + // If namespace has a wildcard, filter results against Corefile namespace list. + // (Namespaces without a wildcard were filtered before the call to this function.) + if nsWildcard && (len(k.Namespaces) > 0) && (!util.StringInSlice(item.Namespace, k.Namespaces)) { + continue + } +- resultItems = append(resultItems, item) ++ resultItems = append(resultItems, *item) + } + } + +@@ -216,12 +216,11 @@ func isKubernetesNameError(err error) bool { + } + + func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service { +- svcList, err := k.APIConn.svcLister.List() ++ svcList, err := k.APIConn.svcLister.List(labels.Everything()) + if err != nil { + return nil + } +- +- for _, service := range svcList.Items { ++ for _, service := range svcList { + if service.Spec.ClusterIP == ip { + return []msg.Service{msg.Service{Host: ip}} + } diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix new file mode 100644 index 000000000000..63cd71e146b9 --- /dev/null +++ b/pkgs/servers/dns/powerdns/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, + boost, libyamlcpp, libsodium, sqlite, protobuf, + libmysql, postgresql, lua, openldap, geoip, curl +}: + +stdenv.mkDerivation rec { + name = "powerdns-${version}"; + version = "4.0.1"; + + src = fetchurl { + url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; + sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi"; + }; + + buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; + + # nix destroy with-modules arguments, when using configureFlags + preConfigure = '' + configureFlagsArray=( + "--with-modules=bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote" + --with-sqlite3 + --with-socketdir=/var/lib/powerdns + --enable-libsodium + --enable-tools + --disable-dependency-tracking + --disable-silent-rules + --enable-reproducible + --enable-unit-tests + ) + ''; + checkPhase = "make check"; + + meta = with stdenv.lib; { + description = "Authoritative DNS server"; + homepage = http://www.powerdns.com/; + platforms = platforms.linux; + # cannot find postgresql libs on macos x + license = licenses.gpl2; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 14c4873beb42..5d4501b81ccf 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6400"; + version = "3.0.7200"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "08zwqqilfs3y2kjqfan4ya0s9pns6g1pgh6wciabjzv2v2ra9kq3"; + sha256 = "1j1fa54as8s75qky5gw9bw3b19mgn72nv89ip2hgln6bjv1b40jq"; }; propagatedBuildInputs = with pkgs; [ diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 3d301a6a35b3..16189fb47234 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ libpcap ]; diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json deleted file mode 100644 index 6ba22a78b7c2..000000000000 --- a/pkgs/servers/etcd/deps.json +++ /dev/null @@ -1,335 +0,0 @@ -[ - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", - "sha256": "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "583e8937c61f1af6513608ccc75c97b6abdf4ff9", - "sha256": "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay" - } - }, - { - "goPackagePath": "github.com/cloudfoundry-incubator/candiedyaml", - "fetch": { - "type": "git", - "url": "https://github.com/cloudfoundry-incubator/candiedyaml", - "rev": "99c3df83b51532e3615f851d8c2dbb638f5313bf", - "sha256": "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs" - } - }, - { - "goPackagePath": "github.com/cockroachdb/cmux", - "fetch": { - "type": "git", - "url": "https://github.com/cockroachdb/cmux", - "rev": "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d", - "sha256": "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh" - } - }, - { - "goPackagePath": "github.com/coreos/etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/etcd.git", - "rev": "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0", - "sha256": "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75" - } - }, - { - "goPackagePath": "github.com/coreos/go-semver", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-semver", - "rev": "8ab6407b697782a06568d4b7f1db25550ec2e4c6", - "sha256": "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2", - "sha256": "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk" - } - }, - { - "goPackagePath": "github.com/coreos/pkg", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/pkg", - "rev": "3ac0863d7acf3bc44daf49afef8919af12f704ef", - "sha256": "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l" - } - }, - { - "goPackagePath": "github.com/ghodss/yaml", - "fetch": { - "type": "git", - "url": "https://github.com/ghodss/yaml", - "rev": "aa0c862057666179de291b67d9f093d12b5a8473", - "sha256": "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "f20a1444730c7d9949b880a0309e737d007def25", - "sha256": "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "f592bd283e9ef86337a432eb50e592278c3d534d", - "sha256": "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb" - } - }, - { - "goPackagePath": "github.com/google/btree", - "fetch": { - "type": "git", - "url": "https://github.com/google/btree", - "rev": "7d79101e329e5a3adf994758c578dab82b90c017", - "sha256": "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0" - } - }, - { - "goPackagePath": "github.com/grpc-ecosystem/grpc-gateway", - "fetch": { - "type": "git", - "url": "https://github.com/grpc-ecosystem/grpc-gateway", - "rev": "5e0e028ba0a015710eaebf6e47af18812c9f2767", - "sha256": "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk" - } - }, - { - "goPackagePath": "github.com/jonboulle/clockwork", - "fetch": { - "type": "git", - "url": "https://github.com/jonboulle/clockwork", - "rev": "e3653ace2d63753697e0e5b07b9393971c0bba9d", - "sha256": "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "c12348ce28de40eed0136aa2b644d0ee0650e56c", - "sha256": "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "c5b7fccd204277076155f10851dad72b76a49317", - "sha256": "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8", - "sha256": "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5", - "sha256": "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "7c674d9e72017ed25f6d2b5e497a1368086b6a6f", - "sha256": "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "6454a84b6da0ea8b628d5d8a26759f62c6c161b4", - "sha256": "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2", - "sha256": "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx" - } - }, - { - "goPackagePath": "github.com/xiang90/probing", - "fetch": { - "type": "git", - "url": "https://github.com/xiang90/probing", - "rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2", - "sha256": "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "88d0005bf4c3ec17306ecaca4281a8d8efd73e91", - "sha256": "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "google.golang.org/grpc", - "fetch": { - "type": "git", - "url": "https://github.com/grpc/grpc-go", - "rev": "0032a855ba5c8a3c8e0d71c2deef354b70af1584", - "sha256": "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67" - } - }, - { - "goPackagePath": "github.com/urfave/cli", - "fetch": { - "type": "git", - "url": "https://github.com/urfave/cli", - "rev": "168c95418e66e019fe17b8f4f5c45aa62ff80e23", - "sha256": "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "daf2955e742cf123959884fdff4685aa79b63135", - "sha256": "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/bgentry/speakeasy", - "fetch": { - "type": "git", - "url": "https://github.com/bgentry/speakeasy", - "rev": "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da", - "sha256": "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "ce7fa45920dc37a92de8377972e52bc55ffa8d57", - "sha256": "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk" - } - }, - { - "goPackagePath": "github.com/golang/groupcache", - "fetch": { - "type": "git", - "url": "https://github.com/golang/groupcache", - "rev": "a6b377e3400b08991b80d6805d627f347f983866", - "sha256": "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2" - } - }, - { - "goPackagePath": "gopkg.in/cheggaaa/pb.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/cheggaaa/pb.v1", - "rev": "9453b2db37f4d8bc63751daca63bbe7049eb5e74", - "sha256": "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998", - "sha256": "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30" - } - }, - { - "goPackagePath": "github.com/spacejam/loghisto", - "fetch": { - "type": "git", - "url": "https://github.com/spacejam/loghisto", - "rev": "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7", - "sha256": "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1" - } - }, - { - "goPackagePath": "github.com/akrennmair/gopcap", - "fetch": { - "type": "git", - "url": "https://github.com/akrennmair/gopcap", - "rev": "00e11033259acb75598ba416495bb708d864a010", - "sha256": "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 000000000000..2c07817a980f --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,335 @@ +[ +{ + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"; + sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; + }; +} +{ + goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry-incubator/candiedyaml"; + rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; + sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; + }; +} +{ + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; + sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; + }; +} +{ + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd.git"; + rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0"; + sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; + }; +} +{ + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; +} +{ + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2"; + sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk"; + }; +} +{ + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; +} +{ + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "aa0c862057666179de291b67d9f093d12b5a8473"; + sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "f20a1444730c7d9949b880a0309e737d007def25"; + sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c"; + }; +} +{ + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "f592bd283e9ef86337a432eb50e592278c3d534d"; + sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb"; + }; +} +{ + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; +} +{ + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767"; + sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk"; + }; +} +{ + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d"; + sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc"; + }; +} +{ + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; +} +{ + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; + sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; + }; +} +{ + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; +} +{ + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; + sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; + }; +} +{ + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4"; + sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna"; + }; +} +{ + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"; + sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx"; + }; +} +{ + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; + sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; + }; +} +{ + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; + sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; + }; +} +{ + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584"; + sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67"; + }; +} +{ + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23"; + sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n"; + }; +} +{ + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; +} +{ + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "daf2955e742cf123959884fdff4685aa79b63135"; + sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; + }; +} +{ + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; +} +{ + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da"; + sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01"; + }; +} +{ + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57"; + sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk"; + }; +} +{ + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "a6b377e3400b08991b80d6805d627f347f983866"; + sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2"; + }; +} +{ + goPackagePath = "gopkg.in/cheggaaa/pb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/cheggaaa/pb.v1"; + rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74"; + sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb"; + }; +} +{ + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; +} +{ + goPackagePath = "github.com/spacejam/loghisto"; + fetch = { + type = "git"; + url = "https://github.com/spacejam/loghisto"; + rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7"; + sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1"; + }; +} +{ + goPackagePath = "github.com/akrennmair/gopcap"; + fetch = { + type = "git"; + url = "https://github.com/akrennmair/gopcap"; + rev = "00e11033259acb75598ba416495bb708d864a010"; + sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a"; + }; +} +] diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index b8718898f4bc..28ca858440b8 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Share your terminal as a web application"; diff --git a/pkgs/servers/gotty/deps.json b/pkgs/servers/gotty/deps.json deleted file mode 100644 index 81983165dcd9..000000000000 --- a/pkgs/servers/gotty/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "67e2db24c831afa6c64fc17b4a143390674365ef", - "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d" - } - }, - { - "goPackagePath": "github.com/braintree/manners", - "fetch": { - "type": "git", - "url": "https://github.com/braintree/manners", - "rev": "cab36f97339b1925cd89e158632728025557e550", - "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec", - "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3" - } - }, - { - "goPackagePath": "github.com/elazarl/go-bindata-assetfs", - "fetch": { - "type": "git", - "url": "https://github.com/elazarl/go-bindata-assetfs", - "rev": "d5cac425555ca5cf00694df246e04f05e6a55150", - "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17" - } - }, - { - "goPackagePath": "github.com/fatih/structs", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/structs", - "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f", - "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - } -] diff --git a/pkgs/servers/gotty/deps.nix b/pkgs/servers/gotty/deps.nix new file mode 100644 index 000000000000..4f59dc414c49 --- /dev/null +++ b/pkgs/servers/gotty/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + goPackagePath = "github.com/braintree/manners"; + fetch = { + type = "git"; + url = "https://github.com/braintree/manners"; + rev = "cab36f97339b1925cd89e158632728025557e550"; + sha256 = "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "71f57d300dd6a780ac1856c005c4b518cfd498ec"; + sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "a9f7daa9c2729e97450c2da2feda19130a367d8f"; + sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } +] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 596176d939d1..b8d2498b71ea 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk ]; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 5842495e323e..82ed92084dfb 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ sudo ]; buildFlags = [ "-tags textsecure" ]; diff --git a/pkgs/servers/interlock/deps.json b/pkgs/servers/interlock/deps.json deleted file mode 100644 index 10bb3106c5c3..000000000000 --- a/pkgs/servers/interlock/deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/janimo/textsecure", - "fetch": { - "type": "git", - "url": "https://github.com/janimo/textsecure", - "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6", - "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix new file mode 100644 index 000000000000..be5c05295731 --- /dev/null +++ b/pkgs/servers/interlock/deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/janimo/textsecure"; + fetch = { + type = "git"; + url = "https://github.com/janimo/textsecure"; + rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; + sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 46fc9bc00f2b..b5ea7acb9d2c 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.9.2p1"; + version = "6.0.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { - url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9"; }; patches = [ ./proc_path.diff ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 57abffa601fc..b4f34b452a7d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,13 +12,13 @@ let in buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "04wl6lznffxhvfq52cmbg2amkl03454wyaqc17i0zlc6b0p14dli"; + sha256 = "0171pp7phizg5j78i1srkx2hj4fqi0qn66sn6x4gshv9grncjsgw"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 86944c036e49..53c87745e67a 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -17,5 +17,5 @@ buildGoPackage rec { sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json deleted file mode 100644 index 4df002888c42..000000000000 --- a/pkgs/servers/mesos-dns/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4", - "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "github.com/mesos/mesos-go", - "fetch": { - "type": "git", - "url": "https://github.com/mesos/mesos-go", - "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969", - "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk" - } - }, - { - "goPackagePath": "github.com/pmezard/go-difflib", - "fetch": { - "type": "git", - "url": "https://github.com/pmezard/go-difflib", - "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d", - "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/stretchr/objx", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/objx", - "rev": "cbeaeb16a013161a98496fad62933b1d21786672", - "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/emicklei/go-restful", - "fetch": { - "type": "git", - "url": "https://github.com/emicklei/go-restful", - "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d", - "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify", - "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff", - "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p" - } - } -] diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/servers/mesos-dns/deps.nix new file mode 100644 index 000000000000..00f0f245f6b3 --- /dev/null +++ b/pkgs/servers/mesos-dns/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4"; + sha256 = "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "github.com/mesos/mesos-go"; + fetch = { + type = "git"; + url = "https://github.com/mesos/mesos-go"; + rev = "aaa5b2fecf0e2db463f4f996c89617d6766b2969"; + sha256 = "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; + sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; + sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"; + }; + } +] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index c0126fda5723..881a14b1117c 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.10.1"; + version = "0.23.8"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "${version}"; - sha256 = "0k0qfhw755k3ripsfkhml0ixaglhy64hdzxrjvlmbgc50s3j37vh"; + rev = "v${version}"; + sha256 = "0wan6a4rpyh5fflq88saznyf2kiic9nmj8sil1s49nh3c3y4yxcj"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 71095ce3583b..d4f22ab81eed 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, glibc }: stdenv.mkDerivation rec { - version = "1.1.5pre"; + version = "1.1.5"; name = "longview-${version}"; src = fetchFromGitHub { owner = "linode"; repo = "longview"; - rev = "5bcc9b60896b72de2d14f046f911477c26eb70ba"; - sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02"; + rev = "v${version}"; + sha256 = "1i9lli8iw8sb1bd633i82fzhx5gz85ma9d1hra41pkv2p3h823pa"; }; patches = [ diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 21bc242ec467..39bd3f12e957 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; - goDeps = ./cli_deps.json; + goDeps = ./cli_deps.nix; meta = with stdenv.lib; { description = "Command line tool for querying the Prometheus HTTP API"; diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json deleted file mode 100644 index 57384dba31c5..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix new file mode 100644 index 000000000000..192b6917bf0f --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli_deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index dc9b6fd843e2..6c703e5fa7bf 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.json; + goDeps = ./collectd-exporter_deps.nix; meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json deleted file mode 100644 index 1ff93e411f86..000000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix new file mode 100644 index 000000000000..92523d699375 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index f2afd2aa2733..ec63d5e63522 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; }; - goDeps = ./haproxy-exporter_deps.json; + goDeps = ./haproxy-exporter_deps.nix; meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json deleted file mode 100644 index 1ff93e411f86..000000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix new file mode 100644 index 000000000000..92523d699375 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ddd7a17364bf..42ff2496df12 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - goDeps = ./mesos-exporter_deps.json; + goDeps = ./mesos-exporter_deps.nix; meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json deleted file mode 100644 index a0b80e0ff146..000000000000 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/antonlindstrom/mesos_stats", - "fetch": { - "type": "git", - "url": "https://github.com/antonlindstrom/mesos_stats", - "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", - "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix new file mode 100644 index 000000000000..e8fdcc95da2f --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + fetch = { + type = "git"; + url = "https://github.com/antonlindstrom/mesos_stats"; + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 64a9e6cc28e3..5a274435e3da 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; }; - goDeps = ./mysqld-exporter_deps.json; + goDeps = ./mysqld-exporter_deps.nix; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json deleted file mode 100644 index 77d4c301bf84..000000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql", - "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84", - "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix new file mode 100644 index 000000000000..4910832a62cc --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; + sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9adfdda1d077..280f7e0abd0b 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; }; - goDeps = ./nginx-exporter_deps.json; + goDeps = ./nginx-exporter_deps.nix; meta = with stdenv.lib; { description = "Metrics relay from nginx stats to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json deleted file mode 100644 index 2a86511ef995..000000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/prometheus/log", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/log", - "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55", - "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix new file mode 100644 index 000000000000..26b2bcaa8d28 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/prometheus/log"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/log"; + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 19148ec1cb40..788fe8633967 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; }; - goDeps = ./prom2json_deps.json; + goDeps = ./prom2json_deps.nix; meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.json b/pkgs/servers/monitoring/prometheus/prom2json_deps.json deleted file mode 100644 index b716d41b2c12..000000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json_deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix new file mode 100644 index 000000000000..20cabe3d3857 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 65dda2403fca..6a742796f308 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; }; - goDeps = ./pushgateway_deps.json; + goDeps = ./pushgateway_deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json deleted file mode 100644 index c5ece41a52eb..000000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/julienschmidt/httprouter", - "fetch": { - "type": "git", - "url": "https://github.com/julienschmidt/httprouter", - "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7", - "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix new file mode 100644 index 000000000000..33795927ed90 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 935692bfa2e0..0ff1386074bc 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r"; }; - goDeps = ./statsd-bridge_deps.json; + goDeps = ./statsd-bridge_deps.nix; meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json deleted file mode 100644 index 4c0bc142c883..000000000000 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/howeyc/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6", - "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix new file mode 100644 index 000000000000..fd11ab5a7eab --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/howeyc/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + } +] diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix new file mode 100644 index 000000000000..75f92d3eabe4 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "telegraf-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/influxdata/telegraf"; + + excludedPackages = "test"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "telegraf"; + rev = "${version}"; + sha256 = "0kbh4gba4rrbykdl9wsyijh0xi5ksrch99fn4gj5gbbmd383pdzv"; + }; + + # Generated with the `gdm2nix.rb` script and the `Godeps` file from the influxdb repo root. + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + + meta = with lib; { + description = "The plugin-driven server agent for collecting & reporting metrics."; + license = licenses.mit; + homepage = https://www.influxdata.com/time-series-platform/telegraf/; + maintainers = with maintainers; [ mic92 roblabla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix new file mode 100644 index 000000000000..177f346d0124 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.0.0.nix @@ -0,0 +1,587 @@ +[ + { + fetch = { + rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9"; + sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv"; + type = "git"; + url = "https://github.com/Shopify/sarama.git"; + }; + goPackagePath = "github.com/Shopify/sarama"; + } + { + fetch = { + rev = "219c8cb75c258c552e999735be6df753ffc7afdc"; + sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6"; + type = "git"; + url = "https://github.com/Sirupsen/logrus.git"; + }; + goPackagePath = "github.com/Sirupsen/logrus"; + } + { + fetch = { + rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; + sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + type = "git"; + url = "https://github.com/aerospike/aerospike-client-go.git"; + }; + goPackagePath = "github.com/aerospike/aerospike-client-go"; + } + { + fetch = { + rev = "53c1b967405155bfc8758557863bf2e14f814687"; + sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4"; + type = "git"; + url = "https://github.com/amir/raidman.git"; + }; + goPackagePath = "github.com/amir/raidman"; + } + { + fetch = { + rev = "13a12060f716145019378a10e2806c174356b857"; + sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; + type = "git"; + url = "https://github.com/aws/aws-sdk-go.git"; + }; + goPackagePath = "github.com/aws/aws-sdk-go"; + } + { + fetch = { + rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; + sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + type = "git"; + url = "https://github.com/beorn7/perks.git"; + }; + goPackagePath = "github.com/beorn7/perks"; + } + { + fetch = { + rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99"; + sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w"; + type = "git"; + url = "https://github.com/cenkalti/backoff.git"; + }; + goPackagePath = "github.com/cenkalti/backoff"; + } + { + fetch = { + rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1"; + sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr"; + type = "git"; + url = "https://github.com/couchbase/go-couchbase.git"; + }; + goPackagePath = "github.com/couchbase/go-couchbase"; + } + { + fetch = { + rev = "a5ea6356f648fec6ab89add00edd09151455b4b2"; + sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi"; + type = "git"; + url = "https://github.com/couchbase/gomemcached.git"; + }; + goPackagePath = "github.com/couchbase/gomemcached"; + } + { + fetch = { + rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; + sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; + type = "git"; + url = "https://github.com/couchbase/goutils.git"; + }; + goPackagePath = "github.com/couchbase/goutils"; + } + { + fetch = { + rev = "e7cac92ea2bc52638791a021f212145acfedb1fc"; + sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g"; + type = "git"; + url = "https://github.com/dancannon/gorethink.git"; + }; + goPackagePath = "github.com/dancannon/gorethink"; + } + { + fetch = { + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + type = "git"; + url = "https://github.com/davecgh/go-spew.git"; + }; + goPackagePath = "github.com/davecgh/go-spew"; + } + { + fetch = { + rev = "8924d6900370b4c7e7984be5adc61f50a80d7537"; + sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n"; + type = "git"; + url = "https://github.com/docker/engine-api.git"; + }; + goPackagePath = "github.com/docker/engine-api"; + } + { + fetch = { + rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb"; + sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg"; + type = "git"; + url = "https://github.com/docker/go-connections.git"; + }; + goPackagePath = "github.com/docker/go-connections"; + } + { + fetch = { + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + type = "git"; + url = "https://github.com/docker/go-units.git"; + }; + goPackagePath = "github.com/docker/go-units"; + } + { + fetch = { + rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; + sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; + type = "git"; + url = "https://github.com/eapache/go-resiliency.git"; + }; + goPackagePath = "github.com/eapache/go-resiliency"; + } + { + fetch = { + rev = "ded5959c0d4e360646dc9e9908cff48666781367"; + sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n"; + type = "git"; + url = "https://github.com/eapache/queue.git"; + }; + goPackagePath = "github.com/eapache/queue"; + } + { + fetch = { + rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86"; + sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh"; + type = "git"; + url = "https://github.com/eclipse/paho.mqtt.golang.git"; + }; + goPackagePath = "github.com/eclipse/paho.mqtt.golang"; + } + { + fetch = { + rev = "1fca743146605a172a266e1654e01e5cd5669bee"; + sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38"; + type = "git"; + url = "https://github.com/go-sql-driver/mysql.git"; + }; + goPackagePath = "github.com/go-sql-driver/mysql"; + } + { + fetch = { + rev = "49571a1557cd20e6a2410adc6421f85b66c730b5"; + sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk"; + type = "git"; + url = "https://github.com/gobwas/glob.git"; + }; + goPackagePath = "github.com/gobwas/glob"; + } + { + fetch = { + rev = "552c7b9542c194800fd493123b3798ef0a832032"; + sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm"; + type = "git"; + url = "https://github.com/golang/protobuf.git"; + }; + goPackagePath = "github.com/golang/protobuf"; + } + { + fetch = { + rev = "427fb6fc07997f43afa32f35e850833760e489a7"; + sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + type = "git"; + url = "https://github.com/golang/snappy.git"; + }; + goPackagePath = "github.com/golang/snappy"; + } + { + fetch = { + rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; + sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; + type = "git"; + url = "https://github.com/gonuts/go-shellquote.git"; + }; + goPackagePath = "github.com/gonuts/go-shellquote"; + } + { + fetch = { + rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; + sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + type = "git"; + url = "https://github.com/gorilla/context.git"; + }; + goPackagePath = "github.com/gorilla/context"; + } + { + fetch = { + rev = "c9e326e2bdec29039a3761c07bece13133863e1e"; + sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6"; + type = "git"; + url = "https://github.com/gorilla/mux.git"; + }; + goPackagePath = "github.com/gorilla/mux"; + } + { + fetch = { + rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; + sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; + type = "git"; + url = "https://github.com/hailocab/go-hostpool.git"; + }; + goPackagePath = "github.com/hailocab/go-hostpool"; + } + { + fetch = { + rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2"; + sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw"; + type = "git"; + url = "https://github.com/hashicorp/consul.git"; + }; + goPackagePath = "github.com/hashicorp/consul"; + } + { + fetch = { + rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56"; + sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s"; + type = "git"; + url = "https://github.com/hpcloud/tail.git"; + }; + goPackagePath = "github.com/hpcloud/tail"; + } + { + fetch = { + rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da"; + sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z"; + type = "git"; + url = "https://github.com/influxdata/config.git"; + }; + goPackagePath = "github.com/influxdata/config"; + } + { + fetch = { + rev = "e094138084855d444195b252314dfee9eae34cab"; + sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; + type = "git"; + url = "https://github.com/influxdata/influxdb.git"; + }; + goPackagePath = "github.com/influxdata/influxdb"; + } + { + fetch = { + rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0"; + sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; + type = "git"; + url = "https://github.com/influxdata/toml.git"; + }; + goPackagePath = "github.com/influxdata/toml"; + } + { + fetch = { + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + type = "git"; + url = "https://github.com/kardianos/osext.git"; + }; + goPackagePath = "github.com/kardianos/osext"; + } + { + fetch = { + rev = "5e335590050d6d00f3aa270217d288dda1c94d0a"; + sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; + type = "git"; + url = "https://github.com/kardianos/service.git"; + }; + goPackagePath = "github.com/kardianos/service"; + } + { + fetch = { + rev = "19b0b332c9e4516a6370a0456e6182c3b5036720"; + sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"; + type = "git"; + url = "https://github.com/klauspost/crc32.git"; + }; + goPackagePath = "github.com/klauspost/crc32"; + } + { + fetch = { + rev = "e182dc4027e2ded4b19396d638610f2653295f36"; + sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj"; + type = "git"; + url = "https://github.com/lib/pq.git"; + }; + goPackagePath = "github.com/lib/pq"; + } + { + fetch = { + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions.git"; + }; + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + } + { + fetch = { + rev = "cce6c130cdb92c752850880fd285bea1d64439dd"; + sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx"; + type = "git"; + url = "https://github.com/miekg/dns.git"; + }; + goPackagePath = "github.com/miekg/dns"; + } + { + fetch = { + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + type = "git"; + url = "https://github.com/mreiferson/go-snappystream.git"; + }; + goPackagePath = "github.com/mreiferson/go-snappystream"; + } + { + fetch = { + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + type = "git"; + url = "https://github.com/naoina/go-stringutil.git"; + }; + goPackagePath = "github.com/naoina/go-stringutil"; + } + { + fetch = { + rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; + sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + type = "git"; + url = "https://github.com/nats-io/nats.git"; + }; + goPackagePath = "github.com/nats-io/nats"; + } + { + fetch = { + rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; + sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + type = "git"; + url = "https://github.com/nats-io/nuid.git"; + }; + goPackagePath = "github.com/nats-io/nuid"; + } + { + fetch = { + rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980"; + sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr"; + type = "git"; + url = "https://github.com/nsqio/go-nsq.git"; + }; + goPackagePath = "github.com/nsqio/go-nsq"; + } + { + fetch = { + rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; + sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; + type = "git"; + url = "https://github.com/opencontainers/runc.git"; + }; + goPackagePath = "github.com/opencontainers/runc"; + } + { + fetch = { + rev = "18acf9993a863f4c4b40612e19cdd243e7c86831"; + sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv"; + type = "git"; + url = "https://github.com/prometheus/client_golang.git"; + }; + goPackagePath = "github.com/prometheus/client_golang"; + } + { + fetch = { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + type = "git"; + url = "https://github.com/prometheus/client_model.git"; + }; + goPackagePath = "github.com/prometheus/client_model"; + } + { + fetch = { + rev = "e8eabff8812b05acf522b45fdcd725a785188e37"; + sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq"; + type = "git"; + url = "https://github.com/prometheus/common.git"; + }; + goPackagePath = "github.com/prometheus/common"; + } + { + fetch = { + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + type = "git"; + url = "https://github.com/prometheus/procfs.git"; + }; + goPackagePath = "github.com/prometheus/procfs"; + } + { + fetch = { + rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f"; + sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2"; + type = "git"; + url = "https://github.com/samuel/go-zookeeper.git"; + }; + goPackagePath = "github.com/samuel/go-zookeeper"; + } + { + fetch = { + rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; + sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + type = "git"; + url = "https://github.com/shirou/gopsutil.git"; + }; + goPackagePath = "github.com/shirou/gopsutil"; + } + { + fetch = { + rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; + sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; + type = "git"; + url = "https://github.com/soniah/gosnmp.git"; + }; + goPackagePath = "github.com/soniah/gosnmp"; + } + { + fetch = { + rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; + sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + type = "git"; + url = "https://github.com/sparrc/aerospike-client-go.git"; + }; + goPackagePath = "github.com/sparrc/aerospike-client-go"; + } + { + fetch = { + rev = "b4f3ceab0337f013208d31348b578d83c0064744"; + sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp"; + type = "git"; + url = "https://github.com/streadway/amqp.git"; + }; + goPackagePath = "github.com/streadway/amqp"; + } + { + fetch = { + rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; + sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; + type = "git"; + url = "https://github.com/stretchr/testify.git"; + }; + goPackagePath = "github.com/stretchr/testify"; + } + { + fetch = { + rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2"; + sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80"; + type = "git"; + url = "https://github.com/vjeantet/grok.git"; + }; + goPackagePath = "github.com/vjeantet/grok"; + } + { + fetch = { + rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; + sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; + type = "git"; + url = "https://github.com/wvanbergen/kafka.git"; + }; + goPackagePath = "github.com/wvanbergen/kafka"; + } + { + fetch = { + rev = "0f768712ae6f76454f987c3356177e138df258f8"; + sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16"; + type = "git"; + url = "https://github.com/wvanbergen/kazoo-go.git"; + }; + goPackagePath = "github.com/wvanbergen/kazoo-go"; + } + { + fetch = { + rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808"; + sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm"; + type = "git"; + url = "https://github.com/yuin/gopher-lua.git"; + }; + goPackagePath = "github.com/yuin/gopher-lua"; + } + { + fetch = { + rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; + sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; + type = "git"; + url = "https://github.com/zensqlmonitor/go-mssqldb.git"; + }; + goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; + } + { + fetch = { + rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; + sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + type = "git"; + url = "https://github.com/golang/crypto.git"; + }; + goPackagePath = "golang.org/x/crypto"; + } + { + fetch = { + rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; + sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + type = "git"; + url = "https://github.com/golang/net.git"; + }; + goPackagePath = "golang.org/x/net"; + } + { + fetch = { + rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; + sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; + type = "git"; + url = "https://github.com/golang/text.git"; + }; + goPackagePath = "golang.org/x/text"; + } + { + fetch = { + rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef"; + sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi"; + type = "git"; + url = "https://gopkg.in/dancannon/gorethink.v1.git"; + }; + goPackagePath = "gopkg.in/dancannon/gorethink.v1"; + } + { + fetch = { + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + type = "git"; + url = "https://github.com/fatih/pool.git"; + }; + goPackagePath = "gopkg.in/fatih/pool.v2"; + } + { + fetch = { + rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; + sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + type = "git"; + url = "https://gopkg.in/mgo.v2.git"; + }; + goPackagePath = "gopkg.in/mgo.v2"; + } + { + fetch = { + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + type = "git"; + url = "https://gopkg.in/yaml.v2.git"; + }; + goPackagePath = "gopkg.in/yaml.v2"; + } +] diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d656e8ded3a4..4b26b92cdb29 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost +{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , flacSupport ? true, flac , vorbisSupport ? true, libvorbis @@ -30,18 +30,19 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "15"; + minor = "19"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c"; + sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw"; }; patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; buildInputs = [ pkgconfig glib boost ] + ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index be7947a03d6c..a136c94aa575 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake }: +{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }: stdenv.mkDerivation rec { pname = "mosquitto"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; }; - buildInputs = [ openssl libuuid ] + buildInputs = [ openssl libuuid libwebsockets ] ++ stdenv.lib.optional stdenv.isDarwin cmake; makeFlags = [ @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace config.mk \ --replace "/usr/local" "" + substituteInPlace config.mk \ + --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + ''; meta = { diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 665e2ee8ed54..e3e3de36575e 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.pygobject pythonPackages.dbus-python pythonPackages.pygtk ]; + pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 20c4d699dd43..1614049bf22f 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { # Generated with the `gdm2nix.rb` script and the `Godeps` file from the # influxdb repo root. - goDeps = ./. + builtins.toPath "/deps-${version}.json"; + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json b/pkgs/servers/nosql/influxdb/deps-0.13.0.json deleted file mode 100644 index 33388cc0fb79..000000000000 --- a/pkgs/servers/nosql/influxdb/deps-0.13.0.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "collectd.org", - "fetch": { - "type": "git", - "url": "https://github.com/collectd/go-collectd.git", - "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", - "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml.git", - "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", - "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics.git", - "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757", - "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat.git", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt.git", - "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", - "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", - "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bits", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bits.git", - "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", - "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bitstream", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bitstream.git", - "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", - "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf.git", - "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", - "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", - "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-msgpack.git", - "rev": "fa3f63826f7c23912c15263591e65d54d080b458", - "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft.git", - "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839", - "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft-boltdb", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft-boltdb.git", - "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", - "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" - } - }, - { - "goPackagePath": "github.com/influxdata/usage-client", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/usage-client.git", - "rev": "475977e68d79883d9c8d67131c84e4241523f452", - "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" - } - }, - { - "goPackagePath": "github.com/jwilder/encoding", - "fetch": { - "type": "git", - "url": "https://github.com/jwilder/encoding.git", - "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", - "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd.git", - "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", - "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" - } - }, - { - "goPackagePath": "github.com/paulbellamy/ratecounter", - "fetch": { - "type": "git", - "url": "https://github.com/paulbellamy/ratecounter.git", - "rev": "5a11f585a31379765c190c033b6ad39956584447", - "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner.git", - "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", - "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik.git", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "1f22c0103821b9390939b6776727195525381532", - "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" - } - }, - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://github.com/golang/tools.git", - "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180", - "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/pool.git", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix new file mode 100644 index 000000000000..1b8885a1a0fe --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix @@ -0,0 +1,200 @@ +[ +{ + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd.git"; + rev = "9fc824c70f713ea0f058a07b49a4c563ef2a3b98"; + sha256 = "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"; + }; +} +{ + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml.git"; + rev = "a4eecd407cf4129fc902ece859a0114e4cf1a7f4"; + sha256 = "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"; + }; +} +{ + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics.git"; + rev = "345426c77237ece5dab0e1605c3e4b35c3f54757"; + sha256 = "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"; + }; +} +{ + goPackagePath = "github.com/bmizerany/pat"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/pat.git"; + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt.git"; + rev = "2f846c3551b76d7710f159be840d66c3d064abbe"; + sha256 = "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"; + }; +} +{ + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew.git"; + rev = "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c"; + sha256 = "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bits"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bits.git"; + rev = "86c69b3c986f9d40065df5bd8f765796549eef2e"; + sha256 = "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bitstream"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bitstream.git"; + rev = "27cd5973303fde7d914860be1ea4b927a6be0c92"; + sha256 = "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf.git"; + rev = "74b6e9deaff6ba6da1389ec97351d337f0d08b06"; + sha256 = "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"; + }; +} +{ + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy.git"; + rev = "5979233c5d6225d4a8e438cdd0b411888449ddab"; + sha256 = "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"; + }; +} +{ + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-msgpack.git"; + rev = "fa3f63826f7c23912c15263591e65d54d080b458"; + sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; + }; +} +{ + goPackagePath = "github.com/hashicorp/raft"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/raft.git"; + rev = "8fd9a2fdfd154f4b393aa24cff91e3c317efe839"; + sha256 = "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"; + }; +} +{ + goPackagePath = "github.com/hashicorp/raft-boltdb"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/raft-boltdb.git"; + rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"; + sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"; + }; +} +{ + goPackagePath = "github.com/influxdata/usage-client"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/usage-client.git"; + rev = "475977e68d79883d9c8d67131c84e4241523f452"; + sha256 = "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"; + }; +} +{ + goPackagePath = "github.com/jwilder/encoding"; + fetch = { + type = "git"; + url = "https://github.com/jwilder/encoding.git"; + rev = "b421ab402545ef5a119f4f827784c6551d9bfc37"; + sha256 = "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"; + }; +} +{ + goPackagePath = "github.com/kimor79/gollectd"; + fetch = { + type = "git"; + url = "https://github.com/kimor79/gollectd.git"; + rev = "61d0deeb4ffcc167b2a1baa8efd72365692811bc"; + sha256 = "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"; + }; +} +{ + goPackagePath = "github.com/paulbellamy/ratecounter"; + fetch = { + type = "git"; + url = "https://github.com/paulbellamy/ratecounter.git"; + rev = "5a11f585a31379765c190c033b6ad39956584447"; + sha256 = "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"; + }; +} +{ + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner.git"; + rev = "82a939e738b0ee23e84ec7a12d8e216f4d95c53f"; + sha256 = "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"; + }; +} +{ + goPackagePath = "github.com/rakyll/statik"; + fetch = { + type = "git"; + url = "https://github.com/rakyll/statik.git"; + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/golang/crypto.git"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; +} +{ + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools.git"; + rev = "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180"; + sha256 = "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8"; + }; +} +{ + goPackagePath = "gopkg.in/fatih/pool.v2"; + fetch = { + type = "git"; + url = "https://github.com/fatih/pool.git"; + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + }; +} +] diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json deleted file mode 100644 index fe72249ea267..000000000000 --- a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json +++ /dev/null @@ -1,155 +0,0 @@ -[ - { - "goPackagePath": "collectd.org", - "fetch": { - "type": "git", - "url": "https://github.com/collectd/go-collectd.git", - "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", - "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml.git", - "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", - "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat.git", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt.git", - "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", - "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", - "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" - } - }, - { - "goPackagePath": "github.com/dgrijalva/jwt-go", - "fetch": { - "type": "git", - "url": "https://github.com/dgrijalva/jwt-go.git", - "rev": "a2c85815a77d0f951e33ba4db5ae93629a1530af", - "sha256": "1m7011hdr4qa400awbdagj2m5zwfbvhinq8p5hq7ysn14xpaq5vw" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bits", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bits.git", - "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", - "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bitstream", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bitstream.git", - "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", - "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf.git", - "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", - "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", - "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" - } - }, - { - "goPackagePath": "github.com/influxdata/usage-client", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/usage-client.git", - "rev": "475977e68d79883d9c8d67131c84e4241523f452", - "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" - } - }, - { - "goPackagePath": "github.com/jwilder/encoding", - "fetch": { - "type": "git", - "url": "https://github.com/jwilder/encoding.git", - "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", - "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd.git", - "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", - "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" - } - }, - { - "goPackagePath": "github.com/paulbellamy/ratecounter", - "fetch": { - "type": "git", - "url": "https://github.com/paulbellamy/ratecounter.git", - "rev": "5a11f585a31379765c190c033b6ad39956584447", - "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner.git", - "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", - "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik.git", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "1f22c0103821b9390939b6776727195525381532", - "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix new file mode 100644 index 000000000000..016e7a1624d9 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.nix @@ -0,0 +1,155 @@ +[ +{ + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd.git"; + rev = "9fc824c70f713ea0f058a07b49a4c563ef2a3b98"; + sha256 = "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"; + }; +} +{ + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml.git"; + rev = "a4eecd407cf4129fc902ece859a0114e4cf1a7f4"; + sha256 = "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"; + }; +} +{ + goPackagePath = "github.com/bmizerany/pat"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/pat.git"; + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt.git"; + rev = "2f846c3551b76d7710f159be840d66c3d064abbe"; + sha256 = "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"; + }; +} +{ + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew.git"; + rev = "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c"; + sha256 = "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"; + }; +} +{ + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go.git"; + rev = "a2c85815a77d0f951e33ba4db5ae93629a1530af"; + sha256 = "1m7011hdr4qa400awbdagj2m5zwfbvhinq8p5hq7ysn14xpaq5vw"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bits"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bits.git"; + rev = "86c69b3c986f9d40065df5bd8f765796549eef2e"; + sha256 = "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bitstream"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bitstream.git"; + rev = "27cd5973303fde7d914860be1ea4b927a6be0c92"; + sha256 = "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf.git"; + rev = "74b6e9deaff6ba6da1389ec97351d337f0d08b06"; + sha256 = "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"; + }; +} +{ + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy.git"; + rev = "5979233c5d6225d4a8e438cdd0b411888449ddab"; + sha256 = "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"; + }; +} +{ + goPackagePath = "github.com/influxdata/usage-client"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/usage-client.git"; + rev = "475977e68d79883d9c8d67131c84e4241523f452"; + sha256 = "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"; + }; +} +{ + goPackagePath = "github.com/jwilder/encoding"; + fetch = { + type = "git"; + url = "https://github.com/jwilder/encoding.git"; + rev = "b421ab402545ef5a119f4f827784c6551d9bfc37"; + sha256 = "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"; + }; +} +{ + goPackagePath = "github.com/kimor79/gollectd"; + fetch = { + type = "git"; + url = "https://github.com/kimor79/gollectd.git"; + rev = "61d0deeb4ffcc167b2a1baa8efd72365692811bc"; + sha256 = "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"; + }; +} +{ + goPackagePath = "github.com/paulbellamy/ratecounter"; + fetch = { + type = "git"; + url = "https://github.com/paulbellamy/ratecounter.git"; + rev = "5a11f585a31379765c190c033b6ad39956584447"; + sha256 = "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"; + }; +} +{ + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner.git"; + rev = "82a939e738b0ee23e84ec7a12d8e216f4d95c53f"; + sha256 = "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"; + }; +} +{ + goPackagePath = "github.com/rakyll/statik"; + fetch = { + type = "git"; + url = "https://github.com/rakyll/statik.git"; + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/golang/crypto.git"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; +} +] diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb index 4c49c8a538ff..4feb78f54bbd 100755 --- a/pkgs/servers/nosql/influxdb/gdm2nix.rb +++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb @@ -5,12 +5,17 @@ require "json" redirects = { "collectd.org" => "github.com/collectd/go-collectd", + "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git" => "github.com/eclipse/paho.mqtt.golang", + "golang.org/x/net" => "github.com/golang/net", "golang.org/x/crypto" => "github.com/golang/crypto", + "golang.org/x/text" => "github.com/golang/text", "golang.org/x/tools" => "github.com/golang/tools", "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool", } -deps = File.read("Godeps").lines.map do |line| +godeps = ARGV[0] || "Godeps" + +deps = File.read(godeps).lines.map do |line| (name, rev) = line.split(" ") host = redirects.fetch(name, name) @@ -18,7 +23,7 @@ deps = File.read("Godeps").lines.map do |line| url = "https://#{host}.git" xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`) - + { goPackagePath: name, fetch: { @@ -30,4 +35,5 @@ deps = File.read("Godeps").lines.map do |line| } end +#TODO: move to deps.nix in NIXON format File.write("deps.json", JSON.pretty_generate(deps)) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ab4524e69593..ee1987bd7e33 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -80,6 +80,11 @@ in stdenv.mkDerivation rec { substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder + '' + stdenv.lib.optionalString stdenv.isi686 '' + + # don't fail by default on i686 + substituteInPlace src/mongo/db/storage/storage_options.h \ + --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; buildPhase = '' diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index 334b78c91289..fa78c876c1ec 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/nsq/deps.json b/pkgs/servers/nsq/deps.json deleted file mode 100644 index c6a8392d9197..000000000000 --- a/pkgs/servers/nsq/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/bitly/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-nsq", - "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29", - "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2", - "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7" - } - }, - { - "goPackagePath": "github.com/bmizerany/perks", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/perks", - "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607", - "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/bitly/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-hostpool", - "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2", - "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g" - } - }, - { - "goPackagePath": "github.com/bitly/timer_metrics", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/timer_metrics", - "rev": "afad1794bb13e2a094720aeb27c088aa64564895", - "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - } -] diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 000000000000..751a18ca92d7 --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/mreiferson/go-snappystream"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-snappystream"; + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + }; + } + { + goPackagePath = "github.com/bitly/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-nsq"; + rev = "22a8bd48c443ec23bb559675b6df8284bbbdab29"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"; + sha256 = "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"; + }; + } + { + goPackagePath = "github.com/bmizerany/perks"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/perks"; + rev = "6cb9d9d729303ee2628580d9aec5db968da3a607"; + sha256 = "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/bitly/timer_metrics"; + fetch = { + type = "git"; + url = "https://github.com/bitly/timer_metrics"; + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } +] diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 3e3bcea46a25..b58fc342ded7 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json deleted file mode 100644 index 56f27b6b4e53..000000000000 --- a/pkgs/servers/oauth2_proxy/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/18F/hmacauth", - "fetch": { - "type": "git", - "url": "https://github.com/18F/hmacauth", - "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd", - "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1" - } - } -] diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix new file mode 100644 index 000000000000..37ddbbde64e2 --- /dev/null +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/18F/hmacauth"; + fetch = { + type = "git"; + url = "https://github.com/18F/hmacauth"; + rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; + sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + }; + } +] diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2368ba18a494..e5cb3fa988ff 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -18,13 +18,15 @@ with lib; stdenv.mkDerivation rec { - name = "samba-4.3.8"; + name = "samba-4.3.11"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "041b5frh4ikcka922aqhqjvlv4w2s7jycyykpvsknj0a79ncd79p"; + sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach"; }; + outputs = [ "out" "dev" "man" ]; + patches = [ ./4.x-no-persistent-install.patch ./4.x-fix-ctdb-deps.patch diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4a37213846a1..44c766d35d01 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json deleted file mode 100644 index ffd872c62874..000000000000 --- a/pkgs/servers/serf/deps.json +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics", - "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25", - "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/hashicorp/logutils", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/logutils", - "rev": "0dc08b1671f34c4250ce212759ebd880f743d883", - "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r" - } - }, - { - "goPackagePath": "github.com/armon/go-radix", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-radix", - "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93", - "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/hashicorp/memberlist", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/memberlist", - "rev": "6025015f2dc659ca2c735112d37e753bda6e329d", - "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "github.com/armon/circbuf", - "fetch": { - "type": "git", - "url": "https://github.com/armon/circbuf", - "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf", - "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s" - } - }, - { - "goPackagePath": "github.com/hashicorp/mdns", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/mdns", - "rev": "2b439d37011456df8ff83a70ffd1cd6046410113", - "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96" - } - }, - { - "goPackagePath": "github.com/mitchellh/cli", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/cli", - "rev": "8102d0ed5ea2709ade1243798785888175f6e415", - "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2" - } - }, - { - "goPackagePath": "github.com/ryanuber/columnize", - "fetch": { - "type": "git", - "url": "https://github.com/ryanuber/columnize", - "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a", - "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go.net", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go.net", - "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", - "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" - } - } -] diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix new file mode 100644 index 000000000000..bc5b960d1476 --- /dev/null +++ b/pkgs/servers/serf/deps.nix @@ -0,0 +1,137 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; + sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/hashicorp/logutils"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/logutils"; + rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; + sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; + sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; + }; + } + { + goPackagePath = "github.com/hashicorp/memberlist"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/memberlist"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/armon/circbuf"; + fetch = { + type = "git"; + url = "https://github.com/armon/circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "8102d0ed5ea2709ade1243798785888175f6e415"; + sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/hashicorp/go.net"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go.net"; + rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; + sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; + }; + } +] diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 657352634efc..ccb174371e0c 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json deleted file mode 100644 index 5706ab2fc954..000000000000 --- a/pkgs/servers/skydns/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "40456948a47496dc22168e6af39297a2f8fbf38c", - "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/stathat/go", - "fetch": { - "type": "git", - "url": "https://github.com/stathat/go", - "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93", - "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/servers/skydns/deps.nix new file mode 100644 index 000000000000..a4f4eb120458 --- /dev/null +++ b/pkgs/servers/skydns/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; + sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/stathat/go"; + fetch = { + type = "git"; + url = "https://github.com/stathat/go"; + rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; + sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 91e292944a67..a86862a14a56 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.4230"; + version = "2.0.0.4326"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "16nx0v5hpqlwna2hzpcpzvm7qc361yjxbqnwz5bfnnkb0h7ik5m6"; + sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r"; }; buildInputs = [ diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix new file mode 100644 index 000000000000..b640295eac8a --- /dev/null +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, gcc }: + +buildGoPackage rec { + name = "cockroach-${version}"; + version = "beta-20160915"; + + goPackagePath = "github.com/cockroachdb/cockroach"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "cockroachdb"; + repo = "cockroach"; + rev = version; + sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; + }; + + buildFlagsArray = '' + -ldflags= + -X github.com/cockroachdb/cockroach/build.tag=${version} + ''; + + buildInputs = [ gcc ]; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://www.cockroachlabs.com; + description = "A scalable, survivable, strongly-consistent SQL database"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "x86_64-darwin" "x86_64-cygwin" ]; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/servers/sql/cockroachdb/deps.nix b/pkgs/servers/sql/cockroachdb/deps.nix new file mode 100644 index 000000000000..da2ab57f91a1 --- /dev/null +++ b/pkgs/servers/sql/cockroachdb/deps.nix @@ -0,0 +1,471 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "8b9f1311551e712ea8a06b494238b8a2351e1c33"; + sha256 = "1w8gf6310dxl57jdq1b04wbh4ssb0nvck3926bbd86mnw78z0byl"; + }; + } + { + goPackagePath = "github.com/backtrace-labs/go-bcd"; + fetch = { + type = "git"; + url = "https://github.com/backtrace-labs/go-bcd"; + rev = "c5383e2df7004f8b2fb2f10a33167d757bb0fbfb"; + sha256 = "0v7al14ql8vddj8bw2yp1pp47nfdhq6vglbv6fmpg5sf5yfsp9xa"; + }; + } + { + goPackagePath = "github.com/biogo/store"; + fetch = { + type = "git"; + url = "https://github.com/biogo/store"; + rev = "913427a1d5e89604e50ea1db0f28f34966d61602"; + sha256 = "0xgz1g9digvvw64rmzw90a6iyxlljiiz2i1x0x0d8mw4wyaxcipz"; + }; + } + { + goPackagePath = "github.com/cenk/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenk/backoff"; + rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; + sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "a193146c91dea4b6cf30f355e99fb85f73d20f07"; + sha256 = "0amg5p3xadmj4p58f63f8kkggs9q3f3jhi7ijzb79grbg1lj2rj2"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-jemalloc"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-jemalloc"; + rev = "42e6a32cd7a4dff9c70d80323681d46d046181ef"; + sha256 = "16ddzw35xj2vz8324mac5bhhr9akvjrg14lgq2mn5nfw1zs42r7n"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-protobuf"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-protobuf"; + rev = "951f3e665896e7ba939fd1f2db9aeaae6ca988f8"; + sha256 = "032ncrq4p48riwk8zj6p3rp65p87k9793lg107ja6mf8nx0v3z3l"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-rocksdb"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-rocksdb"; + rev = "b5ca031b93fde49bfa2ba99aba423136aebf3c06"; + sha256 = "1vwq8fbcgwvq2mqv1vwm3b671iklg26s7zd3bgxr5rl076mhn6s5"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-snappy"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-snappy"; + rev = "d4e7b428fe7fc09e93573df3448567a62df8c9fa"; + sha256 = "09c1pnks51ypvqh97yf9mvi034cc3bb8dj3vkl9v959pg5ix91g4"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; + sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cockroach"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cockroach"; + rev = "3fff05767cd3eda2197ce102391c0de447fef606"; + sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; + }; + } + { + goPackagePath = "github.com/cockroachdb/pq"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/pq"; + rev = "40c6b2414c76cdb84aacc955f79dc844e48ad0c0"; + sha256 = "16pnyndzlsk5rbbrimpkg6mf9w2qf0z64pk2k70ja4a65kihlw9g"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "f8ad88b59a584afeee9d334eff879b104439117b"; + sha256 = "1y1llqaczhc5hqa71pwa1ns8nchizpl678lp23vl51c04swn8h8n"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "656167d760543d442eae62f0c8c4f92c05f59508"; + sha256 = "1v4bwfh7ziklfcdapnyky00gjivcn1n30b72pwmbdlk7283p555k"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; + } + { + goPackagePath = "github.com/elastic/gosigar"; + fetch = { + type = "git"; + url = "https://github.com/elastic/gosigar"; + rev = "7c0ce0d4814c8d4950d7e7f40ed3b6359e757875"; + sha256 = "1nar7jia3xfgwnvazp25m9b0kxxklarrq9fzdr63j3nqy2fnwvca"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b"; + sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; + }; + } + { + goPackagePath = "github.com/facebookgo/clock"; + fetch = { + type = "git"; + url = "https://github.com/facebookgo/clock"; + rev = "600d898af40aa09a7a93ecb9265d87b0504b6f03"; + sha256 = "1z3jxwsqll65il7rcdx5j4dggg6w143z24h3agk09xvsc2iyj7a2"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "a4cceea7a401a73fefafd1a21fedbd4694124a82"; + sha256 = "1b23izdgxlz010qrqgazm5yg0bc3pkni1qdf8n3z3xcn58hcx2yg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "2c1988e8c18d14b142c0b472624f71647cf39adb"; + sha256 = "176x3yv6l0i49ddv73r9v6w9qcmgrfzy8db26r01yk7sczq75nd5"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092"; + sha256 = "0nl9hddmxw2s4cqpg70k1913fna101lxrha6dgplw8g8rjikfna4"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d8ff598a019f2c7bad0980917a588193cf26666e"; + sha256 = "11sdd5fi2w0szk850n4y35x4v2ndy62c3ss9alha5xcj4jh1j0yq"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "737b74a46c4bf788349f72cb256fed10aea4d0ac"; + sha256 = "13bip4vamvij8dx0v0nhrikz6qhsimd0w4i55424c76ws6ph84i8"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "7cafcd837844e784b526369c9bce262804aebc60"; + sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "80f8150043c80fb52dee6bc863a709cdac7ec8f8"; + sha256 = "0brk4di63f56x9fsidn8dk7c2azan1kjzrli79h262j9pd17c3jm"; + }; + } + { + goPackagePath = "github.com/lightstep/lightstep-tracer-go"; + fetch = { + type = "git"; + url = "https://github.com/lightstep/lightstep-tracer-go"; + rev = "f3c66066ce6023ad1bd721cfbd9fbd6292eb08cc"; + sha256 = "1ci38j6d3spy2279l6anxxvm7k85h4fr08pdfw9ghrv96ajmaizb"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; + sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "daf2955e742cf123959884fdff4685aa79b63135"; + sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; + }; + } + { + goPackagePath = "github.com/opentracing/basictracer-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/basictracer-go"; + rev = "c7c0202a8a77f658aeb2193a27b6c0cfcc821038"; + sha256 = "09mh7dlhr3lyw8kwpa07ywjzr3bg7847ky4hvx551lhyqk0bfv0l"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "855519783f479520497c6b3445611b05fc42f009"; + sha256 = "15amxprc5n0dgr42jd1lkcn697m7pcvmksps9g1gw38ahyicxq8g"; + }; + } + { + goPackagePath = "github.com/petermattis/goid"; + fetch = { + type = "git"; + url = "https://github.com/petermattis/goid"; + rev = "208e1c5be6bf38853827abdc6290b5f6a0c404d5"; + sha256 = "0d511pdyrv9lkzq04agnm7019c1769vmdq8kyh66pq2np1x6jsl2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "a22138067af1c4942683050411a841ade67fe1eb"; + sha256 = "0fay1zxi8y4kj1q33mqxdsbicg9cplknnmzz87c9saq7rb4k6f36"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; + sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "bdb33529eca3e55eac7328e07c57012a797af602"; + sha256 = "146hfddgdi8rkg25v1f25klz3sy5slp0gny2lwjyi63jwly07512"; + }; + } + { + goPackagePath = "github.com/rubyist/circuitbreaker"; + fetch = { + type = "git"; + url = "https://github.com/rubyist/circuitbreaker"; + rev = "7e3e7fbe9c62b943d487af023566a79d9eb22d3b"; + sha256 = "01fshh514bq2bk7f6xv7zr781m23d3k1mla1lh8azqw5874m7a07"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8"; + sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; + sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; + sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "f676131e2660dc8cd88de99f7486d34aa8172635"; + sha256 = "0gj4fpary501n32ag49mkd0vymqw01am0lv78l9db9dvd2im0i4m"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a548aac93ed489257b9d959b40fe1e8c1e20778c"; + sha256 = "022vl9s6hf8qzdrxfivzd3dg1gsr1vns0j3a3xfdkgv5z9qyvy83"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "2910a502d2bf9e43193af9d68ca516529614eed3"; + sha256 = "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b"; + sha256 = "0w2g3pcxxgnp3fk0qy7ail8mxdxv3cf1yavdx8rrjn9idyd261df"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v1"; + rev = "9f9df34309c04878acc86042b16630b0f696e1de"; + sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; + }; + } +] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 699520a2df55..a56df1a9c28c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -14,7 +14,6 @@ mariadb = everything // { lib = client; # compat. with the old mariadb split }; - common = rec { # attributes common to both builds version = "10.1.16"; @@ -155,6 +154,9 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 + + # Don't install mysqlbug to prevent a dependency on gcc. + rm $out/bin/mysqlbug ''; }); diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix deleted file mode 100644 index 0e27211a0606..000000000000 --- a/pkgs/servers/sql/monetdb/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { - - name = "monetdb-2009-05-01"; - - src = fetchurl { - url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; - sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj"; - }; - - flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; } - // { - java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; }; - /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ - }; - - buildInputs = [ pcre - openssl readline libxml2 ]; # optional python perl php java ? - - cfg = { - geomSupport = true; - javaSupport = true; - }; - - dontBuild = true; - - installPhase = '' - mkdir $TMP/build - sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery - ''; - - meta = { - description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; - homepage = http://monetdb.cwi.nl/; - license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html - }; -} diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix new file mode 100644 index 000000000000..a2052eca9c2d --- /dev/null +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl +, boost, cctools, CoreServices }: + +# Note: zlib is not required; MySQL can use an internal zlib. + +stdenv.mkDerivation rec { + name = "mysql-${version}"; + version = "5.7.15"; + + src = fetchurl { + url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; + sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch"; + }; + + preConfigure = stdenv.lib.optional stdenv.isDarwin '' + ln -s /bin/ps $TMPDIR/ps + export PATH=$PATH:$TMPDIR + ''; + + buildInputs = [ cmake bison ncurses openssl readline zlib boost ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_SSL=yes" + "-DWITH_READLINE=yes" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=yes" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + prePatch = '' + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + ''; + postInstall = '' + sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db + rm -r $out/mysql-test "$out"/lib/*.a + rm $out/share/man/man1/mysql-test-run.pl.1 + ''; + + passthru.mysqlVersion = "5.7"; + + meta = { + homepage = http://www.mysql.com/; + description = "The world's most popular open source database"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix new file mode 100644 index 000000000000..9a6410490c54 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: + +stdenv.mkDerivation rec { + name = "pg_repack-${version}"; + version = "1.3.4"; + + buildInputs = [ postgresql openssl zlib readline ]; + + src = fetchFromGitHub { + owner = "reorg"; + repo = "pg_repack"; + rev = "ver_${version}"; + sha256 = "1hig4x8iycchlp42q8565jzi6hkj8gpbhl9kpn73jvk7afl7z0c8"; + }; + + installPhase = '' + install -D bin/pg_repack -t $out/bin/ + install -D lib/pg_repack.so -t $out/lib/ + install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Reorganize tables in PostgreSQL databases with minimal locks"; + longDescription = '' + pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore + the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an + exclusive lock on the processed tables during processing. pg_repack is efficient to boot, + with performance comparable to using CLUSTER directly. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ danbst ]; + inherit (postgresql.meta) platforms; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6d09116a867a..6cab8597869e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1582,11 +1582,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.2"; + name = "xf86-input-evdev-2.10.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2; - sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2; + sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1615,11 +1615,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.0"; + name = "xf86-input-libinput-0.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2; - sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; + sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.0"; + name = "xf86-video-amdgpu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2; - sha256 = "0cbrqpmi1hgbsi0i93v0yp7lv3wf4s0vbdlrj19cxmglv7gd1xb9"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; + sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.0"; + name = "xf86-video-ati-7.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; - sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; + sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1824,14 +1824,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2016-05-22"; + name = "xf86-video-intel-2016-09-08"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz; - sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz; + sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; + configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { @@ -2242,11 +2243,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.17"; + name = "xkeyboard-config-2.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; - sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; + sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2362,21 +2363,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; - # TODO: - # With the current state of ./generate-expr-from-tarballs.pl, - # this will get overwritten when next invoked. - # Could add a special case to ./generate-expr-from-tarballs.pl, - # or perhaps there's a cleaner solution. - #xquartz = (mkDerivation "xquartz" { - # name = "xorg-server-1.14.6"; - # builder = ./builder.sh; - # src = fetchurl { - # url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - # sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; - # }; - # buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; - #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 054e3f490e44..74c5ae9d9b89 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -239,7 +239,9 @@ let mkDerivation = name: attrs: let newAttrs = (overrides."\${name}" or (x: x)) attrs; stdenv = newAttrs.stdenv or args.stdenv; - in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]); + in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // { + hardeningDisable = [ "bindnow" "relro" ]; + }); overrides = import ./overrides.nix {inherit args xorg;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8a512144fdce..2ee394faf02c 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -119,18 +119,18 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch index 360768774db9..66f45a410f71 100644 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -17,26 +17,24 @@ index ec321f8..e9c3546 100644 <_shortDescription>Irn</_shortDescription> <_description>Iran</_description> diff --git a/symbols/Makefile.am b/symbols/Makefile.am -index 97c816d..d7e3a4e 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -10,7 +10,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ gb ge gh gn \ gr hr hu \ diff --git a/symbols/Makefile.in b/symbols/Makefile.in -index b5be077..5cddcc7 100644 --- a/symbols/Makefile.in +++ b/symbols/Makefile.in @@ -222,7 +222,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 021d4f074edd..884f34dcf022 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A Novel unix shell in go language"; diff --git a/pkgs/shells/elvish/deps.json b/pkgs/shells/elvish/deps.json deleted file mode 100644 index d1a4ceebe99d..000000000000 --- a/pkgs/shells/elvish/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/elves/getopt", - "fetch": { - "type": "git", - "url": "https://github.com/elves/getopt", - "rev": "f91a7bf920995832d55a1182f26657bc975b9c24", - "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix new file mode 100644 index 000000000000..cff60bad0a9b --- /dev/null +++ b/pkgs/shells/elvish/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/elves/getopt"; + fetch = { + type = "git"; + url = "https://github.com/elves/getopt"; + rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; + sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c6d3ad06df46..c118cea11729 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json deleted file mode 100644 index 5aabd0e6dba8..000000000000 --- a/pkgs/shells/oh/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "github.com/michaelmacinnis/adapted", - "fetch": { - "type": "git", - "url": "https://github.com/michaelmacinnis/adapted", - "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978", - "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner", - "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060", - "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317" - } - } -] diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix new file mode 100644 index 000000000000..b4b98f10c3aa --- /dev/null +++ b/pkgs/shells/oh/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/michaelmacinnis/adapted"; + fetch = { + type = "git"; + url = "https://github.com/michaelmacinnis/adapted"; + rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978"; + sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060"; + sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"; + }; + } +] diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e71c2f770b9b..372fd3cfa526 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -89,8 +89,16 @@ let cc ]; - # Add a utility function to produce derivations that use this - # stdenv and its shell. + # `mkDerivation` wraps the builtin `derivation` function to + # produce derivations that use this stdenv and its shell. + # + # See also: + # + # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv + # Details on how to use this mkDerivation function + # + # * https://nixos.org/nix/manual/#ssec-derivation + # Explanation about derivations in general mkDerivation = { buildInputs ? [] , nativeBuildInputs ? [] diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 197a7b80af36..de51e1ad25f5 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ xorg.libX11 xorg.libXrandr ]; diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json deleted file mode 100644 index 227db99338ea..000000000000 --- a/pkgs/tools/X11/go-sct/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/cpucycle/astrotime", - "fetch": { - "type": "git", - "url": "https://github.com/cpucycle/astrotime", - "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca", - "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1" - } - } -] diff --git a/pkgs/tools/X11/go-sct/deps.nix b/pkgs/tools/X11/go-sct/deps.nix new file mode 100644 index 000000000000..f808858e091a --- /dev/null +++ b/pkgs/tools/X11/go-sct/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/cpucycle/astrotime"; + fetch = { + type = "git"; + url = "https://github.com/cpucycle/astrotime"; + rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca"; + sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"; + }; + } +] diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index dd8b496fe66e..070152427f29 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }: +{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: let version = "1.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; }; - buildInputs = [ glib gtk2 gtkmm pkgconfig ]; + buildInputs = [ glib gtkmm2 pkgconfig ]; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 272143791f2c..cb3749efb445 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox, +{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper + pkgconfig gtk2 libglade openbox imlib2 libstartup_notification makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 43fa105e6808..63abc31e0076 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libX11, xproto, libXext, xextproto, libXtst -, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: +, gtk2, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libX11 xproto libXext xextproto libXtst gtk + [ libX11 xproto libXext xextproto libXtst gtk2 libXi inputproto pkgconfig recordproto texinfo ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1a84eaddda64..f3159533931b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk +, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: @@ -22,7 +22,7 @@ in buildPythonApplication rec { xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage xorg.libXrandr xorg.libxkbfile - pango cairo gdk_pixbuf atk gtk glib + pango cairo gdk_pixbuf atk gtk2 glib ffmpeg libvpx x264 libwebp @@ -30,7 +30,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pillow pygtk pygobject rencode pycrypto cryptography pycups lz4 dbus-python + pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python ]; preBuild = '' diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9ef9755d6bcb..cf58f75aaccc 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gobjectIntrospection -, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, python, gtk2, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23 +, kbproto, libX11, libXext, xextproto, pygobject2, libgcrypt, gtk3, vala_0_23 , pygobject3, libogg, enableGTK3 ? false, libgpgerror }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]); + ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk2 pygtk pygobject2 ]); NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; makeFlags = stdenv.lib.optionalString (!enableGTK3) - "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; + "CODEGENDIR=${pygobject2}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; # Fix broken .la files preFixup = '' diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index be7d534b3d6e..40647f73379b 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json deleted file mode 100644 index 1a0e2d3245f5..000000000000 --- a/pkgs/tools/admin/lxd/deps.json +++ /dev/null @@ -1,173 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/syndtr/gocapability", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/gocapability", - "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852", - "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/log15.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/inconshreveable/log15.v2", - "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f", - "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux", - "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5", - "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9" - } - }, - { - "goPackagePath": "github.com/pborman/uuid", - "fetch": { - "type": "git", - "url": "https://github.com/pborman/uuid", - "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4", - "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn" - } - }, - { - "goPackagePath": "gopkg.in/flosch/pongo2.v3", - "fetch": { - "type": "git", - "url": "https://gopkg.in/flosch/pongo2.v3", - "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9", - "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - }, - { - "goPackagePath": "gopkg.in/lxc/go-lxc.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/lxc/go-lxc.v2", - "rev": "8f9e220b36393c03854c2d224c5a55644b13e205", - "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/dustinkirkland/golang-petname", - "fetch": { - "type": "git", - "url": "https://github.com/dustinkirkland/golang-petname", - "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c", - "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context", - "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd", - "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/gosexy/gettext", - "fetch": { - "type": "git", - "url": "https://github.com/gosexy/gettext", - "rev": "305f360aee30243660f32600b87c3c1eaa947187", - "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09" - } - } -] diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix new file mode 100644 index 000000000000..7325100bb3ad --- /dev/null +++ b/pkgs/tools/admin/lxd/deps.nix @@ -0,0 +1,173 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; + sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; + sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "gopkg.in/flosch/pongo2.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/flosch/pongo2.v3"; + rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; + sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "gopkg.in/lxc/go-lxc.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/lxc/go-lxc.v2"; + rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; + sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/dustinkirkland/golang-petname"; + fetch = { + type = "git"; + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; + sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; + sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "305f360aee30243660f32600b87c3c1eaa947187"; + sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; + }; + } +] diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e924a58d4d71..6ed6a7f24021 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: stdenv.mkDerivation rec { version = "0.5.4.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix new file mode 100644 index 000000000000..d3b36d15e03e --- /dev/null +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: + +buildPythonApplication rec { + name = "beets-copyartifacts"; + + src = fetchFromGitHub { + repo = "beets-copyartifacts"; + owner = "sbarakat"; + rev = "dac4a1605111e24bb5b498aa84cead7c87480834"; + sha256 = "0p5cskfgqinzh48a58hw56f96g9lar3k3g2p0ip1m9kawzf6axng"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py + ''; + + meta = { + description = "Beets plugin to move non-music files during the import process"; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 9dcfbd10b353..d7fb0e2aab4f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -8,6 +8,7 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true +, enableKeyfinder ? true, keyfinder-cli ? null , enableLastfm ? true , enableMpd ? true , enableReplaygain ? true, bs1770gain ? null @@ -15,7 +16,8 @@ , enableWeb ? true # External plugins -, enableAlternatives ? false +, enableAlternatives ? false +, enableCopyArtifacts ? false , bashInteractive, bashCompletion }: @@ -25,6 +27,7 @@ assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableFetchart -> pythonPackages.responses != null; +assert enableKeyfinder -> keyfinder-cli != null; assert enableLastfm -> pythonPackages.pylast != null; assert enableMpd -> pythonPackages.mpd != null; assert enableReplaygain -> bs1770gain != null; @@ -42,6 +45,7 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; + keyfinder = enableKeyfinder; lastgenre = enableLastfm; lastimport = enableLastfm; mpdstats = enableMpd; @@ -54,7 +58,7 @@ let pluginsWithoutDeps = [ "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" "export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" - "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" + "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" @@ -98,12 +102,16 @@ in buildPythonApplication rec { pythonPackages.requests2 ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client + ++ optional enableKeyfinder keyfinder-cli ++ optional enableLastfm pythonPackages.pylast ++ optional enableMpd pythonPackages.mpd ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + }) + ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { + inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ @@ -117,6 +125,7 @@ in buildPythonApplication rec { patches = [ ./replaygain-default-bs1770gain.patch + ./keyfinder-default-bin.patch ]; postPatch = '' diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch new file mode 100644 index 000000000000..b0b573bbf313 --- /dev/null +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -0,0 +1,35 @@ +diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py +index b6131a4..b493792 100644 +--- a/beetsplug/keyfinder.py ++++ b/beetsplug/keyfinder.py +@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): + def __init__(self): + super(KeyFinderPlugin, self).__init__() + self.config.add({ +- u'bin': u'KeyFinder', ++ u'bin': u'keyfinder-cli', + u'auto': True, + u'overwrite': False, + }) +@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): + continue + + try: +- output = util.command_output([bin, b'-f', ++ output = util.command_output([bin, + util.syspath(item.path)]) + except (subprocess.CalledProcessError, OSError) as exc: + self._log.error(u'execution failed: {0}', exc) +diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py +index 00952fe..01ff8d4 100644 +--- a/test/test_keyfinder.py ++++ b/test/test_keyfinder.py +@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): + item.load() + self.assertEqual(item['initial_key'], 'C#m') + self.command_output.assert_called_with( +- ['KeyFinder', '-f', util.syspath(item.path)]) ++ ['keyfinder-cli', util.syspath(item.path)]) + + def test_add_key_on_import(self): + self.command_output.return_value = 'dbm' diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index bd5a6b1d592f..38df702cb16e 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome, glib, +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - which autoconf automake libtool gnome.gtkdoc glib pkgconfig + which autoconf automake libtool gnome2.gtkdoc glib pkgconfig gobjectIntrospection ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index b9c602dd7670..34946355d108 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,36 +1,29 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, intltool }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, autoconf, automake, alsaLib, gtk3, glibc, libnotify, libX11 }: stdenv.mkDerivation rec { name = "pnmixer-${version}"; - version = "2016-04-23"; + version = "0.7"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "cb20096716dbb5440b6560d81108d9c8f7188c48"; - sha256 = "17gl5fb3hpdgxyys8h5k3nraw7qdyqv9k9kz8ykr5h7gg29nxy66"; + rev = "v${version}"; + sha256 = "077l28qhr82ifqfwc2nqi5q1hmi6dyqqbhmjcsn27p4y433f3rpb"; }; - nativeBuildInputs = [ - pkgconfig autoconf automake intltool - ]; + nativeBuildInputs = [ pkgconfig autoconf automake intltool ]; - buildInputs = [ - alsaLib gtk3 glibc libnotify libX11 - ]; + buildInputs = [ alsaLib gtk3 glibc libnotify libX11 ]; preConfigure = '' ./autogen.sh ''; - # work around a problem related to gtk3 updates - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { homepage = https://github.com/nicklan/pnmixer; description = "ALSA mixer for the system tray"; license = licenses.gpl3; - maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; + maintainers = with maintainers; [ campadrenalin romildo ]; }; } diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index efca158efc61..f1774507225e 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.26"; in +let version = "0.28.1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; + sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; buildInputs = [ git pythonPackages.python ]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 730f8a90ce2d..d0d220b1de80 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.4.4"; + name = "xorriso-1.4.6"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "1izv8dvwacyh432vv1rm6lyjrq0v205kyakfra6iwa146c9m9fgr"; + sha256 = "112p0ghwzxrcjbsir1n2jxhq103ckrw93wzvd55qqvzfgs674vsj"; }; doCheck = true; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 060247aa532d..f1faf69ed589 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "1j7ysjkv0kbkwjagcdgwcnbii1smd58pwwlpz0l7amki5dxygpn6"; + sha256 = "005iw01ppjslfzbbx52dhmp1f7a8d071s5pxvjlk11zdv4h22rbb"; }; - buildInputs = [ pkgconfig fuse xz ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ fuse xz ]; configureFlags = [ "--enable-library" diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 0bb92f14e15c..028aef6024b1 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,5 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json deleted file mode 100644 index 9960293f0908..000000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/hanwen/go-fuse", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/go-fuse", - "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e", - "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56" - } - }, - { - "goPackagePath": "github.com/hanwen/usb", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/usb", - "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1", - "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky" - } - } -] diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix new file mode 100644 index 000000000000..4bba3f237392 --- /dev/null +++ b/pkgs/tools/filesystems/go-mtpfs/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e"; + sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"; + }; + } + { + goPackagePath = "github.com/hanwen/usb"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/usb"; + rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + }; + } +] diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch deleted file mode 100644 index a2890cad3994..000000000000 --- a/pkgs/tools/filesystems/lizardfs/412.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001 -From: Maksymilian Paszkiewicz <mpaszkiewicz@skytechnology.pl> -Date: Mon, 23 May 2016 12:25:19 +0200 -Subject: [PATCH] common: Fix minor compile and copyright issues - -This commit adds include <cmath> directive to -slice_read_planner.cc and fixes copyright -statement in filesystem_operations.cc - -Closes #411 -Closes #412 - -Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68 ---- - src/common/slice_read_planner.cc | 2 ++ - src/master/filesystem_operations.cc | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc -index 94c106c..d0284f1 100644 ---- a/src/common/slice_read_planner.cc -+++ b/src/common/slice_read_planner.cc -@@ -20,6 +20,8 @@ - - #include "common/slice_read_planner.h" - -+#include <cmath> -+ - /*! - * Prepares read planner for serving selected parts of a slice type. - * Firstly, function checks if: -diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc -index 69ff270..dc30b1f 100644 ---- a/src/master/filesystem_operations.cc -+++ b/src/master/filesystem_operations.cc -@@ -1,5 +1,6 @@ - /* -- Copyright 2013-2015 Skytechnology sp. z o.o.. -+ Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare, -+ 2013-2016 Skytechnology sp. z o.o.. - - This file is part of LizardFS. - diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 0301d2e18fbf..a50d8341f6b0 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; - rev = "v.${version}"; - sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; + rev = "v${version}"; + sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg"; }; buildInputs = @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { zlib boost pkgconfig judy pam makeWrapper ]; - patches = [ ./412.patch ]; - postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 5e1700af0178..a2fc5bc3d40b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchgit, zlib, xz }: +{ stdenv, fetchFromGitHub, zlib, xz +, lz4 ? null +, lz4Support ? false +}: + +assert lz4Support -> (lz4 != null); stdenv.mkDerivation rec { name = "squashfs-4.4dev"; - src = fetchgit { - url = https://github.com/plougher/squashfs-tools.git; + src = fetchFromGitHub { + owner = "plougher"; + repo = "squashfs-tools"; sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks"; rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; - buildInputs = [ zlib xz ]; + buildInputs = [ zlib xz ] + ++ stdenv.lib.optional lz4Support lz4; preBuild = "cd squashfs-tools"; installFlags = "INSTALL_DIR=\${out}/bin"; - makeFlags = "XZ_SUPPORT=1"; + makeFlags = [ "XZ_SUPPORT=1" ] + ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { homepage = http://squashfs.sourceforge.net/; diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index fb88a8c37d4c..d0ad0c27f20d 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxml2 flex bison vips - gnome.gtk fftw gsl goffice libgsf + gnome2.gtk fftw gsl goffice libgsf ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 52ca99b97645..dad611868bc2 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, cairo, gtk, poppler }: +, cairo, gtk2, poppler }: stdenv.mkDerivation rec { name = "pdf2svg-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk ]; + buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk2 ]; meta = with stdenv.lib; { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 6ff2ee5cd442..4fb16b497176 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, python27, libpng, matio ? null, cfitsio ? null, libwebp ? null }: diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 5366fe558770..cdd99cd7e9a5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja, - python, pkgconfig, protobuf, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchsvn { @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf gtk zinnia qt4 libxcb fcitx gettext ]; + buildInputs = [ protobuf gtk2 zinnia qt4 libxcb fcitx gettext ]; postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index e06d2b004ee9..644725c29107 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: +{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchsvn { @@ -20,7 +20,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ]; + buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ]; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 894c7b617600..cb33abc3213d 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libhangul }: +{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }: stdenv.mkDerivation { name = "nabi-1.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - buildInputs = [ gtk libhangul pkgconfig ]; + buildInputs = [ gtk2 libhangul pkgconfig ]; meta = with stdenv.lib; { description = "The Easy Hangul XIM"; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 9a3e0b905e13..88992c8e4e30 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -2,7 +2,7 @@ , glib , gtk2 , gst_all_1 -, gnome +, gnome2 , libnotify , libxml2 , libunique @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gst_plugins - gnome.GConf - gnome.gnome_icon_theme + gnome2.GConf + gnome2.gnome_icon_theme libnotify libxml2 libunique @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome.GConf.out ]; + propagatedUserEnvPkgs = [ gnome2.GConf.out ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix new file mode 100644 index 000000000000..577c0a33b3ee --- /dev/null +++ b/pkgs/tools/misc/aspcud/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, + boost, clasp, cmake, gringo, re2c +}: + +let + version = "1.9.0"; +in + +stdenv.mkDerivation rec { + name = "aspcud-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; + sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + }; + + buildInputs = [ boost clasp cmake gringo re2c ]; + + buildPhase = '' + cmake -DCMAKE_BUILD_TYPE=Release \ + -DGRINGO_LOC=${gringo}/bin/gringo \ + -DCLASP_LOC=${clasp}/bin/clasp \ + -DENCODING_LOC=$out/share/aspcud/specification.lp \ + . + + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/{aspcud,cudf2lp,lemon} $out/bin + + mkdir -p $out/share/aspcud + cp ../share/aspcud/specification.lp $out/share/aspcud + ''; + + meta = with stdenv.lib; { + description = "Solver for package problems in CUDF format using ASP"; + homepage = http://potasssco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index be908b162c32..05c3d6a7819b 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.147"; + version = "1.148"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0nz1ymf9yn8aw2va7mhnzz2y5pf6r651sap8k09r92h1224i0wbj"; + sha256 = "1d0qqzln5w7f7kkw75cp8g8hg43f85xj0h68y6j6yw7d62q1406g"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index a536321fc74e..d00e1abc7a5d 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.98"; + version = "5.112"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5"; + sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd"; }; doCheck = true; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix new file mode 100644 index 000000000000..135eda554b36 --- /dev/null +++ b/pkgs/tools/misc/clasp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +let + version = "3.1.4"; +in + +stdenv.mkDerivation { + name = "clasp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; + sha256 = "1zkjqc4gp4n9p2kf3k3z8x82g42any4p3shhhivny89z1jlxi9zn"; + }; + + preConfigure = "patchShebangs ./configure.sh"; + configureScript = "./configure.sh"; + + preBuild = "cd build/release"; + + installPhase = '' + mkdir -p $out/bin + cp bin/clasp $out/bin/clasp + ''; + + meta = with stdenv.lib; { + description = "Answer set solver for (extended) normal and disjunctive logic programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.all; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index fb11a3b87567..ddf9c38ec93a 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 -, pciutils, pkgconfig, gtk, ddccontrol-db +, pciutils, pkgconfig, gtk2, ddccontrol-db }: let version = "0.4.2"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db + perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db ]; patches = [ ./automake.patch ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1687c9fffafc..4d5eabfebc90 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -30,9 +30,9 @@ pythonPackages.buildPythonApplication rec { # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ - [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix new file mode 100644 index 000000000000..fbe1cc22376e --- /dev/null +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, expat }: + +stdenv.mkDerivation rec { + name = "docbook2mdoc-${version}"; + version = "0.0.9"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz"; + sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; + }; + + buildInputs = [ expat.dev ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from DocBook V4.x and v5.x XML into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d743a68c83b9..0e3922d2928a 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,6 +6,8 @@ buildRustPackage rec { name = "exa-${version}"; version = "2016-04-20"; + # NOTE: There is an impurity caused by `exa` depending on + # https://github.com/rust-datetime/zoneinfo-compiled.git depsSha256 = "0qsqkgc1wxigvskhaamgfp5pyc2kprsikhcfccysgs07w44nxkd0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 3eaf5ae5d1b3..3cb5c5680386 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.13.5"; + version = "0.15.1"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,24 +11,31 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "1zfl53nv0b2wsmgbsf850yafqkx9pplpx339iiw4037msdjqhi19"; + sha256 = "0wj5nhrrgx4nkiqwjp5wpfzdyikrjv4qr5x39s5094yc4p2k30b1"; }; buildInputs = [ ncurses ]; - goDeps = ./deps.json; + goDeps = ./deps.nix; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim ''; - postInstall= '' + postInstall = '' cp $src/bin/fzf-tmux $bin/bin mkdir -p $out/share/vim-plugins ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + # fixes cycle between $out and $bin + # otool -l shows that the binary includes an LC_RPATH to $out/lib + # it seems safe to remove that since but the directory does not exist. + install_name_tool -delete_rpath $out/lib $bin/bin/fzf + ''; + meta = with stdenv.lib; { homepage = https://github.com/junegunn/fzf; description = "A command-line fuzzy finder written in Go"; diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json deleted file mode 100644 index a856d2d5fa81..000000000000 --- a/pkgs/tools/misc/fzf/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/junegunn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-runewidth", - "rev": "63c378b851290989b19ca955468386485f118c65", - "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d" - } - }, - { - "goPackagePath": "github.com/junegunn/go-shellwords", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-shellwords", - "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4", - "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7" - } - } -] diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix new file mode 100644 index 000000000000..985308538321 --- /dev/null +++ b/pkgs/tools/misc/fzf/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/junegunn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-runewidth"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + }; + } + { + goPackagePath = "github.com/junegunn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-shellwords"; + rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; + sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + }; + } +] diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 6e3fe1223fc4..7c944ceaab3f 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json deleted file mode 100644 index a51c17253538..000000000000 --- a/pkgs/tools/misc/gawp/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } -] diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix new file mode 100644 index 000000000000..cf577a30354c --- /dev/null +++ b/pkgs/tools/misc/gawp/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } +] diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index d1551eb4ccd6..adad66c9bfa4 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez -, readline, pcsclite, libical, gtk, glib, libXpm }: +, readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { name = "gnokii-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb - glib gtk pkgconfig bluez readline + glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index d73def7ab9bb..cdf2a4aca86c 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5a007a0ac727..829c524113b9 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.1.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "09rcgjxnv235a9rvyfcfdjvmr3rjb0jg5sph8sqvzgspvas9pgvn"; + sha256 = "0p7vx6b4k6lzxi0v9x44wbrvplw93288lpixpwckc0xx0r7js07z"; }; dontBuild = true; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 000000000000..ae71c01314cf --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,39 @@ +{ 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 + ]; + + buildPhase = '' + scons --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/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 5f21559d4715..f362e7c53a24 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }: +{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }: stdenv.mkDerivation rec { version="0.8.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ]; + buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 1cda3149bb42..52e7793d9744 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json deleted file mode 100644 index 0db944a83613..000000000000 --- a/pkgs/tools/misc/i3cat/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/vincent-petithory/structfield", - "fetch": { - "type": "git", - "url": "https://github.com/vincent-petithory/structfield", - "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", - "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" - } - } -] diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix new file mode 100644 index 000000000000..01e85cbd824d --- /dev/null +++ b/pkgs/tools/misc/i3cat/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/vincent-petithory/structfield"; + fetch = { + type = "git"; + url = "https://github.com/vincent-petithory/structfield"; + rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; + sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; + }; + } +] diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 9724278b6087..b049e0706e9a 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; troff="${groff}/bin/groff"; + postPatch = '' + substituteInPlace src/man_db.conf.in \ + --replace "/usr/local/share" "/run/current-system/sw/share" \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; + configureFlags = [ "--disable-setuid" "--localstatedir=/var" diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix new file mode 100644 index 000000000000..297d6557f5e9 --- /dev/null +++ b/pkgs/tools/misc/mandoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "mandoc-${version}"; + version = "1.13.4"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; + sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + }; + + buildInputs = [ zlib ]; + + configureLocal = '' + HAVE_WCHAR=1 + MANPATH_DEFAULT="/run/current-system/sw/share/man" + OSNAME="NixOS" + PREFIX="$out" + HAVE_MANPATH=1 + LD_OHASH="-lutil" + BUILD_DB=0 + ''; + + preConfigure = '' + echo $configureLocal > configure.local + ''; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "suite of tools compiling mdoc and man"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8616a40df43f..fbd2c642b9d2 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs -, libX11, libICE, perl, zip, unzip, gettext, slang}: +, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { name = "mc-${version}"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0fvqzffppj0aja9hi0k1xdjg5m6s99immlla1y9yzn5fp8vwpl36"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; + buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs + libssh2 openssl ]; + + configureFlags = [ "--enable-vfs-smb" ]; meta = { description = "File Manager and User Shell for the GNU Project"; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 113b8b2b4cec..f67fd383f18d 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json deleted file mode 100644 index c1cc7f96f750..000000000000 --- a/pkgs/tools/misc/mongodb-tools/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2", - "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", - "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix new file mode 100644 index 000000000000..437dcd649373 --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix new file mode 100644 index 000000000000..0c96908401b5 --- /dev/null +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pod2mdoc-${version}"; + version = "0.0.10"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz"; + sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + install -m 0755 pod2mdoc $out/bin + install -m 0444 pod2mdoc.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from POD into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 3b6b7bde08de..cb0859cfa68b 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.3"; + version = "1.4"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0cnhv9a6vdrp2wmyl69fb1yklbx1x5pblsy4a5a36gwxmaill05k"; + sha256 = "0gxr9hcscxq7h8nwinm1arjfy2rw4i1iwq6ghnm7pw7ay1n7sfzq"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix new file mode 100644 index 000000000000..2404ab9da899 --- /dev/null +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "texi2mdoc-${version}"; + version = "0.1.2"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz"; + sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from Texinfo into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 91a55694f853..1f1ec0437f86 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -11,7 +11,17 @@ pythonPackages.buildPythonApplication rec { sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn"; }; - buildInputs = with pythonPackages; [ pytest ]; + patchPhase = '' + # Dependencies required for testing shouldn't pinned to + # a specific version. + substituteInPlace requirements/test.txt \ + --replace "==" ">=" + ''; + + buildInputs = with pythonPackages; [ + pytest + pytest-rerunfailures + ]; propagatedBuildInputs = with pythonPackages; [ click colorama kaptan libtmux diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index d02e2865c8f5..ff8e7873839b 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -19,5 +19,5 @@ buildGoPackage rec { sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json deleted file mode 100644 index 96db25d0c7d5..000000000000 --- a/pkgs/tools/misc/upower-notify/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/godbus/dbus", - "fetch": { - "type": "git", - "url": "https://github.com/godbus/dbus", - "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", - "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" - } - } -] diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/tools/misc/upower-notify/deps.nix new file mode 100644 index 000000000000..8a729857b819 --- /dev/null +++ b/pkgs/tools/misc/upower-notify/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15"; + sha256 = "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"; + }; + } +] diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 56d16fbd9055..408879a45345 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.x86_64; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 197b92295a82..79565af8e926 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { - # The last release from 2012, 0.12, lacks '-targets' - name = "xclip-0.12-svn-20140209"; + name = "xclip-${version}"; + version = "0.13"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/xclip/code/trunk"; - rev = "87"; - sha256 = "1rbcdgr73916wvzfgqjs1jhgzk8qs1yw2iiqy7ifrkjafhi37w6b"; + src = fetchFromGitHub { + owner = "astrand"; + repo = "xclip"; + rev = version; + sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs"; }; - buildInputs = [ xlibsWrapper libXmu autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ libXmu ]; meta = { description = "Tool to access the X clipboard from a console application"; - homepage = http://sourceforge.net/projects/xclip/; + homepage = https://github.com/astrand/xclip; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 0cf30942e739..2b18d4e910d5 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,40 +1,42 @@ -{ stdenv, pkgs, fetchFromGitHub, buildPythonPackage, - pexpect, - pyGtkGlade, - pygobject, - pyxdg, - gnome_python, +{ stdenv, fetchFromGitHub, buildPythonPackage +, pexpect, pyGtkGlade, pygobject, pyxdg +, gnome_python, python +, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: buildPythonPackage rec { - version = "1.1.1"; name = "xflux-gui-${version}"; + version = "2016-09-21"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "d897dfd"; - sha256 = "1mx1r2hz3g3waafn4w8hql0gaasfizbzz60bk5llw007k4k8892r"; + rev = "0b56204477494b473a390e8b0db043437ec14f32"; + sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; }; - # remove messing with shipped binary - patches = [ ./setup.patch ]; - # not sure if these need to be propagated or not? propagatedBuildInputs = [ pexpect pyGtkGlade pygobject pyxdg - pkgs.libappindicator-gtk2 + libappindicator-gtk2 gnome_python ]; - buildInputs = [ - pkgs.xflux - ]; + buildInputs = [ xflux librsvg ]; + + nativeBuildInputs = [ wrapGAppsHook ]; postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${pkgs.xflux}/bin/xflux\"" + substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" + ''; + + postFixup = '' + wrapGAppsHook + makeWrapperArgs="''${gappsWrapperArgs[@]}" + wrapPythonPrograms + patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py ''; meta = { diff --git a/pkgs/tools/misc/xflux/setup.patch b/pkgs/tools/misc/xflux/setup.patch deleted file mode 100644 index c36f81f7d808..000000000000 --- a/pkgs/tools/misc/xflux/setup.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/setup.py b/setup.py -index e11f199..b1cb0e5 100644 ---- a/setup.py -+++ b/setup.py -@@ -4,13 +4,6 @@ from distutils.core import setup - from sys import maxsize - from os import rename - --# Determines which is the appropriate executable for 32-bit --if maxsize == 2147483647: -- rename("xflux32", "xflux") --# ... or 64-bit processors --elif maxsize == 9223372036854775807: -- rename("xflux64", "xflux") -- - setup(name = "f.lux indicator applet", - version = "1.1.8", - description = "f.lux indicator applet - better lighting for your computer", -@@ -22,8 +15,7 @@ setup(name = "f.lux indicator applet", - packages = ["fluxgui",], - package_data = {"fluxgui" : ["*.glade"] }, - data_files=[('share/icons/hicolor/scalable/apps', ['fluxgui.svg', 'fluxgui-light.svg', 'fluxgui-dark.svg']), -- ('share/applications', ['desktop/fluxgui.desktop']), -- ('bin', ['xflux']),], -+ ('share/applications', ['desktop/fluxgui.desktop']),], - scripts = ["fluxgui"], - long_description = """f.lux indicator applet is an indicator applet to - control xflux, an application that makes the color of your computer's diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index c6efac3ffe60..a7f2d445bca5 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "yle-dl-${version}"; - version = "2.9.1"; + version = "2.11"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "1irpcp9iw2cw85sj1kzndmrw8350p9q7cfghjx2xkh2czk9k7whq"; + sha256 = "1fa2a25j3wwk3m6q1alilklwhqf337ch8rj6bwricc5zqb58qivc"; }; patchPhase = '' substituteInPlace yle-dl --replace '/usr/local/share/' "$out/share/" - - # HACK: work around https://github.com/NixOS/nixpkgs/issues/9593 - substituteInPlace yle-dl --replace '/usr/bin/env python2' '/usr/bin/env python' ''; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a4f837bf8330..750443ace3ac 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.07.16"; + version = "2016.09.19"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "017x2hqc2bacypjmn9ac9f91y9y6afydl0z7dich5l627494hvfg"; + sha256 = "276637e83525778a83d0457f6b9fbc29d6109bc8366d43125432ce835d28545e"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 105ddd1552f2..19e87d3a88b7 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.26.1"; + version = "1.27.1"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "1nf7z55cc6ljpz7zzb8ppg8ybg531gfbhyggya7lnr5ka74h87b5"; + sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix index 4f70888fca63..42b0c37411c8 100644 --- a/pkgs/tools/networking/connman-notify/default.nix +++ b/pkgs/tools/networking/connman-notify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.dbus-python - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk pythonPackages.notify ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Desktop notification integration for connman"; homepage = https://github.com/wavexx/connman-notify; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index c9380761f9fa..4c1fd1b5bbad 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.32"; + version = "1.33"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"; + sha256 = "187mknq2i907gf8dz0i79359gn1qc9mryvqkcgb280d7dw1ld2dw"; }; buildInputs = [ openconnect polkit diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix deleted file mode 100644 index c3c16cc08b44..000000000000 --- a/pkgs/tools/networking/curl/7.15.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null -, scpSupport ? false, libssh2 ? null -, gssSupport ? false, gss ? null -, c-aresSupport ? false, c-ares ? null -, linkStatic ? false -}: - -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert scpSupport -> libssh2 != null; -assert c-aresSupport -> c-ares != null; - -stdenv.mkDerivation rec { - name = "curl-7.15.0"; - - src = fetchurl { - url = "http://curl.haxx.se/download/archeology/${name}.tar.gz"; - sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3"; - }; - - patches = [ ./disable-ca-install.patch ]; - - # Zlib and OpenSSL must be propagated because `libcurl.la' contains - # "-lz -lssl", which aren't necessary direct build inputs of - # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; - optional zlibSupport zlib ++ - optional gssSupport gss ++ - optional c-aresSupport c-ares ++ - optional sslSupport openssl; - - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - ''; - - configureFlags = [ - "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ] - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - - dontDisableStatic = linkStatic; - - LDFLAGS = if linkStatic then "-static" else ""; - CXX = "g++"; - CXXCPP = "g++ -E"; - - # libtool hack to get a static binary. Notice that to 'configure' I passed - # other LDFLAGS, because it doesn't use libtool for linking in the tests. - makeFlags = if linkStatic then "LDFLAGS=-all-static" else ""; - - crossAttrs = { - # We should refer to the cross built openssl - # For the 'urandom', maybe it should be a cross-system option - configureFlags = [ - ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) - "--with-random /dev/urandom" - ] - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - }; - - passthru = { - inherit sslSupport openssl; - }; - - meta = { - homepage = "http://curl.haxx.se/"; - description = "A command line tool for transferring files with URL syntax"; - platforms = with stdenv.lib.platforms; allBut darwin; - broken = true; - }; -} diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 748e28407b26..37226d3dd7b2 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }: stdenv.mkDerivation rec { - name = "davix-0.4.0"; + name = "davix-0.6.4"; buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; src = fetchFromGitHub { owner = "cern-it-sdc-id"; repo = "davix"; - rev = "R_0_4_0-1"; - sha256 = "0i6ica7rmpc3hbybjql5mr500cd43w4qzc69cj1djkc6bqqb752v"; + rev = "R_0_6_4"; + sha256 = "10hg7rs6aams96d4ghldgkrrnikskdpmn8vy6hj5j0s17a2yms6q"; }; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 2b5aae72de42..b122f532630d 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }: +{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 23322d5b8f22..4b14c9db9630 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -40,10 +40,11 @@ stdenv.mkDerivation rec { ln -vs hping3.8.gz "$out/share/man/man8/hping2.8.gz" ''; - meta = { + meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; homepage = "http://www.hping.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 1963454f142c..4f9e8b045b0d 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,23 +1,18 @@ -{ stdenv, fetchurl, gnutls33, autoreconfHook }: +{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }: let - version = "1.99.15"; + version = "2.0"; in stdenv.mkDerivation { name = "inadyn-${version}"; src = fetchurl { - url = "https://github.com/troglobit/inadyn/releases/download/${version}/inadyn-${version}.tar.xz"; - sha256 = "05f7k9wpr0fn44y0pvdrv8xyilygmq3kjhvrwlj6dgg9ackdhkmm"; + url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"; + sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh"; }; - preConfigure = '' - export makeFlags=prefix=$out - ''; - - buildInputs = [ gnutls33 autoreconfHook ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gnutls libite libconfuse ]; meta = { homepage = http://inadyn.sourceforge.net/; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index af5155695f48..c96e5cac367c 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ncurses, autoconf -, withGtk ? false, gtk ? null}: +, withGtk ? false, gtk2 ? null}: -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = optionalString (!withGtk) "--without-gtk"; - buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk; + buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2; meta = { homepage = http://www.bitwizard.nl/mtr/; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b8f886566715..4dea88190d4a 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.12.1"; + name = "nbd-3.14"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di"; + sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; }; + patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; @@ -17,8 +19,7 @@ stdenv.mkDerivation rec { cp README.md "$out/share/doc/${name}/" ''; - # The test suite doesn't succeed in chroot builds. - doCheck = false; + doCheck = true; # Glib calls `clock_gettime', which is in librt. Linking that library # here ensures that a proper rpath is added to the executable so that diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch new file mode 100644 index 000000000000..ad0a7a6f66de --- /dev/null +++ b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch @@ -0,0 +1,12 @@ +diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in +--- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 ++++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 +@@ -403,7 +403,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . man doc tests systemd gznbd ++SUBDIRS = . man doc tests gznbd + sbin_PROGRAMS = @NBD_CLIENT_NAME@ + noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la + libcliserv_la_SOURCES = cliserv.h cliserv.c diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index 9644fa069722..e354ad223b8c 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json deleted file mode 100644 index 943967b73428..000000000000 --- a/pkgs/tools/networking/ngrok/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/inconshreveable/go-vhost", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-vhost", - "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c", - "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32" - } - }, - { - "goPackagePath": "code.google.com/p/log4go", - "fetch": { - "type": "git", - "url": "https://github.com/ccpaging/log4go", - "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8", - "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2" - } - }, - { - "goPackagePath": "github.com/daviddengcn/go-colortext", - "fetch": { - "type": "git", - "url": "https://github.com/daviddengcn/go-colortext", - "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57", - "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-yaml/yaml", - "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a", - "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/go-update.v0", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-update", - "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066", - "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kr/binarydist", - "fetch": { - "type": "git", - "url": "https://github.com/kr/binarydist", - "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd", - "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3" - } - } -] diff --git a/pkgs/tools/networking/ngrok/deps.nix b/pkgs/tools/networking/ngrok/deps.nix new file mode 100644 index 000000000000..1db3c3e65191 --- /dev/null +++ b/pkgs/tools/networking/ngrok/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-vhost"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-vhost"; + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + } + { + goPackagePath = "code.google.com/p/log4go"; + fetch = { + type = "git"; + url = "https://github.com/ccpaging/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + } +] diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8f4c0aa54dfa..a6e4b7c4c209 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -17,9 +17,10 @@ let sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; }; + # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; - sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=477bb7636238c106f8cd7c868a8c0c5eabcfb3db"; + sha256 = "1kcx2rw6z7y591vr60ww2m2civ0cx6f6awdpi66p1sric9b65si3"; }; in diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e666cf7f605d..3f4f1244e1b7 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig }: +{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig +, pkcs11Support ? false, pkcs11helper ? null, +}: + +assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; @@ -13,13 +17,14 @@ stdenv.mkDerivation rec { patches = optional stdenv.isLinux ./systemd-notify.patch; buildInputs = [ lzo openssl pkgconfig ] - ++ optionals stdenv.isLinux [ pam systemd iproute ]; - - configureFlags = optionalString stdenv.isLinux '' - --enable-systemd - --enable-iproute2 - IPROUTE=${iproute}/sbin/ip - ''; + ++ optionals stdenv.isLinux [ pam systemd iproute ] + ++ optional pkcs11Support pkcs11helper; + + configureFlags = optionals stdenv.isLinux [ + "--enable-systemd" + "--enable-iproute2" + "IPROUTE=${iproute}/sbin/ip" ] + ++ optional pkcs11Support "--enable-pkcs11"; postInstall = '' mkdir -p $out/share/doc/openvpn/examples diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index a29503aba1e7..901d84b46926 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bison, pkgconfig -, glib, gtk, libxml2, gettext, zlib, binutils, gnutls }: +, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: let name = "gtk-gnutella"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ bison binutils gettext pkgconfig ]; - buildInputs = [ glib gnutls gtk libxml2 zlib ]; + buildInputs = [ glib gnutls gtk2 libxml2 zlib ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 6231d5005dc9..a13d6599ffb0 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json deleted file mode 100644 index e73edde322fc..000000000000 --- a/pkgs/tools/networking/s3gof3r/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/networking/s3gof3r/deps.nix b/pkgs/tools/networking/s3gof3r/deps.nix new file mode 100644 index 000000000000..49c5d600be2f --- /dev/null +++ b/pkgs/tools/networking/s3gof3r/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 59bbd918d643..d693b8db953a 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -4,7 +4,7 @@ , locale ? "C" }: let - inherit (pythonPackages) python pygobject dbus-python pyGtkGlade pycairo; + inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -38,15 +38,15 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 5ace2ad618f2..45bd2abe8ece 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.6"; + name = "disnix-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36897417/download/4/disnix-0.6.tar.gz; - sha256 = "1i3wxp7zn765gg0sri2jsdabkj0l7aqi8cxp46pyybdf4852d6gd"; + url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz; + sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj"; }; buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 25df812254c7..08f58f668ece 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.6"; + name = "dysnomia-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36895408/download/1/dysnomia-0.6.tar.gz; - sha256 = "1gg2avj57amxf2qi5zjk0rjyakvy5bqaar2r2151cvjlas1z1alw"; + url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz; + sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 89d795c8e505..b879ef002b12 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json deleted file mode 100644 index 3dd8e8f6ab31..000000000000 --- a/pkgs/tools/package-management/gx/deps.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "github.com/anacrolix/missinggo", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/missinggo", - "rev": "e40875155efce3d98562ca9e265e152c364ada3e", - "sha256": "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg" - } - }, - { - "goPackagePath": "github.com/anacrolix/sync", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/sync", - "rev": "812602587b72df6a2a4f6e30536adc75394a374b", - "sha256": "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l" - } - }, - { - "goPackagePath": "github.com/anacrolix/utp", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/utp", - "rev": "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0", - "sha256": "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165", - "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd" - } - }, - { - "goPackagePath": "github.com/bradfitz/iter", - "fetch": { - "type": "git", - "url": "https://github.com/bradfitz/iter", - "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345", - "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19", - "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq" - } - }, - { - "goPackagePath": "github.com/ipfs/go-ipfs-api", - "fetch": { - "type": "git", - "url": "https://github.com/ipfs/go-ipfs-api", - "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac", - "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc" - } - }, - { - "goPackagePath": "github.com/jbenet/go-base58", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-base58", - "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d", - "sha256": "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr", - "rev": "f3dff105e44513821be8fbe91c89ef15eff1b4d4", - "sha256": "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr-net", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr-net", - "rev": "d4cfd691db9f50e430528f682ca603237b0eaae0", - "sha256": "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multihash", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multihash", - "rev": "e8d2374934f16a971d1e94a864514a21ac74bf7f", - "sha256": "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp" - } - }, - { - "goPackagePath": "github.com/jbenet/go-os-rename", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-os-rename", - "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2", - "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random", - "rev": "384f606e91f542a98e779e652eed88051618f0f7", - "sha256": "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random-files", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random-files", - "rev": "737479700b40b4b50e914e963ce8d9d44603e3c8", - "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9", - "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23" - } - }, - { - "goPackagePath": "github.com/sabhiram/go-git-ignore", - "fetch": { - "type": "git", - "url": "https://github.com/sabhiram/go-git-ignore", - "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37", - "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/go-multipart-files", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/go-multipart-files", - "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2", - "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/json-filter", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/json-filter", - "rev": "e9937f5649231265a56d0a419f062530425401a1", - "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/stump", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/stump", - "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5", - "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/tar-utils", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/tar-utils", - "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7", - "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c", - "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq" - } - } -] diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix new file mode 100644 index 000000000000..19372f807c21 --- /dev/null +++ b/pkgs/tools/package-management/gx/deps.nix @@ -0,0 +1,200 @@ +[ + { + goPackagePath = "github.com/anacrolix/missinggo"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/missinggo"; + rev = "e40875155efce3d98562ca9e265e152c364ada3e"; + sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; + }; + } + { + goPackagePath = "github.com/anacrolix/sync"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/sync"; + rev = "812602587b72df6a2a4f6e30536adc75394a374b"; + sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; + }; + } + { + goPackagePath = "github.com/anacrolix/utp"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/utp"; + rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; + sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; + sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + }; + } + { + goPackagePath = "github.com/bradfitz/iter"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/iter"; + rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; + sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; + sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-api"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-api"; + rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; + sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + }; + } + { + goPackagePath = "github.com/jbenet/go-base58"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-base58"; + rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; + sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr"; + rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; + sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr-net"; + rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; + sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multihash"; + rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; + sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; + }; + } + { + goPackagePath = "github.com/jbenet/go-os-rename"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-os-rename"; + rev = "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2"; + sha256 = "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random"; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random-files"; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; + sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + }; + } + { + goPackagePath = "github.com/sabhiram/go-git-ignore"; + fetch = { + type = "git"; + url = "https://github.com/sabhiram/go-git-ignore"; + rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; + sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-multipart-files"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-multipart-files"; + rev = "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2"; + sha256 = "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/json-filter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/json-filter"; + rev = "e9937f5649231265a56d0a419f062530425401a1"; + sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/stump"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/stump"; + rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; + sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/tar-utils"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/tar-utils"; + rev = "beab27159606f5a7c978268dd1c3b12a0f1de8a7"; + sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; + sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 912c870c27b0..877d5c6540a0 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; }; - goDeps = ../deps.json; + goDeps = ../deps.nix; extraSrcs = [ { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1563af1374ca..71938e37bfed 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = false; + doInstallCheck = true; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index f4a7273d8cc7..dee408e1d65a 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp"; }; + outputs = [ "out" "dev" "man" ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -15,6 +17,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + configureFlags = [ + "--with-external-db" + "--with-lua" + "--enable-python" + "--localstatedir=/var" + "--sharedstatedir=/com" + ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} @@ -22,7 +32,18 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; - configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com"; + preFixup = '' + # Don't keep a reference to RPM headers or manpages + for f in $out/lib/rpm/platform/*/macros; do + substituteInPlace $f --replace "$dev" "/rpm-dev-path-was-here" + substituteInPlace $f --replace "$man" "/rpm-man-path-was-here" + done + + # Avoid macros like '%__ld' pointing to absolute paths + for tool in ld nm objcopy objdump strip; do + sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/" + done + ''; meta = with stdenv.lib; { homepage = http://www.rpm.org/; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5e8d260d6936..e7673cf58422 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json deleted file mode 100644 index 3d40bfd2cee0..000000000000 --- a/pkgs/tools/security/hologram/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "github.com/aybabtme/rgbterm", - "fetch": { - "type": "git", - "url": "https://github.com/aybabtme/rgbterm", - "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283", - "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam" - } - }, - { - "goPackagePath": "github.com/vaughan0/go-ini", - "fetch": { - "type": "git", - "url": "https://github.com/vaughan0/go-ini", - "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1", - "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4", - "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9" - } - }, - { - "goPackagePath": "github.com/goamz/goamz", - "fetch": { - "type": "git", - "url": "https://github.com/goamz/goamz", - "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7", - "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b" - } - }, - { - "goPackagePath": "github.com/nmcclain/asn1-ber", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "gopkg.in/asn1-ber.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "github.com/peterbourgon/g2s", - "fetch": { - "type": "git", - "url": "https://github.com/peterbourgon/g2s", - "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc", - "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj" - } - }, - { - "goPackagePath": "github.com/nmcclain/ldap", - "fetch": { - "type": "git", - "url": "https://github.com/go-ldap/ldap", - "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29", - "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz" - } - } -] diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix new file mode 100644 index 000000000000..2c4cdbe84f00 --- /dev/null +++ b/pkgs/tools/security/hologram/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "github.com/aybabtme/rgbterm"; + fetch = { + type = "git"; + url = "https://github.com/aybabtme/rgbterm"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; + sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; + }; + } + { + goPackagePath = "github.com/goamz/goamz"; + fetch = { + type = "git"; + url = "https://github.com/goamz/goamz"; + rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; + sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; + }; + } + { + goPackagePath = "github.com/nmcclain/asn1-ber"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "github.com/peterbourgon/g2s"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/g2s"; + rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; + sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; + }; + } + { + goPackagePath = "github.com/nmcclain/ldap"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; + sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; + }; + } +] diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index f247f8c4e89e..106fbf0a150a 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }: +{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }: let dynlibPath = stdenv.lib.makeLibraryPath - [ gtk atk gdk_pixbuf pango ]; + [ gtk2 atk gdk_pixbuf pango ]; in stdenv.mkDerivation rec { name = "jd-gui-${version}"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f9c7dba5660b..3bc5d4158346 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false , libX11 ? null -, gtk ? null +, gtk2 ? null , pythonPackages , makeWrapper ? null }: @@ -9,7 +9,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; + inherit (pythonPackages) python pygtk pygobject2 pycairo pysqlite; in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject2})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 ''; buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] ++ optionals graphicalSupport [ - libX11 gtk pygtk pysqlite pygobject pycairo + libX11 gtk2 pygtk pysqlite pygobject2 pycairo ]; meta = { diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 79f6a6c1c288..01d5dff4d751 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which +, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which, procps , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null @@ -64,10 +64,11 @@ stdenv.mkDerivation rec { wrapperPath = with stdenv.lib; makeBinPath ([ coreutils - gnused getopt git gnupg + gnused + procps pwgen tree which diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b834cc6adc53..64c12dc6e5e3 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit -, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils, gawk -, makeWrapper }: +{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep +, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper +}: stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.3.2"; + version = "1.4.3"; - src = fetchgit { - url = "https://github.com/carnager/rofi-pass"; - rev = "refs/tags/${version}"; - sha256 = "1xqp8s0yyjs2ca9mf8lbz8viwl9xzxf5kk1v68v9hqdgxj26wgls"; + src = fetchFromGitHub { + owner = "carnager"; + repo = "rofi-pass"; + rev = version; + sha256 = "09wpkxg5b7xicdisgbhlfr8vs1iv7z9sc58pjl0p198yap57khq5"; }; buildInputs = [ makeWrapper ]; @@ -18,22 +19,25 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a $src/rofi-pass $out/bin/rofi-pass + cp -a rofi-pass $out/bin/rofi-pass mkdir -p $out/share/doc/rofi-pass/ - cp -a $src/config.example $out/share/doc/rofi-pass/config.example + cp -a config.example $out/share/doc/rofi-pass/config.example ''; wrapperPath = with stdenv.lib; makeBinPath [ coreutils findutils + gawk gnugrep + gnused + libnotify pass pwgen rofi utillinux + xclip xdotool - gawk ]; fixupPhase = '' diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index da45866ed2fe..900ad39ecb23 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk +, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt ]; in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.4"; + version = "6.0.5"; 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 - "14ds39frkg4hbim0icb372crink902f7i6mqj6dmbaiz2fi88y8q" else - "1d2mg46dg5y16h5lwzq0ilv3zk8aqy3vg3j4a5c3wzsxj0hpl4v5"; + "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else + "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 518fb4944f49..b5f1af6dfeda 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }: +{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }: stdenv.mkDerivation rec { version = "0.14.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ]; + buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ]; pythonPath = with pythonPackages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 5da87f4ce46e..ebe654d946e3 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json deleted file mode 100644 index 407870efdaa3..000000000000 --- a/pkgs/tools/system/confd/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/kelseyhightower/memkv", - "fetch": { - "type": "git", - "url": "https://github.com/kelseyhightower/memkv", - "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580", - "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540" - } - }, - { - "goPackagePath": "github.com/armon/consul-api", - "fetch": { - "type": "git", - "url": "https://github.com/armon/consul-api", - "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5", - "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp" - } - }, - { - "goPackagePath": "github.com/garyburd/redigo", - "fetch": { - "type": "git", - "url": "https://github.com/garyburd/redigo", - "rev": "535138d7bcd717d6531c701ef5933d98b1866257", - "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" - } - } -] diff --git a/pkgs/tools/system/confd/deps.nix b/pkgs/tools/system/confd/deps.nix new file mode 100644 index 000000000000..74467ddf9cc7 --- /dev/null +++ b/pkgs/tools/system/confd/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/memkv"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/memkv"; + rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580"; + sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5"; + sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + } +] diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 7800bfa08313..1d33e5fb09fe 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }: +{ stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: stdenv.mkDerivation rec { name = "gdmap-0.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk pkgconfig libxml2 intltool gettext ]; + buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 02b331a36deb..dc5b75b0f4a2 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl -, withGUI? false, gtk? null, pkgconfig? null, sqlite? null # compile GUI - }: -stdenv.mkDerivation rec { +{ stdenv, lib, fetchurl, fetchpatch +, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI +}: - name = "lshw-${version}"; - version = "02.17b"; +let numVersion = "02.18"; # :( +in +stdenv.mkDerivation rec { + name = "lshw-${numVersion}b"; + version = "B.${numVersion}"; src = fetchurl { - url = http://ezix.org/software/files/lshw-B.02.17.tar.gz; - sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b"; + url = "http://ezix.org/software/files/lshw-${version}.tar.gz"; + sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; }; - buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ]; + patches = [ (fetchpatch { + # fix crash in scan_dmi_sysfs() when run as non-root + url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch"; + sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; + })]; + + buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; - postBuild = if withGUI then "make gui" else ""; + installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; - installPhase = '' - make DESTDIR="$out" install - ${if withGUI then "make DESTDIR=$out install-gui" else ""} - mv $out/usr/* $out - rmdir $out/usr - mv $out/sbin $out/bin - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://ezix.org/project/wiki/HardwareLiSter; diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix new file mode 100644 index 000000000000..59df5ee90a4e --- /dev/null +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "SystemdJournal2Gelf-${version}"; + version = "20160414"; + + goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; + + src = fetchFromGitHub { + rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f"; + owner = "parse-nl"; + repo = "SystemdJournal2Gelf"; + sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Export entries from systemd's journal and send them to a graylog server using gelf"; + license = licenses.bsd2; + maintainers = with maintainers; [ fadenb fpletz globin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/pkgs/tools/system/systemd-journal2gelf/deps.nix new file mode 100644 index 000000000000..2e0988e81054 --- /dev/null +++ b/pkgs/tools/system/systemd-journal2gelf/deps.nix @@ -0,0 +1,11 @@ +[ +{ + goPackagePath = "github.com/DECK36/go-gelf"; + fetch = { + type = "git"; + url = "https://github.com/DECK36/go-gelf"; + rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f"; + sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay"; + }; +} +] diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 728e9de8b488..df6a1119800e 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, ghostscript, perl, groff }: +{ stdenv, fetchurl, perl, groff +, ghostscript #for postscript and html output +, psutils, netpbm #for html output +}: stdenv.mkDerivation rec { name = "groff-1.22.3"; @@ -12,7 +15,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - buildInputs = [ ghostscript ]; + postPatch = stdenv.lib.optionalString (psutils != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "psselect" "${psutils}/bin/psselect" + '' + stdenv.lib.optionalString (netpbm != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "pnmcut" "${netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${netpbm}/bin/pnmtopng" + substituteInPlace tmac/www.tmac \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage" + ''; + + buildInputs = [ ghostscript psutils netpbm ]; nativeBuildInputs = [ perl ]; # Builds running without a chroot environment may detect the presence @@ -20,7 +37,11 @@ stdenv.mkDerivation rec { # package. To avoid this issue, X11 support is explicitly disabled. # Note: If we ever want to *enable* X11 support, then we'll probably # have to pass "--with-appresdir", too. - configureFlags = "--without-x"; + configureFlags = [ + "--without-x" + ] ++ stdenv.lib.optionals (ghostscript != null) [ + "--with-gs=${ghostscript}/bin/gs" + ]; doCheck = true; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 21a49d493aa7..502af44262b6 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json deleted file mode 100644 index 5578478eb4c3..000000000000 --- a/pkgs/tools/text/platinum-searcher/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/monochromegane/conflag", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/conflag", - "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", - "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-home", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-home", - "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", - "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" - } - }, - { - "goPackagePath": "github.com/monochromegane/terminal", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/terminal", - "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", - "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-gitignore", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-gitignore", - "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", - "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" - } - }, - { - "goPackagePath": "github.com/shiena/ansicolor", - "fetch": { - "type": "git", - "url": "https://github.com/shiena/ansicolor", - "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", - "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" - } - } -] diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix new file mode 100644 index 000000000000..da3f3ff1b8ab --- /dev/null +++ b/pkgs/tools/text/platinum-searcher/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/monochromegane/conflag"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/conflag"; + rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; + sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-home"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/go-home"; + rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; + sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; + }; + } + { + goPackagePath = "github.com/monochromegane/terminal"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/terminal"; + rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; + sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-gitignore"; + fetch = { + type = "git"; + url = "https://github.com/monochromegane/go-gitignore"; + rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; + sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + fetch = { + type = "git"; + url = "https://github.com/shiena/ansicolor"; + rev = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b"; + sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; + }; + } +] diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 9a93b64e3693..42a2ab852e1d 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1nb042k420xr6000ipwhqn41vg8jfp6ghq4z7y1sjnndkrhclzm1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with lib; { description = "sift is a fast and powerful alternative to grep"; diff --git a/pkgs/tools/text/sift/deps.json b/pkgs/tools/text/sift/deps.json deleted file mode 100644 index 3869e6e5ca9a..000000000000 --- a/pkgs/tools/text/sift/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/svent/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-flags", - "rev": "4bcbad344f0318adaf7aabc16929701459009aa3", - "sha256": "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34" - } - }, - { - "goPackagePath": "github.com/svent/go-nbreader", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-nbreader", - "rev": "7cef48da76dca6a496faa7fe63e39ed665cbd219", - "sha256": "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r" - } - } -] diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/tools/text/sift/deps.nix new file mode 100644 index 000000000000..038555fa3cab --- /dev/null +++ b/pkgs/tools/text/sift/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/svent/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/svent/go-flags"; + rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; + sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; + }; + } + { + goPackagePath = "github.com/svent/go-nbreader"; + fetch = { + type = "git"; + url = "https://github.com/svent/go-nbreader"; + rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; + sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; + }; + } +] diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index daa79d8e352c..05ce5057347d 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl -, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: +, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { name = "xmlroff-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { glib pango pangoxsl - gtk + gtk2 popt ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index ebfff5dbabcd..71b1b43f6535 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx , withMinimal ? false }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ libdv libjpeg libpng pkgconfig ] - ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + ++ lib.optional (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ee3aaa70b24e..0c93a212f802 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -26,7 +26,6 @@ doNotDisplayTwice rec { bar-xft = lemonbar-xft; # added 2015-01-16 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbotSlave = buildbot-slave; # added 2014-12-09 bundler_HEAD = bundler; # added 2015-11-15 checkbashism = checkbashisms; # added 2016-08-16 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 @@ -100,6 +99,7 @@ doNotDisplayTwice rec { spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + sshfsFuse = sshfs-fuse; # added 2016-09 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = qt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efa0edac8f73..4d8645639852 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,7 +417,7 @@ in arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino = self.arduino-core.override { withGui = true; }; + arduino = arduino-core.override { withGui = true; }; arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; @@ -471,12 +471,12 @@ in amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (self.amule.override { + amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; daemon = true; }); - amuleGui = appendToName "gui" (self.amule.override { + amuleGui = appendToName "gui" (amule.override { monolithic = false; client = true; }); @@ -521,9 +521,9 @@ in pkgs_i686 = pkgsi686Linux; }; - inherit (self.androidenv) androidsdk_4_4 androidndk; + inherit (androidenv) androidsdk_4_4 androidndk; - androidsdk = self.androidenv.androidsdk_6_0; + androidsdk = androidenv.androidsdk_6_0; androidsdk_extras = self.androidenv.androidsdk_6_0_extras; @@ -534,7 +534,11 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; - aria = self.aria2; + aria = aria2; + + aspcud = callPackage ../tools/misc/aspcud { + boost = boost155; + }; at = callPackage ../tools/system/at { }; @@ -600,9 +604,7 @@ in bitbucket-cli = pythonPackages.bitbucket-cli; - blink = callPackage ../applications/networking/instant-messengers/blink { - gnutls = gnutls33; - }; + blink = callPackage ../applications/networking/instant-messengers/blink { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -662,15 +664,15 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { + cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ self.makeWrapper ]; + executableToolDepends = [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${self.nix-prefetch-scripts}/bin" + makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} ''; @@ -710,6 +712,8 @@ in ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clasp = callPackage ../tools/misc/clasp { }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -728,6 +732,8 @@ in consul-template = callPackage ../tools/system/consul-template { }; + corebird = callPackage ../applications/networking/corebird { }; + corosync = callPackage ../servers/corosync { }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -841,8 +847,14 @@ in glide = callPackage ../development/tools/glide { }; + glock = callPackage ../development/tools/glock { }; + gmic = callPackage ../tools/graphics/gmic { }; + goa = callPackage ../development/tools/goa { }; + + gringo = callPackage ../tools/misc/gringo { }; + gti = callPackage ../tools/misc/gti { }; heatseeker = callPackage ../tools/misc/heatseeker { }; @@ -924,12 +936,12 @@ in enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (self.asciidoc.override { + asciidoc-full = appendToName "full" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); - asciidoc-full-with-plugins = appendToName "full-with-plugins" (self.asciidoc.override { + asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; enableExtraPlugins = true; @@ -937,6 +949,8 @@ in asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; + asunder = callPackage ../applications/audio/asunder { }; + autossh = callPackage ../tools/networking/autossh { }; asynk = callPackage ../tools/networking/asynk { }; @@ -1032,9 +1046,9 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; - libceph = self.ceph.lib; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; - ceph-dev = self.ceph; + ceph-dev = ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); cfdg = callPackage ../tools/graphics/cfdg { @@ -1066,7 +1080,7 @@ in gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; - clementineFree = self.clementine.free; + clementineFree = clementine.free; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1236,15 +1250,15 @@ in cudatoolkit7 cudatoolkit75; - cudatoolkit = self.cudatoolkit7; + cudatoolkit = cudatoolkit7; cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { - cudatoolkit = self.cudatoolkit75; + cudatoolkit = cudatoolkit75; }; - curlFull = self.curl.override { + curlFull = curl.override { idnSupport = true; ldapSupport = true; gssSupport = true; @@ -1258,11 +1272,6 @@ in scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; - curl3 = callPackage ../tools/networking/curl/7.15.nix rec { - zlibSupport = true; - sslSupport = zlibSupport; - }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; cunit = callPackage ../tools/misc/cunit { }; @@ -1384,6 +1393,8 @@ in inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; }; + docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + dog = callPackage ../tools/system/dog { }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -1810,17 +1821,17 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; - gnupg1 = self.gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; - gnupg = self.gnupg21; + gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; - gnuplot_qt = self.gnuplot.override { withQt = true; }; + gnuplot_qt = gnuplot.override { withQt = true; }; # must have AquaTerm installed separately - gnuplot_aquaterm = self.gnuplot.override { aquaterm = true; }; + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; gnused = callPackage ../tools/text/gnused { }; @@ -1897,6 +1908,8 @@ in groff = callPackage ../tools/text/groff { ghostscript = null; + psutils = null; + netpbm = null; }; groonga = callPackage ../servers/search/groonga { }; @@ -1909,15 +1922,15 @@ in trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = self.grub2_full; + grub2 = grub2_full; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = self.grub2_full.override { + grub2_efi = grub2_full.override { efiSupport = true; }; - grub2_light = self.grub2_full.override { + grub2_light = grub2_full.override { zfsSupport = false; }; @@ -1931,11 +1944,11 @@ in sbsigntool = callPackage ../tools/security/sbsigntool { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; gssdp = callPackage ../development/libraries/gssdp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gt5 = callPackage ../tools/system/gt5 { }; @@ -1958,7 +1971,7 @@ in gup = callPackage ../development/tools/build-managers/gup {}; gupnp = callPackage ../development/libraries/gupnp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gupnp_av = callPackage ../development/libraries/gupnp-av {}; @@ -2018,16 +2031,16 @@ in mpi = null; }; - hdf5-mpi = appendToName "mpi" (self.hdf5.override { + hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpi = pkgs.openmpi; }); - hdf5-cpp = appendToName "cpp" (self.hdf5.override { + hdf5-cpp = appendToName "cpp" (hdf5.override { cpp = true; }); - hdf5-fortran = appendToName "fortran" (self.hdf5.override { + hdf5-fortran = appendToName "fortran" (hdf5.override { inherit gfortran; }); @@ -2145,7 +2158,7 @@ in iperf2 = callPackage ../tools/networking/iperf/2.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; - iperf = self.iperf3; + iperf = iperf3; ipfs = callPackage ../applications/networking/ipfs { }; @@ -2165,7 +2178,7 @@ in ised = callPackage ../tools/misc/ised {}; - isl = self.isl_0_15; + isl = isl_0_15; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; @@ -2436,6 +2449,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libite = callPackage ../development/libraries/libite { }; + liboauth = callPackage ../development/libraries/liboauth { }; libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; @@ -2558,6 +2573,8 @@ in man-db = callPackage ../tools/misc/man-db { }; + mandoc = callPackage ../tools/misc/mandoc { }; + mawk = callPackage ../tools/text/mawk { }; mbox = callPackage ../tools/security/mbox { }; @@ -2593,7 +2610,7 @@ in mdbtools = callPackage ../tools/misc/mdbtools { }; mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; }; mdk = callPackage ../development/tools/mdk { }; @@ -2780,7 +2797,7 @@ in networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; @@ -3183,6 +3200,8 @@ in podiff = callPackage ../tools/text/podiff { }; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; + poedit = callPackage ../tools/text/poedit { }; polipo = callPackage ../servers/polipo { }; @@ -3353,7 +3372,7 @@ in reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome) gnome_vfs GConf; + inherit (gnome2) gnome_vfs GConf; }; remarkjs = callPackage ../development/web/remarkjs { }; @@ -3605,7 +3624,7 @@ in squashfsTools = callPackage ../tools/filesystems/squashfs { }; - sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshuttle = callPackage ../tools/security/sshuttle { }; @@ -3686,7 +3705,7 @@ in stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; @@ -3722,6 +3741,8 @@ in telnet = callPackage ../tools/networking/telnet { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texlive.combined.scheme-small; extraFonts = true; @@ -3904,7 +3925,7 @@ in vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; inherit (gnome3) gexiv2; }; @@ -4209,13 +4230,13 @@ in xflux-gui = callPackage ../tools/misc/xflux/gui.nix { pexpect = pythonPackages.pexpect; pyGtkGlade = pythonPackages.pyGtkGlade; - pygobject = pythonPackages.pygobject; + pygobject = pythonPackages.pygobject2; pyxdg = pythonPackages.pyxdg; - gnome_python = gnome.gnome_python; + gnome_python = gnome2.gnome_python; }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - libxfs = self.xfsprogs.dev; # outputs TODO + libxfs = xfsprogs.dev; # outputs TODO xml2 = callPackage ../tools/text/xml/xml2 { }; @@ -4377,7 +4398,7 @@ in }; boo = callPackage ../development/compilers/boo { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; colm = callPackage ../development/compilers/colm { }; @@ -4400,6 +4421,7 @@ in clang = llvmPackages.clang; + clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_36 = llvmPackages_36.clang; @@ -4410,7 +4432,7 @@ in clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; }; - clangSelf = self.clangWrapSelf llvmPackagesSelf.clang; + clangSelf = clangWrapSelf llvmPackagesSelf.clang; clangWrapSelf = build: callPackage ../build-support/cc-wrapper { cc = build; @@ -4658,8 +4680,7 @@ in langC = false; profiledCompiler = false; inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; }); gnat = gnat45; # failed to make 4.6 or 4.8 build @@ -4693,7 +4714,7 @@ in profiledCompiler = false; }); - ghdl_mcode = callPackage ../development/compilers/ghdl { }; + ghdl_mcode = callPackage_i686 ../development/compilers/ghdl { }; gcl = callPackage ../development/compilers/gcl { gmp = gmp4; @@ -4721,7 +4742,7 @@ in releaseType = "update"; sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; }; - gcc-arm-embedded = self.gcc-arm-embedded-5; + gcc-arm-embedded = gcc-arm-embedded-5; gforth = callPackage ../development/compilers/gforth {}; @@ -4735,7 +4756,7 @@ in overrides = config.haskellPackageOverrides or (self: super: {}); }; - inherit (self.haskellPackages) ghc; + inherit (haskellPackages) ghc; cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; @@ -4780,7 +4801,7 @@ in stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; }); - go = self.go_1_7; + go = go_1_7; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -4798,7 +4819,7 @@ in jdk = jdk8; }; - icedtea_web = self.icedtea8_web; + icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; @@ -4826,50 +4847,50 @@ in bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; }; - openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; + openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; - jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; + jdk7 = openjdk7 // { outputs = [ "out" ]; }; jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk7.jre // { outputs = [ "jre" ]; })); + (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; + jdk8 = openjdk8 // { outputs = [ "out" ]; }; jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk8.jre // { outputs = [ "jre" ]; })); + (openjdk8.jre // { outputs = [ "jre" ]; })); - jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; - jre = if stdenv.isDarwin then self.jre7 else self.jre8; + jdk = if stdenv.isDarwin then jdk7 else jdk8; + jre = if stdenv.isDarwin then jre7 else jre8; openshot-qt = callPackage ../applications/video/openshot-qt { }; - oraclejdk = self.jdkdistro true false; + oraclejdk = pkgs.jdkdistro true false; - oraclejdk7 = self.oraclejdk7distro true false; + oraclejdk7 = pkgs.oraclejdk7distro true false; - oraclejdk7psu = self.oraclejdk7psu_distro true false; + oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; - oraclejdk8 = self.oraclejdk8distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; - oraclejdk8psu = self.oraclejdk8psu_distro true false; + oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejre = lowPrio (self.jdkdistro false false); + oraclejre = lowPrio (pkgs.jdkdistro false false); - oraclejre7 = lowPrio (self.oraclejdk7distro false false); + oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); - oraclejre7psu = lowPrio (self.oraclejdk7psu_distro false false); + oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); - oraclejre8 = lowPrio (self.oraclejdk8distro false false); + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); - oraclejre8psu = lowPrio (self.oraclejdk8psu_distro false false); + oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - jrePlugin = self.jre8Plugin; + jrePlugin = jre8Plugin; - jre6Plugin = lowPrio (self.jdkdistro false true); + jre6Plugin = lowPrio (pkgs.jdkdistro false true); - jre7Plugin = lowPrio (self.oraclejdk7distro false true); + jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true); - jre8Plugin = lowPrio (self.oraclejdk8distro false true); + jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); supportsJDK = system == "i686-linux" || @@ -4925,17 +4946,18 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; - llvm = self.llvmPackages.llvm; + llvm = llvmPackages.llvm; - llvm_38 = self.llvmPackages_38.llvm; - llvm_37 = self.llvmPackages_37.llvm; - llvm_36 = self.llvmPackages_36.llvm; - llvm_35 = self.llvmPackages_35.llvm; - llvm_34 = self.llvmPackages_34.llvm; + llvm_39 = llvmPackages_39.llvm; + llvm_38 = llvmPackages_38.llvm; + llvm_37 = llvmPackages_37.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.llvm; + llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs self.llvmPackages_37; + llvmPackages = recurseIntoAttrs llvmPackages_37; - llvmPackagesSelf = self.llvmPackages_34.override { + llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; }; @@ -5245,10 +5267,10 @@ in lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (gnome) libgnomecanvas libglade gtksourceview; + inherit (gnome2) libgnomecanvas libglade gtksourceview; }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { - inherit (gnome) libgnomecanvas libglade gtksourceview; + inherit (gnome2) libgnomecanvas libglade gtksourceview; }; lablgtk-extras = @@ -5304,6 +5326,8 @@ in ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + frontc = callPackage ../development/ocaml-modules/frontc { }; + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; @@ -5438,9 +5462,7 @@ in oasis = ocaml_oasis; }; - qtest = callPackage ../development/ocaml-modules/qtest { - oasis = ocaml_oasis; - }; + qtest = callPackage ../development/ocaml-modules/qtest { }; re = callPackage ../development/ocaml-modules/re { }; @@ -5557,6 +5579,7 @@ in }; }); + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; @@ -5614,7 +5637,7 @@ in }; thrust = callPackage ../development/tools/thrust { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; tinycc = callPackage ../development/compilers/tinycc { }; @@ -5756,10 +5779,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; odbcSupport = true; }; - erlang = self.erlangR18; - erlang_odbc = self.erlangR18_odbc; - erlang_javac = self.erlangR18_javac; - erlang_odbc_javac = self.erlangR18_odbc_javac; + erlang = erlangR18; + erlang_odbc = erlangR18_odbc; + erlang_javac = erlangR18_javac; + erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; @@ -5783,7 +5806,7 @@ in guile_2_0 = callPackage ../development/interpreters/guile { }; - guile = self.guile_2_0; + guile = guile_2_0; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -5799,7 +5822,7 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; - lxappearance = callPackage ../applications/misc/lxappearance {}; + lxappearance = callPackage ../desktops/lxde/core/lxappearance {}; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; @@ -5811,7 +5834,7 @@ in love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love = self.love_0_10; + love = love_0_10; ### LUA MODULES @@ -5826,22 +5849,22 @@ in lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix { compat = true; }; - lua5 = self.lua5_2_compat; - lua = self.lua5; + lua5 = lua5_2_compat; + lua = lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); - luaPackages = self.lua52Packages; + luaPackages = lua52Packages; - lua5_1_sockets = self.lua51Packages.luasocket; + lua5_1_sockets = lua51Packages.luasocket; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; luajit = callPackage ../development/interpreters/luajit {}; - luarocks = self.luaPackages.luarocks; + luarocks = luaPackages.luarocks; toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( @@ -6070,7 +6093,7 @@ in version = "2.8"; }; - amdappsdk = self.amdappsdk28; + amdappsdk = amdappsdk28; amdappsdkFull = callPackage ../development/misc/amdapp-sdk { version = "2.8"; @@ -6094,8 +6117,8 @@ in guileCairo = callPackage ../development/guile-modules/guile-cairo { }; guileGnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome.GConf; - inherit (gnome) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; + gconf = gnome2.GConf; + inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; guile_lib = callPackage ../development/guile-modules/guile-lib { }; @@ -6141,7 +6164,7 @@ in antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; - ant = self.apacheAnt; + ant = apacheAnt; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -6165,7 +6188,7 @@ in autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = self.automake115x; + automake = automake115x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -6189,13 +6212,13 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; }; + bazel = callPackage ../development/tools/build-managers/bazel { }; bear = callPackage ../development/tools/build-managers/bear { }; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin then self.darwin.binutils else self.binutils-raw; + binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; @@ -6213,17 +6236,13 @@ in bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = self.bison3; + bison = bison3; bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; - buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { - inherit (pythonPackages) twisted; - }; - - buildbot = callPackage ../development/tools/build-managers/buildbot/9.nix { }; + buildbot = callPackage ../development/tools/build-managers/buildbot { }; buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { }; buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { }; buildbot-ui = self.buildbot.override { @@ -6273,6 +6292,8 @@ in cgdb = callPackage ../development/tools/misc/cgdb { }; + cheat = callPackage ../applications/misc/cheat { }; + chefdk = callPackage ../development/tools/chefdk { ruby = ruby_2_0; }; @@ -6283,7 +6304,7 @@ in checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; @@ -6305,7 +6326,7 @@ in ctodo = callPackage ../applications/misc/ctodo { }; - cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { wantPS = stdenv.isDarwin; inherit (darwin) ps; }; @@ -6315,9 +6336,9 @@ in inherit (darwin) ps; }; - cmakeCurses = self.cmake.override { useNcurses = true; }; + cmakeCurses = cmake.override { useNcurses = true; }; - cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; + cmakeWithGui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 extra-cmake-modules = qt5.ecmNoHooks; @@ -6343,6 +6364,8 @@ in libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; + libstdcxx5 = callPackage ../development/libraries/libstdc++5 { }; + libsigrok = callPackage ../development/tools/libsigrok { }; # old version: libsigrok-0-3-0 = libsigrok.override { @@ -6405,7 +6428,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doxygen_gui = lowPrio (self.doxygen.override { inherit qt4; }); + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -6468,11 +6491,11 @@ in gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; - gnumake3 = self.gnumake382; + gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = self.gnumake42; + gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -6559,7 +6582,7 @@ in lenmus = callPackage ../applications/misc/lenmus { }; - libtool = self.libtool_2; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -6578,6 +6601,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + go-md2man = callPackage ../development/tools/misc/md2man {}; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; @@ -6610,15 +6635,15 @@ in node_webkit = node_webkit_0_9; nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; noweb = callPackage ../development/tools/literate-programming/noweb { }; @@ -6641,6 +6666,8 @@ in patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); + peg = callPackage ../development/tools/parsing/peg { }; phantomjs = callPackage ../development/tools/phantomjs { }; @@ -6675,7 +6702,7 @@ in }; radare = callPackage ../development/tools/analysis/radare { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -6683,7 +6710,7 @@ in luaBindings = config.radare.luaBindings or false; }; radare2 = callPackage ../development/tools/analysis/radare2 { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -6800,6 +6827,8 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; + texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + travis = callPackage ../development/tools/misc/travis { }; tweak = callPackage ../applications/editors/tweak { }; @@ -6822,7 +6851,7 @@ in inherit (gnu) mig; }; - gdbGuile = lowPrio (self.gdb.override { inherit guile; }); + gdbGuile = lowPrio (gdb.override { inherit guile; }); gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; @@ -6970,7 +6999,7 @@ in boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost = self.boost160; + boost = boost160; boost_process = callPackage ../development/libraries/boost-process { }; @@ -7040,7 +7069,7 @@ in classpath = callPackage ../development/libraries/java/classpath { javac = gcj; jvm = gcj; - gconf = gnome.GConf; + gconf = gnome2.GConf; }; clearsilver = callPackage ../development/libraries/clearsilver { }; @@ -7051,7 +7080,7 @@ in clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - clucene_core = self.clucene_core_1; + clucene_core = clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; @@ -7142,15 +7171,15 @@ in # Make bdb5 the default as it is the last release under the custom # bsd-like license - db = self.db5; - db4 = self.db48; + db = db5; + db4 = db48; db44 = callPackage ../development/libraries/db/db-4.4.nix { }; db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; - db5 = self.db53; + db5 = db53; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; - db6 = self.db60; + db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; dbus = callPackage ../development/libraries/dbus { }; @@ -7165,9 +7194,9 @@ in dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; # FIXME: deprecate these. - dbus_tools = self.dbus.out; - dbus_libs = self.dbus; - dbus_daemon = self.dbus.daemon; + dbus_tools = dbus.out; + dbus_libs = dbus; + dbus_daemon = dbus.daemon; dee = callPackage ../development/libraries/dee { }; @@ -7222,7 +7251,7 @@ in faad2 = callPackage ../development/libraries/faad2 { }; factor-lang = callPackage ../development/compilers/factor-lang { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; farbfeld = callPackage ../development/libraries/farbfeld { }; @@ -7251,11 +7280,11 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases - ffmpeg_0 = self.ffmpeg_0_10; - ffmpeg_1 = self.ffmpeg_1_2; - ffmpeg_2 = self.ffmpeg_2_8; - ffmpeg_3 = self.ffmpeg_3_1; - ffmpeg = self.ffmpeg_3; + ffmpeg_0 = ffmpeg_0_10; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_8; + ffmpeg_3 = ffmpeg_3_1; + ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin @@ -7271,8 +7300,8 @@ in x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; inherit (darwin) CF; - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio AVFoundation MediaToolbox + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; }; @@ -7287,9 +7316,9 @@ in }; fftw = callPackage ../development/libraries/fftw { }; - fftwSinglePrec = self.fftw.override { precision = "single"; }; - fftwFloat = self.fftwSinglePrec; # the configure option is just an alias - fftwLongDouble = self.fftw.override { precision = "long-double"; }; + fftwSinglePrec = fftw.override { precision = "single"; }; + fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -7342,7 +7371,7 @@ in funambol = callPackage ../development/libraries/funambol { }; - fam = self.gamin; + fam = gamin; gamin = callPackage ../development/libraries/gamin { }; @@ -7351,14 +7380,14 @@ in gcab = callPackage ../development/libraries/gcab { }; gdome2 = callPackage ../development/libraries/gdome2 { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; gdbm = callPackage ../development/libraries/gdbm { }; gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_4 = callPackage ../development/libraries/gecode { }; - gecode = self.gecode_4; + gecode = gecode_4; gephi = callPackage ../applications/science/misc/gephi { }; @@ -7366,13 +7395,15 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { }; + gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { + gtk = self.gtk2; + }; geoclue = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoipWithDatabase = self.geoip.override { + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; }; @@ -7421,7 +7452,7 @@ in inherit (darwin.apple_sdk.frameworks) AGL; }; - glfw = self.glfw3; + glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; @@ -7487,7 +7518,7 @@ in gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = self.gmp6; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -7550,7 +7581,7 @@ in gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -7563,7 +7594,7 @@ in gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = self.gnutls34; + gnutls = gnutls34; gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; @@ -7606,7 +7637,7 @@ in gtkmathview = callPackage ../development/libraries/gtkmathview { }; glib = callPackage ../development/libraries/glib { }; - glib-tested = self.glib.override { # checked version separate to break cycles + glib-tested = glib.override { # checked version separate to break cycles doCheck = true; libffi = libffi.override { doCheck = true; }; }; @@ -7649,32 +7680,28 @@ in gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - gtk = self.gtk2; - - gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; + gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; - gtk-sharp = self.gtk-sharp-2_0; - gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtkspell = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -7682,7 +7709,9 @@ in gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; + gvfs = callPackage ../development/libraries/gvfs { + gnome = self.gnome2; + }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -7690,10 +7719,10 @@ in # TODO : Let admin choose. # We are using mit-krb5 because it is better maintained - kerberos = self.libkrb5; + kerberos = libkrb5; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = self.heimdalFull.override { type = "lib"; }; + libheimdal = heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = callPackage ../development/libraries/harfbuzz { @@ -7707,7 +7736,7 @@ in herqq = callPackage ../development/libraries/herqq { }; - heyefi = self.haskellPackages.heyefi; + heyefi = haskellPackages.heyefi; hidapi = callPackage ../development/libraries/hidapi { libusb = libusb1; @@ -7843,13 +7872,13 @@ in krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = self.krb5Full.override { type = "lib"; }; + libkrb5 = krb5Full.override { type = "lib"; }; lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; - lcms = self.lcms1; + lcms = lcms1; lcms1 = callPackage ../development/libraries/lcms { }; @@ -7909,8 +7938,9 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; - libav = self.libav_11; # branch 11 is API-compatible with branch 10 - inherit (callPackages ../development/libraries/libav { }) libav_0_8 libav_11; + libav = libav_11; # branch 11 is API-compatible with branch 10 + libav_all = callPackage ../development/libraries/libav { }; + inherit (libav_all) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -7930,11 +7960,14 @@ in libcaca = callPackage ../development/libraries/libcaca { }; - libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = self.libcanberra.override { gtk = gtk3; }; + libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { + gtk = pkgs.gtk3; + }; + libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; + libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then self.libcanberra.override { gtk = null; } - else self.libcanberra; + then pkgs.libcanberra_gtk2.override { gtk = null; } + else pkgs.libcanberra_gtk2; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -7951,7 +7984,7 @@ in libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain = callPackage ../development/libraries/libchamplain { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; libchardet = callPackage ../development/libraries/libchardet { }; @@ -8009,7 +8042,7 @@ in sqlite = null; }; - libdbiDrivers = self.libdbiDriversBase.override { + libdbiDrivers = libdbiDriversBase.override { inherit sqlite libmysql; }; @@ -8027,7 +8060,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = self.libdevil.override { + libdevil-nox = libdevil.override { libX11 = null; mesa = null; }; @@ -8128,7 +8161,7 @@ in liblo = callPackage ../development/libraries/liblo { }; - liblrdf = self.librdf; + liblrdf = librdf; liblscp = callPackage ../development/libraries/liblscp { }; @@ -8245,6 +8278,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmediainfo = callPackage ../development/libraries/libmediainfo { }; @@ -8259,6 +8294,10 @@ in libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { + mysql = mysql57; + }; + libnatspec = callPackage ../development/libraries/libnatspec ( stdenv.lib.optionalAttrs stdenv.isDarwin { inherit (darwin) libiconv; @@ -8333,7 +8372,7 @@ in libiec61883 = callPackage ../development/libraries/libiec61883 { }; libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; libinput = callPackage ../development/libraries/libinput { @@ -8349,7 +8388,7 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; - libjpeg = if stdenv.isLinux then self.libjpeg_turbo else self.libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -8419,7 +8458,7 @@ in libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = self.libmusicbrainz3; + libmusicbrainz = libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; @@ -8488,7 +8527,7 @@ in libpgf = callPackage ../development/libraries/libpgf { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = self.libpng.override { apngSupport = true; }; + libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpaper = callPackage ../development/libraries/libpaper { }; @@ -8578,14 +8617,7 @@ in libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; - - libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { - # fix "unrecognized option -arch" error - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; @@ -8617,7 +8649,7 @@ in libupnp = callPackage ../development/libraries/pupnp { }; - giflib = self.giflib_5_1; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -8627,7 +8659,7 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; libunique = callPackage ../development/libraries/libunique/default.nix { }; - libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome) gtkdoc; }; + libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; }; liburcu = callPackage ../development/libraries/liburcu { }; @@ -8649,7 +8681,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (self.v4l_utils.override { + libv4l = lowPrio (v4l_utils.override { alsaLib = null; libX11 = null; qt4 = null; @@ -8688,7 +8720,7 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = self.libwnck2; + libwnck = libwnck2; libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; @@ -8715,12 +8747,12 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky name = "libxml2+py-${self.libxml2.version}"; - paths = with self.libxml2; [ dev bin py ]; - inherit (self.libxml2) passthru; + paths = with libxml2; [ dev bin py ]; + inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv postBuild = '' mkdir "$out/nix-support" - cp '${self.libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" + cp '${libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" ''; }; @@ -8941,6 +8973,8 @@ in non = callPackage ../applications/audio/non { }; + ntl = callPackage ../development/libraries/ntl { }; + nspr = callPackage ../development/libraries/nspr { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9026,14 +9060,11 @@ in openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; - openscenegraph = callPackage ../development/libraries/openscenegraph { - giflib = giflib_4_1; - ffmpeg = ffmpeg_0; - }; + openscenegraph = callPackage ../development/libraries/openscenegraph { }; openslp = callPackage ../development/libraries/openslp {}; - libressl = self.libressl_2_4; + libressl = libressl_2_4; libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { fetchurl = fetchurlBoot; }; @@ -9102,6 +9133,8 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pg_repack = callPackage ../servers/sql/postgresql/pg_repack {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9193,7 +9226,7 @@ in libpng = libpng12; }; - qt4 = self.kde4.qt4; + qt4 = pkgs.kde4.qt4; qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); @@ -9240,7 +9273,7 @@ in let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt5 = self.qt56; + qt5 = qt56; qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; @@ -9559,6 +9592,8 @@ in stlport = callPackage ../development/libraries/stlport { }; + streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; + strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; @@ -9753,6 +9788,8 @@ in vrpn = callPackage ../development/libraries/vrpn { }; + vsqlite = callPackage ../development/libraries/vsqlite { }; + vtk = callPackage ../development/libraries/vtk { }; vtkWithQt4 = vtk.override { qtLib = qt4; }; @@ -9783,12 +9820,12 @@ in inherit (darwin) libobjc; }; - webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { + webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix { + webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; @@ -9813,18 +9850,18 @@ in wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gnome) GConf; + inherit (gnome2) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; @@ -9934,6 +9971,8 @@ in czmq = callPackage ../development/libraries/czmq { }; + czmqpp = callPackage ../development/libraries/czmqpp { }; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -10039,7 +10078,7 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; @@ -10161,11 +10200,9 @@ in pyexiv2 = pythonPackages.pyexiv2; - pygobject = pythonPackages.pygobject; - - pygobject3 = pythonPackages.pygobject3; - - pygtk = pythonPackages.pygtk; + inherit (self.pythonPackages) + pygtk + pygobject2 pygobject3; pygtksourceview = pythonPackages.pygtksourceview; @@ -10229,7 +10266,7 @@ in rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = self.apacheHttpd_2_4; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -10272,7 +10309,7 @@ in cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra = self.cassandra_3_0; + cassandra = cassandra_3_0; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -10282,7 +10319,7 @@ in java = jdk; }; - fuseki = self.apache-jena-fuseki; + fuseki = apache-jena-fuseki; apcupsd = callPackage ../servers/apcupsd { }; @@ -10531,8 +10568,6 @@ in rpcbind = callPackage ../servers/rpcbind { }; - #monetdb = callPackage ../servers/sql/monetdb { }; - mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; @@ -10556,6 +10591,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost159; + }; + mysql = mariadb; libmysql = mysql.client; # `libmysql` is a slight misnomer ATM @@ -10675,6 +10716,10 @@ in HTTPDate MailDKIM LWP IOSocketSSL; }; + deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; + deadpixi-sam = deadpixi-sam-unstable; + sam = deadpixi-sam; + samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { @@ -10741,10 +10786,12 @@ in storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; }; + slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); + systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat6 tomcat7 @@ -10853,7 +10900,7 @@ in atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = self.audit; + libaudit = audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -10870,7 +10917,7 @@ in # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = self.bluez5; + bluez = bluez5; inherit (pythonPackages) bedup; @@ -10886,12 +10933,18 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + gcc = gcc6; # needs gcc 6.0 and above + }; + conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not } // config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; + coredns = callPackage ../servers/dns/coredns { }; + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; @@ -10914,7 +10967,10 @@ in xctoolchain = xcode.toolchain; }; - cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix { + inherit libobjc; + stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv; + }).native; cf-private = callPackage ../os-specific/darwin/cf-private { inherit (apple-source-releases) CF; @@ -10950,7 +11006,7 @@ in stubs = callPackages ../os-specific/darwin/stubs {}; }; - devicemapper = self.lvm2; + devicemapper = lvm2; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; @@ -10999,7 +11055,7 @@ in ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = self.utillinux; + eject = utillinux; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; @@ -11012,7 +11068,7 @@ in ffadoFull = callPackage ../os-specific/linux/ffado { inherit (pythonPackages) python pyqt4 dbus-python; }; - libffado = self.ffadoFull.override { prefix = "lib"; }; + libffado = ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -11040,7 +11096,7 @@ in ncurses = null; # Keep curses disabled for lack of value }; - gpm-ncurses = self.gpm.override { inherit ncurses; }; + gpm-ncurses = gpm.override { inherit ncurses; }; gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; @@ -11133,7 +11189,7 @@ in # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = self.linuxHeaders_4_4; + linuxHeaders = linuxHeaders_4_4; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { cross = assert crossSystem != null; crossSystem; @@ -11148,12 +11204,12 @@ in linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross - else if ver == "2.6" then self.linuxHeaders26Cross + linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross + else if ver == "2.6" then linuxHeaders26Cross else throw "Unknown linux kernel version"; linuxHeadersCross = assert crossSystem != null; - self.linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + linuxHeadersCrossChooser crossSystem.platform.kernelMajor; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -11195,15 +11251,6 @@ in ]; }; - linux_3_14 = callPackage ../os-specific/linux/kernel/linux-3.14.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11288,7 +11335,7 @@ in ]; }; - linux_chromiumos_latest = self.linux_chromiumos_3_18; + linux_chromiumos_latest = linux_chromiumos_3_18; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -11317,6 +11364,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + displaylink = callPackage ../os-specific/linux/displaylink { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; pktgen = callPackage ../os-specific/linux/pktgen { }; @@ -11352,6 +11401,8 @@ in rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; + openafsClient = callPackage ../servers/openafs-client { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; @@ -11390,23 +11441,13 @@ in vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - virtualbox = callPackage ../applications/virtualization/virtualbox { - stdenv = stdenv_32bit; - inherit (gnome) libIDL; - enableExtensionPack = config.virtualbox.enableExtensionPack or false; - pulseSupport = config.pulseaudio or false; + virtualbox = callPackage ../os-specific/linux/virtualbox { + virtualbox = pkgs.virtualboxHardened; }; - virtualboxHardened = lowPrio (virtualbox.override { - enableHardening = true; - }); - - virtualboxHeadless = lowPrio (virtualbox.override { - enableHardening = true; - headless = true; - }); - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { + virtualbox = pkgs.virtualboxHardened; + }; wireguard = callPackage ../os-specific/linux/wireguard { }; @@ -11419,38 +11460,37 @@ in }; # The current default kernel / kernel modules. - linuxPackages = self.linuxPackages_4_4; - linux = self.linuxPackages.kernel; + linuxPackages = linuxPackages_4_4; + linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_7; - linux_latest = self.linuxPackages_latest.kernel; + linuxPackages_latest = linuxPackages_4_7; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_mptcp = self.linuxPackagesFor self.linux_mptcp linuxPackages_mptcp; - linuxPackages_rpi = self.linuxPackagesFor self.linux_rpi linuxPackages_rpi; - linuxPackages_3_10 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_10 linuxPackages_3_10); - linuxPackages_3_10_tuxonice = self.linuxPackagesFor self.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; - linuxPackages_3_12 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_12); - linuxPackages_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_14 linuxPackages_3_14); - linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); - linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); - linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); - linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); - linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp linuxPackages_mptcp; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; + linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); + linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; + linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); + linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); + linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); + linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); + linuxPackages_4_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_6 linuxPackages_4_6); + linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = self.linuxPackagesFor self.linux_testing linuxPackages_testing; + linuxPackages_testing = linuxPackagesFor pkgs.linux_testing linuxPackages_testing; linuxPackages_custom = {version, src, configfile}: - let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; - allowImportFromDerivation=true;}) + let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; + allowImportFromDerivation=true;}) linuxPackages_self); in recurseIntoAttrs linuxPackages_self; # Build a kernel for Xen dom0 - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (self.linuxPackagesFor (self.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); # Grsecurity packages @@ -11487,9 +11527,9 @@ in }; # ChromiumOS kernels - linuxPackages_chromiumos_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); - linuxPackages_chromiumos_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); - linuxPackages_chromiumos_latest = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_latest linuxPackages_chromiumos_latest); + linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); + linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); + linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest); # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; @@ -11578,8 +11618,10 @@ in numad = callPackage ../os-specific/linux/numad { }; + nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome) gtk gtkmm; + inherit (gnome2) gtk gtkmm; }; go-bindata = callPackage ../development/tools/go-bindata { }; @@ -11655,6 +11697,8 @@ in policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + powerdns = callPackage ../servers/dns/powerdns { }; + powertop = callPackage ../os-specific/linux/powertop { }; prayer = callPackage ../servers/prayer { }; @@ -11687,6 +11731,8 @@ in rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; + rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; + s3ql = callPackage ../tools/backup/s3ql { }; sass = callPackage ../development/tools/sass { }; @@ -11725,12 +11771,12 @@ in sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; # Provided with sysfsutils. - libsysfs = self.sysfsutils; - systool = self.sysfsutils; + libsysfs = sysfsutils; + systool = sysfsutils; sysklogd = callPackage ../os-specific/linux/sysklogd { }; @@ -12005,9 +12051,13 @@ in docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = self.docbook_xsl; + docbook_xml_xslt = docbook_xsl; + + docbook5_xsl = docbook_xsl_ns; - docbook5_xsl = self.docbook_xsl_ns; + cabin = callPackage ../data/fonts/cabin { }; + + dosis = callPackage ../data/fonts/dosis { }; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; @@ -12022,6 +12072,8 @@ in inherit (pythonPackages) scfbuild; }; + encode-sans = callPackage ../data/fonts/encode-sans { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -12076,17 +12128,27 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + lato = callPackage ../data/fonts/lato {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = self.liberation_ttf_binary; + liberation_ttf = liberation_ttf_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; libertine = callPackage ../data/fonts/libertine { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; + + libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; + + libre-caslon = callPackage ../data/fonts/libre-caslon { }; + + libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -12219,7 +12281,9 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { + gtk = self.gtk2; + }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -12301,7 +12365,7 @@ in }; abiword = callPackage ../applications/office/abiword { - inherit (gnome) libglade libgnomecanvas; + inherit (gnome2) libglade libgnomecanvas; iconTheme = gnome3.defaultIconTheme; }; @@ -12358,15 +12422,15 @@ in ao = callPackage ../applications/graphics/ao {}; - ardour = self.ardour4; + ardour = ardour4; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; ardour4 = callPackage ../applications/audio/ardour { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; @@ -12377,7 +12441,7 @@ in artha = callPackage ../applications/misc/artha { }; atomEnv = callPackage ../applications/editors/atom/env.nix { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; atom = callPackage ../applications/editors/atom { }; @@ -12399,8 +12463,8 @@ in altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { callPackage = newScope { boost = boost155; }; } ); - bitcoin = self.altcoins.bitcoin; - bitcoin-xt = self.altcoins.bitcoin-xt; + bitcoin = altcoins.bitcoin; + bitcoin-xt = altcoins.bitcoin-xt; go-ethereum = self.altcoins.go-ethereum; ethabi = self.altcoins.ethabi; @@ -12436,7 +12500,7 @@ in cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = self.awesome-3-5; + awesome = awesome-3-5; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; @@ -12446,7 +12510,7 @@ in backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; - backintime = self.backintime-qt4; + backintime = backintime-qt4; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -12455,7 +12519,7 @@ in }; banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; libgpod = pkgs.libgpod.override { monoSupport = true; }; }; @@ -12473,7 +12537,7 @@ in bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; beast = callPackage ../applications/audio/beast { - inherit (gnome) libgnomecanvas libart_lgpl; + inherit (gnome2) libgnomecanvas libart_lgpl; guile = guile_1_8; }; @@ -12528,7 +12592,7 @@ in bviplus = callPackage ../applications/editors/bviplus { }; calf = callPackage ../applications/audio/calf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -12563,7 +12627,7 @@ in inherit (darwin) IOKit; }; - cdparanoia = self.cdparanoiaIII; + cdparanoia = cdparanoiaIII; cdparanoiaIII = callPackage ../applications/audio/cdparanoia { inherit (darwin) IOKit; @@ -12594,13 +12658,14 @@ in enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; hiDPISupport = config.chromium.hiDPISupport or false; + gnome = gnome2; }; chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (self.chromium.override { channel = "beta"; }); + chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumDev = lowPrio (self.chromium.override { channel = "dev"; }); + chromiumDev = lowPrio (chromium.override { channel = "dev"; }); chuck = callPackage ../applications/audio/chuck { }; @@ -12632,7 +12697,7 @@ in CompBus = callPackage ../applications/audio/CompBus { }; compiz = callPackage ../applications/window-managers/compiz { - inherit (gnome) GConf ORBit2 metacity; + inherit (gnome2) GConf ORBit2 metacity; }; constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; @@ -12640,7 +12705,7 @@ in copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { - inherit (gnome) libgnomeui GConf; + inherit (gnome2) libgnomeui GConf; }; cortex = callPackage ../applications/misc/cortex { }; @@ -12650,7 +12715,7 @@ in cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; - cmake = cmake-2_8; + cmake = cmake_2_8; }; codeblocks = callPackage ../applications/editors/codeblocks { }; @@ -12659,7 +12724,9 @@ in comical = callPackage ../applications/graphics/comical { }; conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = self.wrapFirefox conkeror-unwrapped { }; + conkeror = wrapFirefox conkeror-unwrapped { }; + + containerd = callPackage ../applications/virtualization/containerd { }; cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { withOpenCL = true; @@ -12710,7 +12777,7 @@ in }); darktable = callPackage ../applications/graphics/darktable { - inherit (gnome) GConf libglade; + inherit (gnome2) GConf libglade; pugixml = pugixml.override { shared = true; }; }; @@ -12735,7 +12802,7 @@ in dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { - inherit (pkgs.gnome) libart_lgpl libgnomeui; + inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; diffuse = callPackage ../applications/version-management/diffuse { }; @@ -12751,7 +12818,7 @@ in djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = callPackage ../applications/graphics/djview { }; - djview4 = self.djview; + djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -12759,16 +12826,17 @@ in dmenu2 = callPackage ../applications/misc/dmenu2 { }; - dmtx = self.dmtx-utils; - - dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; + dmtx = dmtx-utils; - docker = callPackage ../applications/virtualization/docker { - btrfs-progs = btrfs-progs_4_4_1; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; + docker = callPackage ../applications/virtualization/docker { }; + docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; + docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + doodle = callPackage ../applications/search/doodle { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -12816,12 +12884,12 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = self.emacs24; - emacsPackages = self.emacs24Packages; - emacsPackagesNg = self.emacs24PackagesNg; - emacsMelpa = self.emacs24PackagesNg; # for backward compatibility + emacs = emacs25; + emacsPackages = emacs25Packages; + emacsPackagesNg = emacs25PackagesNg; + emacsMelpa = emacs25PackagesNg; # for backward compatibility - emacs24 = callPackage ../applications/editors/emacs-24 { + emacs25 = callPackage ../applications/editors/emacs { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -12833,30 +12901,25 @@ in inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; - emacs24-nox = lowPrio (appendToName "nox" (self.emacs24.override { + emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { withX = false; withGTK2 = false; withGTK3 = false; })); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { + emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; }); emacs24Macport = self.emacs24Macport_24_5; - emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix { + inherit (darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO; }); + emacs25Macport = self.emacs25Macport_25_1; emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -13011,7 +13074,7 @@ in cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages; + emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; @@ -13036,9 +13099,9 @@ in }; }; - emacs24PackagesNg = emacsPackagesNgGen emacs24; + emacs25PackagesNg = emacsPackagesNgGen emacs25; - emacs24WithPackages = emacs24PackagesNg.emacsWithPackages; + emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; # inherit (gnome3) empathy; @@ -13067,7 +13130,7 @@ in eterm = callPackage ../applications/misc/eterm { }; etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper; + inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper; }; evilvte = callPackage ../applications/misc/evilvte { @@ -13164,7 +13227,7 @@ in grepm = callPackage ../applications/search/grepm { }; grip = callPackage ../applications/misc/grip { - inherit (gnome) libgnome libgnomeui vte; + inherit (gnome2) libgnome libgnomeui vte; }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -13210,22 +13273,22 @@ in filezilla = callPackage ../applications/networking/ftp/filezilla { }; inherit (callPackages ../applications/networking/browsers/firefox { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; }) firefox-unwrapped firefox-esr-unwrapped; - firefox = self.wrapFirefox firefox-unwrapped { }; - firefox-esr = self.wrapFirefox firefox-esr-unwrapped { }; + firefox = wrapFirefox firefox-unwrapped { }; + firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-bin = self.wrapFirefox firefox-bin-unwrapped { + firefox-bin = wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; name = "firefox-bin-" + (builtins.parseDrvName firefox-bin-unwrapped.name).version; @@ -13234,8 +13297,8 @@ in firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; @@ -13256,14 +13319,14 @@ in debug = config.flashplayer.debug or false; }; - flashplayer-standalone = self.pkgsi686Linux.flashplayer.sa; + flashplayer-standalone = pkgsi686Linux.flashplayer.sa; - flashplayer-standalone-debugger = (self.pkgsi686Linux.flashplayer.override { debug = true; }).sa; + flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa; fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; fomp = callPackage ../applications/audio/fomp { }; @@ -13289,7 +13352,7 @@ in freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { ffmpeg = ffmpeg_2; - cmake = cmake-2_8; + cmake = cmake_2_8; }; freicoin = callPackage ../applications/misc/freicoin { @@ -13303,13 +13366,13 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; webkit = null; lcms = lcms2; wrapPython = pythonPackages.wrapPython; }; - gimp = self.gimp_2_8; + gimp = gimp_2_8; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { gimp = gimp_2_8; @@ -13330,7 +13393,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -13408,12 +13471,12 @@ in gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - inherit (gnome) gtkglext; + inherit (gnome2) gtkglext; xulrunner = firefox-unwrapped; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnumeric = callPackage ../applications/office/gnumeric { }; @@ -13425,7 +13488,7 @@ in gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -13439,7 +13502,7 @@ in gtkpod = callPackage ../applications/audio/gtkpod { gnome = gnome3; - inherit (gnome) libglade; + inherit (gnome2) libglade; }; jbidwatcher = callPackage ../applications/misc/jbidwatcher { @@ -13449,7 +13512,7 @@ in qrencode = callPackage ../tools/graphics/qrencode { }; gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; browser = firefox-unwrapped; }; @@ -13462,18 +13525,18 @@ in gmpc = callPackage ../applications/audio/gmpc {}; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; - google-chrome-beta = self.google-chrome.override { channel = "beta"; }; + google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - google-chrome-dev = self.google-chrome.override { channel = "dev"; }; + google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; @@ -13498,8 +13561,8 @@ in }; guake = callPackage ../applications/misc/guake { - gconf = gnome.GConf; - vte = gnome.vte.override { pythonSupport = true; }; + gconf = gnome2.GConf; + vte = gnome2.vte.override { pythonSupport = true; }; }; guitone = callPackage ../applications/version-management/guitone { @@ -13520,7 +13583,7 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; }; hello = callPackage ../applications/misc/hello { }; @@ -13555,7 +13618,7 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; - hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome) GConf; }; + hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -13615,7 +13678,7 @@ in inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; - imagemagick_light = self.imagemagick.override { + imagemagick_light = imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -13635,7 +13698,7 @@ in libwebp = null; }; - imagemagick = self.imagemagickBig.override { + imagemagick = imagemagickBig.override { ghostscript = null; }; @@ -13691,7 +13754,7 @@ in jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; - jackmix_jack1 = self.jackmix.override { jack = jack1; }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; @@ -13758,7 +13821,7 @@ in kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { }; kino = callPackage ../applications/video/kino { - inherit (gnome) libglade; + inherit (gnome2) libglade; ffmpeg = ffmpeg_2; }; @@ -13814,7 +13877,7 @@ in lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; lemonbar = callPackage ../applications/window-managers/lemonbar { }; @@ -13826,13 +13889,13 @@ in libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 libreoffice = hiPrio libreoffice-still; libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; @@ -13850,7 +13913,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; #glm = glm_0954; @@ -13874,14 +13937,14 @@ in }; lingot = callPackage ../applications/audio/lingot { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; linuxband = callPackage ../applications/audio/linuxband { }; ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { }; - ledger = self.ledger3; + ledger = ledger3; ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; @@ -13925,7 +13988,7 @@ in }; lilyterm = callPackage ../applications/misc/lilyterm { - inherit (gnome) vte; + inherit (gnome2) vte; gtk = gtk2; }; @@ -14031,7 +14094,7 @@ in monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4; - inherit (gnome) libgnomecanvas glib; + inherit (gnome2) libgnomecanvas glib; }; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; @@ -14125,7 +14188,7 @@ in multimon-ng = callPackage ../applications/misc/multimon-ng { }; multisync = callPackage ../applications/misc/multisync { - inherit (gnome) ORBit2 libbonobo libgnomeui GConf; + inherit (gnome2) ORBit2 libbonobo libgnomeui GConf; }; inherit (callPackages ../applications/networking/mumble { @@ -14258,7 +14321,7 @@ in notmuch = callPackage ../applications/networking/mailreaders/notmuch { # No need to build Emacs - notmuch.el works just fine without - # byte-compilation. Use emacs24Packages.notmuch if you want to + # byte-compilation. Use emacsPackages.notmuch if you want to # byte-compiled files emacs = null; sphinx = pythonPackages.sphinx; @@ -14281,7 +14344,7 @@ in nvpy = callPackage ../applications/editors/nvpy { }; obconf = callPackage ../tools/X11/obconf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; obs-studio = qt5.callPackage ../applications/video/obs-studio { @@ -14344,7 +14407,7 @@ in panotools = callPackage ../applications/graphics/panotools { }; paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome) libglademm gconfmm GConf; + inherit (gnome2) libglademm gconfmm GConf; }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -14367,7 +14430,7 @@ in perseus = callPackage ../applications/science/math/perseus {}; petrifoo = callPackage ../applications/audio/petrifoo { - inherit (gnome) libgnomecanvas; + inherit (gnome2) libgnomecanvas; }; pdftk = callPackage ../tools/typesetting/pdftk { }; @@ -14446,7 +14509,7 @@ in }; pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -14497,7 +14560,7 @@ in qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; - libtorrentRasterbar = libtorrentRasterbar_1_09; + libtorrentRasterbar = libtorrentRasterbar_1_0; }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; @@ -14601,9 +14664,15 @@ in rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; - cmake = cmake-2_8; # problems after 3.4 -> 3.6.0 + cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 }; + rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix { + fftw = fftwSinglePrec; + cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 + }); + + rcs = callPackage ../applications/version-management/rcs { }; rdesktop = callPackage ../applications/networking/remote/rdesktop { }; @@ -14650,6 +14719,8 @@ in rubyripper = callPackage ../applications/audio/rubyripper {}; + runc = callPackage ../applications/virtualization/runc {}; + rxvt = callPackage ../applications/misc/rxvt { }; # urxvt @@ -14678,6 +14749,8 @@ in udevil = callPackage ../applications/misc/udevil {}; + udiskie = callPackage ../applications/misc/udiskie { }; + sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; }; @@ -14693,7 +14766,7 @@ in scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; }; seafile-client = callPackage ../applications/networking/seafile-client { }; @@ -14750,6 +14823,8 @@ in spideroak = callPackage ../applications/networking/spideroak { }; + squishyball = callPackage ../applications/audio/squishyball { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; @@ -14790,7 +14865,7 @@ in sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = self.bittorrentSync14; + bittorrentSync = bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; @@ -14803,7 +14878,7 @@ in withQt5 = false; }; - lightdm_qt = self.lightdm.override { withQt5 = true; }; + lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; @@ -14858,7 +14933,7 @@ in }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome) GConf; + inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; }; @@ -14953,7 +15028,7 @@ in tailor = callPackage ../applications/version-management/tailor {}; tangogps = callPackage ../applications/misc/tangogps { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; @@ -14994,7 +15069,7 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; terminator = callPackage ../applications/misc/terminator { - vte = gnome.vte.override { pythonSupport = true; }; + vte = gnome2.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; }; @@ -15009,14 +15084,14 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; }; tig = gitAndTools.tig; @@ -15188,7 +15263,7 @@ in }; virtmanager = callPackage ../applications/virtualization/virt-manager { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; vte = gnome3.vte; dconf = gnome3.dconf; gtkvnc = gtkvnc.override { enableGTK3 = true; }; @@ -15198,6 +15273,22 @@ in virtinst = callPackage ../applications/virtualization/virtinst {}; + virtualbox = callPackage ../applications/virtualization/virtualbox { + stdenv = stdenv_32bit; + inherit (gnome2) libIDL; + enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or true; + }; + + virtualboxHardened = lowPrio (virtualbox.override { + enableHardening = true; + }); + + virtualboxHeadless = lowPrio (virtualbox.override { + enableHardening = true; + headless = true; + }); + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { fltk = fltk13; }; @@ -15324,7 +15415,7 @@ in wordnet = callPackage ../applications/misc/wordnet { }; workrave = callPackage ../applications/misc/workrave { - inherit (gnome) GConf gconfmm; + inherit (gnome2) GConf gconfmm; inherit (python27Packages) cheetah; }; @@ -15387,7 +15478,7 @@ in wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxcam = callPackage ../applications/video/wxcam { - inherit (gnome) libglade; + inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; }; @@ -15415,23 +15506,23 @@ in }; kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = self.kodiPlain; + xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); - xbmcPlugins = self.kodiPlugins; + xbmcPlugins = kodiPlugins; - kodi = self.wrapKodi { + kodi = wrapKodi { kodi = kodiPlain; }; - xbmc = self.kodi; + xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; - xbmc-retroarch-advanced-launchers = self.kodi-retroarch-advanced-launchers; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -15489,7 +15580,7 @@ in xneur = xneur_0_13; gxneur = callPackage ../applications/misc/gxneur { - inherit (gnome) libglade GConf; + inherit (gnome2) libglade GConf; }; xiphos = callPackage ../applications/misc/xiphos { @@ -15500,7 +15591,7 @@ in }; xournal = callPackage ../applications/graphics/xournal { - inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; + inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; apvlv = callPackage ../applications/misc/apvlv { }; @@ -15553,7 +15644,7 @@ in xsd = callPackage ../development/libraries/xsd { }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; xss-lock = callPackage ../misc/screensavers/xss-lock { }; @@ -15562,7 +15653,9 @@ in xterm = callPackage ../applications/misc/xterm { }; - mlterm = callPackage ../applications/misc/mlterm { }; + mlterm = callPackage ../applications/misc/mlterm { + vte = gnome3.vte_290; + }; finalterm = callPackage ../applications/misc/finalterm { }; @@ -15585,7 +15678,7 @@ in xnee = callPackage ../tools/X11/xnee { }; xvidcap = callPackage ../applications/video/xvidcap { - inherit (gnome) scrollkeeper libglade; + inherit (gnome2) scrollkeeper libglade; }; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -15729,16 +15822,16 @@ in freeglut = null; }); - construo = self.construoBase.override { + construo = construoBase.override { inherit mesa freeglut; }; crack_attack = callPackage ../games/crack-attack { }; crafty = callPackage ../games/crafty { }; - craftyFull = appendToName "full" (self.crafty.override { fullVariant = true; }); + craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); - crawlTiles = self.crawl.override { + crawlTiles = crawl.override { tileMode = true; }; @@ -15750,13 +15843,17 @@ in dhewm3 = callPackage ../games/dhewm3 {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); - inherit (self.dwarf-fortress-packages) - dwarf-fortress dwarf-therapist; + + dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; + + dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -15831,8 +15928,6 @@ in gnugo = callPackage ../games/gnugo { }; - gsb = callPackage ../games/gsb { }; - gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; @@ -16051,7 +16146,7 @@ in spring = callPackage ../games/spring { boost = boost155; - cmake = cmake-2_8; + cmake = cmake_2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -16149,7 +16244,9 @@ in ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); - ut2004demo = callPackage_i686 ../games/ut2004demo { }; + ut2004Packages = callPackage ../games/ut2004 { }; + + ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -16219,7 +16316,7 @@ in zandronum = callPackage ../games/zandronum { fmod = fmod42416; - cmake = cmake-2_8; + cmake = cmake_2_8; }; zandronum-server = zandronum.override { @@ -16248,29 +16345,31 @@ in callPackage = newScope pkgs.enlightenment; }); - gnome2 = callPackage ../desktops/gnome-2 { + gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk gtkmm + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 # Included for backwards compatibility libsoup libwnck gtk_doc gnome_doc_utils; - }; - gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); + gtk = self.gtk2; + gtkmm = self.gtkmm2; + libcanberra = self.libcanberra_gtk2; + }); - gnome3 = self.gnome3_20; + gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); - gnome = recurseIntoAttrs self.gnome2; + gnome3 = gnome3_20; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs self.kde414; + kde4 = recurseIntoAttrs pkgs.kde414; kde414 = kdePackagesFor @@ -16536,7 +16635,7 @@ in ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { - inherit (gnome) libglade; + inherit (gnome2) libglade; guile = guile_1_8; }; @@ -16597,7 +16696,7 @@ in withLapack = false; }; - atlasWithLapack = self.atlas.override { withLapack = true; }; + atlasWithLapack = atlas.override { withLapack = true; }; blas = callPackage ../development/libraries/science/math/blas { }; @@ -16614,11 +16713,11 @@ in # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = self.liblapackWithAtlas.override { atlas = null; }; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = self.liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = self.liblapackWithAtlas; - liblapack_3_5_0 = self.liblapack_3_5_0WithAtlas; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = liblapackWithAtlas; + liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -16913,7 +17012,7 @@ in z3 = callPackage ../applications/science/logic/z3 {}; z3_opt = callPackage ../applications/science/logic/z3_opt {}; - boolector = self.boolector15; + boolector = boolector15; boolector15 = callPackage ../applications/science/logic/boolector {}; boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { useV16 = true; @@ -16974,7 +17073,7 @@ in pcalc = callPackage ../applications/science/math/pcalc { }; pspp = callPackage ../applications/science/math/pssp { - inherit (gnome) libglade gtksourceview; + inherit (gnome2) libglade gtksourceview; }; singular = callPackage ../applications/science/math/singular {}; @@ -17011,7 +17110,7 @@ in celestia = callPackage ../applications/science/astronomy/celestia { lua = lua5_1; - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; cytoscape = callPackage ../applications/science/misc/cytoscape { }; @@ -17024,7 +17123,9 @@ in megam = callPackage ../applications/science/misc/megam { }; - root = callPackage ../applications/science/misc/root { }; + root = callPackage ../applications/science/misc/root { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -17033,7 +17134,7 @@ in stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake-2_8; + cmake = cmake_2_8; }; vite = callPackage ../applications/science/misc/vite { }; @@ -17116,7 +17217,7 @@ in darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -17124,7 +17225,7 @@ in enableAllFeatures = false; }; - dblatexFull = appendToName "full" (self.dblatex.override { + dblatexFull = appendToName "full" (dblatex.override { enableAllFeatures = true; }); @@ -17136,7 +17237,7 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { }; + ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; @@ -17144,7 +17245,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = self.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -17197,7 +17298,7 @@ in cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); }; - ghostscriptX = appendToName "with-X" (self.ghostscript.override { + ghostscriptX = appendToName "with-X" (ghostscript.override { x11Support = true; }); @@ -17223,11 +17324,11 @@ in hplip = callPackage ../misc/drivers/hplip { }; - hplipWithPlugin = self.hplip.override { withPlugin = true; }; + hplipWithPlugin = hplip.override { withPlugin = true; }; hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; - hplipWithPlugin_3_15_9 = self.hplip_3_15_9.override { withPlugin = true; }; + hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -17235,7 +17336,7 @@ in jack2Full = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; }; - libjack2 = self.jack2Full.override { prefix = "lib"; }; + libjack2 = jack2Full.override { prefix = "lib"; }; libjack2-git = callPackage ../misc/jackaudio/git.nix { }; keynav = callPackage ../tools/X11/keynav { }; @@ -17247,7 +17348,7 @@ in martyr = callPackage ../development/libraries/martyr { }; mess = callPackage ../misc/emulators/mess { - inherit (pkgs.gnome) GConf; + inherit (pkgs.gnome2) GConf; }; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; @@ -17321,10 +17422,12 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; - mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { - lua = lua5_1; - libctemplate = libctemplate_2_2; - }; + mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { + automake = automake113x; + gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; + mysql = mysql; + pcre = pcre-cpp; + }); redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; @@ -17511,7 +17614,7 @@ in }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - inherit (self.kde4) rekonq; + inherit (kde4) rekonq; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; @@ -17660,7 +17763,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; higan = callPackage ../misc/emulators/higan { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; misc = callPackage ../misc/misc.nix { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f287a35bdc46..3508f1a1547c 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -580,7 +580,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; }; - buildInputs = [ pkgs.gtk-sharp ]; + buildInputs = [ pkgs.gtk-sharp-2_0 ]; meta = { description = "A generic framework for creating extensible applications"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 62fb9407ee53..87023154ccb0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1566,6 +1566,8 @@ let }; }; + tramp = callPackage ../applications/editors/emacs-modes/tramp { }; + tracking = melpaBuild rec { pname = "tracking"; version = circe.version; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 23737ca0ff7a..e1079f354d1d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -238,11 +238,22 @@ rec { lts-6_4 = packages.ghc7103; lts-6_5 = packages.ghc7103; lts-6_6 = packages.ghc7103; - lts-6_7 = packages.ghc7103.override { - packageSetConfig = callPackage ../development/haskell-modules/configuration-lts.nix { }; - }; - lts-6 = packages.lts-6_7; + lts-6_7 = packages.ghc7103; + lts-6_8 = packages.ghc7103; + lts-6_9 = packages.ghc7103; + lts-6_10 = packages.ghc7103; + lts-6_11 = packages.ghc7103; + lts-6_12 = packages.ghc7103; + lts-6_13 = packages.ghc7103; + lts-6_14 = packages.ghc7103; + lts-6_15 = packages.ghc7103; + lts-6_16 = packages.ghc7103; + lts-6_17 = packages.ghc7103; + lts-6 = packages.lts-6_17; + + lts-7_0 = packages.ghc801; + lts-7 = packages.lts-7_0; - lts = packages.lts-6; + lts = packages.lts-7; }; } diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c065ac8290a3..7fb5cf38d93d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , fetchFromGitHub, libmpack }: @@ -192,6 +192,11 @@ let patchPhase = '' sed -e "s,^LUAPREFIX_linux.*,LUAPREFIX_linux=$out," \ -i src/makefile + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export PLAT=macosx + export LUAPREFIX_macosx=$out + substituteInPlace src/Makefile --replace gcc cc \ + --replace 10.3 10.5 ''; meta = { diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index dbaa35cf7a6a..432a367d1535 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.1"; - by-version."bower2nix"."3.0.1" = self.buildNodePackage { - name = "bower2nix-3.0.1"; - version = "3.0.1"; + self.by-version."bower2nix"."3.1.1"; + by-version."bower2nix"."3.1.1" = self.buildNodePackage { + name = "bower2nix-3.1.1"; + version = "3.1.1"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - name = "bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + name = "bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; deps = { "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b04e1ea06af..e00b134d6da3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -481,13 +481,11 @@ let self = _self // overrides; _self = with self; { }; }; - autobox = pkgs.perlPackages.Autobox; - - Autobox = buildPerlPackage rec { - name = "autobox-2.83"; + autobox = buildPerlPackage rec { + name = "autobox-2.84"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; - sha256 = "1i493ss5nr0hp3wncn0s31gyka4r09wx65b8g2f8av2nm4zs70rz"; + sha256 = "98dd2754f226684a72ccba3a95956b7eaff2871568e4dd9746e6fb6daae0b96b"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { @@ -496,6 +494,8 @@ let self = _self // overrides; _self = with self; { }; }; + Autobox = self.autobox; + Autodia = buildPerlPackage rec { name = "Autodia-2.14"; src = fetchurl { @@ -2733,15 +2733,16 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.038"; + name = "CryptX-0.040"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "f98d4ee3bfd0a985077912501b32777c551f0782aa050b4dfbcb3d654e303eb8"; + sha256 = "0e1e44811e951fa04971912a8b03cf41de540d8cf8d464c5655aaf3bf976db50"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -3578,11 +3579,11 @@ let self = _self // overrides; _self = with self; { DBIxClass = buildPerlPackage rec { name = "DBIx-Class-0.082840"; - # UPGRADE Note: Please remove workaround in DBDSQLite above src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; }; + patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { @@ -9618,7 +9619,7 @@ let self = _self // overrides; _self = with self; { ''; meta = { description = "Perl extension for using OpenSSL"; - license = "SSLeay"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9642,7 +9643,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interact with TELNET port or other TCP ports"; - license = "unknown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9671,10 +9672,14 @@ let self = _self // overrides; _self = with self; { }; NumberFormat = buildPerlPackage rec { - name = "Number-Format-1.73"; + name = "Number-Format-1.75"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Number/${name}.tar.gz"; - sha256 = "0v74hscnc807kf65x0am0rddk74nz7nfk3gf16yr5ar1xwibg8l4"; + url = "mirror://cpan/authors/id/W/WR/WRW/${name}.tar.gz"; + sha256 = "82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3"; + }; + meta = { + description = "Perl extension for formatting numbers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9711,6 +9716,10 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.07.tar.gz; sha256 = "0c8l7195bjvx0v6zmkgdnxvwg7yj2zq8hi7xd25a3iikd12dc4f6"; }; + meta = { + description = "Generate cryptographic signatures for objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; # For backwards compatibility. Please use OLEStorage_Lite instead. @@ -9781,15 +9790,15 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; }; - NetOpenSSH = buildPerlPackage { - name = "Net-OpenSSH-0.70"; + NetOpenSSH = buildPerlPackage rec { + name = "Net-OpenSSH-0.73"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.70.tar.gz; - sha256 = "3fcb36a5a2fc296c1d0def54f3201cecffe7d81157ef5fa2bac9868875f63b95"; + url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + sha256 = "f45a54b3c6015d4dc44cbff9f9be57bc9d54dfb104fb38bcf3c4eb04789582d9"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10505,16 +10514,16 @@ let self = _self // overrides; _self = with self; { }; }; - PodElemental = buildPerlPackage { - name = "Pod-Elemental-0.103000"; + PodElemental = buildPerlPackage rec { + name = "Pod-Elemental-0.103004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103000.tar.gz; - sha256 = "0ykf49n6ysm7ab5zwm8a009zzrzsnhxw94a9jvbq80yywzhnm847"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "43625cde7241fb174ad9c7eb45387fba410dc141d7de2323855eeab3590072c9"; }; buildInputs = [ TestDeep TestDifferences ]; - propagatedBuildInputs = [ MixinLinewise Moose MooseAutobox MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods TestDeep TestDifferences namespaceautoclean ]; + propagatedBuildInputs = [ ClassLoad MixinLinewise Moose MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/pod-elemental; + homepage = https://github.com/rjbs/Pod-Elemental; description = "Work with nestable Pod elements"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11460,15 +11469,15 @@ let self = _self // overrides; _self = with self; { }; }; - StringFlogger = buildPerlPackage { - name = "String-Flogger-1.101244"; + StringFlogger = buildPerlPackage rec { + name = "String-Flogger-1.101245"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101244.tar.gz; - sha256 = "0cx3d85sz1dqjvbczpf9wx0i1b05jwbxcg7lpq5qygdkblq85nzd"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; - propagatedBuildInputs = [ JSON ParamsUtil SubExporter ]; + propagatedBuildInputs = [ JSONMaybeXS ParamsUtil SubExporter ]; meta = { - homepage = https://github.com/rjbs/string-flogger; + homepage = https://github.com/rjbs/String-Flogger; description = "String munging for loggers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11686,10 +11695,14 @@ let self = _self // overrides; _self = with self; { }; SubIdentify = buildPerlPackage rec { - name = "Sub-Identify-0.04"; + name = "Sub-Identify-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; - sha256 = "16g4dkmb4h5hh15jsq0kvsf3irrlrlqdv7qk6605wh5gjjwbcjxy"; + sha256 = "83bb785a66113b4a966db0a4186fd1dd07987acdacb4502b1e1558f817dde825"; + }; + meta = { + description = "Retrieve names of code references"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12841,10 +12854,10 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302037"; + name = "Test-Simple-1.302056"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "fbeba16906ef534e2334acad2020941b6705ab98543536900e588e93409f23b8"; + sha256 = "7ba4d821545051f3bc2a6a3308cc43a45f242eec0121a6c85394601785f2e2e8"; }; meta = { description = "Basic utilities for writing tests"; @@ -13507,15 +13520,15 @@ let self = _self // overrides; _self = with self; { }; TestVersion = buildPerlPackage rec { - name = "Test-Version-2.03"; + name = "Test-Version-2.05"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "02nbi7iqab1b0ngkiim9kbvnnr9bhi17bq54vm8hn9ridzgbj1vj"; + sha256 = "39c0ec02663da0e56962bdafaef6790cf83d12b4d90e8a4cdc971d57d869d63f"; }; - buildInputs = [ TestException TestRequires TestTester ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ FileFindRulePerl ]; meta = { - homepage = http://search.cpan.org/dist/Test-Version/; + homepage = https://metacpan.org/dist/Test-Version; description = "Check to see that version's in modules are sane"; license = stdenv.lib.licenses.artistic2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9573e25ab46..39affe6bac49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -232,8 +232,7 @@ in modules // { pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygobject = callPackage ../development/python-modules/pygobject { }; - + pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; @@ -241,7 +240,7 @@ in modules // { pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome.libglade; + libglade = pkgs.gnome2.libglade; }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { @@ -589,6 +588,63 @@ in modules // { }; }; + asgiref = buildPythonPackage rec { + name = "asgiref-${version}"; + version = "0.14.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgiref/${name}.tar.gz"; + sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + }; + + propagatedBuildInputs = with self ; [ six ]; + + meta = { + description = "Reference ASGI adapters and channel layers"; + license = licenses.bsd3; + homepage = https://github.com/django/asgiref; + }; + }; + + asgi_ipc = buildPythonPackage rec { + name = "asgi_ipc-${version}"; + version = "1.1.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; + sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + }; + + propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; + + meta = { + description = "Posix IPC-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_ipc/; + }; + }; + + asgi_redis = buildPythonPackage rec { + name = "asgi_redis-${version}"; + version = "0.14.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; + sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + }; + + # Requires a redis server available + doCheck = false; + + propagatedBuildInputs = with self ; [ asgiref asgi_ipc msgpack six redis cryptography ]; + + meta = { + description = "Redis-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_redis/; + }; + }; + python-editor = buildPythonPackage rec { name = "python-editor-${version}"; version = "0.4"; @@ -1813,11 +1869,11 @@ in modules // { }); beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.4.1"; + name = "beautifulsoup4-4.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47"; + sha256 = "1qgmhw65ncsgccjhslgkkszif47q6gvxwqv4mim17agxd81p951w"; }; buildInputs = [ self.nose ]; @@ -2084,6 +2140,27 @@ in modules // { }; }; + channels = buildPythonPackage rec { + name = "channels-${version}"; + version = "0.17.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/channels/${name}.tar.gz"; + sha256 = "1a7fzm25sm3qqgxf7j3hml2lkipvf0yapdg4rkk7x3m11zm0xgv9"; + }; + + # Files are missing in the distribution + doCheck = false; + + propagatedBuildInputs = with self ; [ asgiref django daphne ]; + + meta = { + description = "Brings event-driven capabilities to Django with a channel system"; + license = licenses.bsd3; + homepage = https://github.com/django/channels; + }; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -3199,18 +3276,26 @@ in modules // { sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704"; }; - propagatedBuildInputs = with self; [ - futures - nose - six - sure - pytz - pyyaml - ]; + buildInputs = with self; [ pkgs.libev cython ] ++ optionals doCheck [ scales eventlet twisted mock gevent nose pytz pyyaml sure ]; + + propagatedBuildInputs = with self; [ futures six ]; + + postPatch = '' + sed -i "s/<=1.0.1//" setup.py + ''; + + checkPhase = '' + ${python.interpreter} setup.py gevent_nosetests + ${python.interpreter} setup.py eventlet_nosetests + ''; + + # Could not get tests running + doCheck = false; meta = { homepage = http://datastax.github.io/python-driver/; description = "A Python client driver for Apache Cassandra"; + license = licenses.asl20; }; }; @@ -4040,11 +4125,11 @@ in modules // { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5"; + version = "1.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "52f47ec9a57676043f88e3ca133638790b6b71e56e8890d9d7f3ae4fcd75fa24"; + sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4061,11 +4146,11 @@ in modules // { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5"; + version = "1.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "ad19a2b98a475785c3b2ec8a8c9c974e0c48d00db0c23e79d776a2c489ad812d"; + sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; }; }; @@ -4394,15 +4479,23 @@ in modules // { detox = self.buildPythonPackage rec { - name = "detox-0.9.3"; + name = "detox-0.10.0"; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ tox py eventlet ]; src = pkgs.fetchurl { - url = "mirror://pypi/d/detox/detox-0.9.3.tar.gz"; - sha256 = "39d48b6758c43ba579f694507d54da96931195eb1b72ad79b46f50af9520b2f3"; + url = "mirror://pypi/d/detox/${name}.tar.gz"; + sha256 = "33b704c2a5657366850072fb2aa839df14dd2e692c0c1c2642c3ac30d5c0baec"; }; + checkPhase = '' + py.test + ''; + + # eventlet timeout, and broken invokation 3.5 + doCheck = false; + meta = { description = "What is detox?"; homepage = http://bitbucket.org/hpk42/detox; @@ -4671,6 +4764,31 @@ in modules // { }; }; + pytest-rerunfailures = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-rerunfailures"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; + }; + + propagatedBuildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "pytest plugin to re-run tests to eliminate flaky failures."; + homepage = https://github.com/pytest-dev/pytest-rerunfailures; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds ]; + platforms = platforms.all; + }; + }; + pytestflakes = buildPythonPackage rec { name = "pytest-flakes-${version}"; version = "1.0.0"; @@ -5333,6 +5451,24 @@ in modules // { }; }); + daphne = buildPythonPackage rec { + name = "daphne-${version}"; + version = "0.15.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/daphne/${name}.tar.gz"; + sha256 = "095xdh10v8sqwyas02q72ij3ivd5qjg5ki5cvha0fpzd361izdnp"; + }; + + propagatedBuildInputs = with self; [ asgiref autobahn ]; + + meta = { + description = "Django ASGI (HTTP/WebSocket) server"; + license = licenses.bsd3; + homepage = https://github.com/django/daphne; + }; + }; + dateparser = buildPythonPackage rec { name = "dateparser-${version}"; version = "0.3.2-pre-2016-01-21"; # Fix assert year 2016 == 2015 @@ -6696,7 +6832,7 @@ in modules // { propagatedBuildInputs = with self; [ pkgs.gnutls ]; patchPhase = '' - substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls33.out}/lib" + substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib" ''; }; @@ -9137,7 +9273,7 @@ in modules // { }; propagatedBuildInputs = with self; [ - pyGtkGlade pkgs.libtorrentRasterbar_1_09 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity + pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity ]; nativeBuildInputs = [ pkgs.intltool ]; @@ -10754,27 +10890,20 @@ in modules // { }; falcon = buildPythonPackage (rec { - name = "falcon-0.3.0"; + name = "falcon-1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/f/falcon/${name}.tar.gz"; - sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj"; + sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63"; }; - propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools]; + propagatedBuildInputs = with self; [ six python_mimeparse ]; # The travis build fails since the migration from multiprocessing to threading for hosting the API under test. # OSError: [Errno 98] Address already in use doCheck = false; - # This patch is required if the tests are enabled - # See https://github.com/falconry/falcon/issues/572 - #patches = singleton (pkgs.fetchurl { - # name = "falcon-572.patch"; - # url = "https://github.com/desiderius/falcon/commit/088bd3f2204eb6368acb3a1bf6c6b54c415225c2.patch"; - # sha256 = "19102dlzc4890skmam2v20va2vk5xr56fi4nzibzfvl7vyq68060"; - #}); - meta = { description = "An unladen web framework for building APIs and app backends"; homepage = http://falconframework.org; @@ -10782,7 +10911,24 @@ in modules // { maintainers = with maintainers; [ desiderius ]; }; }); + hug = buildPythonPackage rec { + name = "hug-2.1.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/h/hug/${name}.tar.gz"; + sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; + }; + propagatedBuildInputs = with self; [ falcon requests2 ]; + + # tests are not shipped in the tarball + doCheck = false; + + meta = { + description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; + homepage = https://github.com/timothycrosley/hug; + license = licenses.mit; + }; + }; flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k; @@ -11104,22 +11250,30 @@ in modules // { }; gevent = buildPythonPackage rec { - name = "gevent-1.0.2"; - disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 + name = "gevent-1.1.2"; src = pkgs.fetchurl { url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s"; + sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; }; - patchPhase = '' + # Why do we have this patch? + postPatch = '' substituteInPlace libev/ev.c --replace \ "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ "ecb_inline ecb_noreturn void ecb_unreachable (void)" ''; buildInputs = with self; [ pkgs.libev ]; - propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; + propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ]; + + checkPhase = '' + cd greentest + ${python.interpreter} testrunner.py + ''; + + # Bunch of failures. + doCheck = false; meta = { description = "Coroutine-based networking library"; @@ -11387,14 +11541,16 @@ in modules // { greenlet = buildPythonPackage rec { name = "greenlet-${version}"; - version = "0.4.7"; + version = "0.4.10"; disabled = isPyPy; # builtin for pypy src = pkgs.fetchurl { - url = "mirror://pypi/g/greenlet/${name}.zip"; - sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k"; + url = "mirror://pypi/g/greenlet/${name}.tar.gz"; + sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62"; }; + propagatedBuildInputs = with self; [ six ]; + # see https://github.com/python-greenlet/greenlet/issues/85 preCheck = '' rm tests/test_leaks.py @@ -12686,6 +12842,26 @@ in modules // { ]; }; + python-Levenshtein = buildPythonPackage rec { + name = "python-Levenshtein-${version}"; + version = "0.12.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-Levenshtein/${name}.tar.gz"; + sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3"; + }; + + # No tests included in archive + doCheck = false; + + meta = { + description = "Functions for fast computation of Levenshtein distance and string similarity"; + homepage = "https://github.com/ztane/python-Levenshtein"; + license = licenses.gpl2; + maintainers = with maintainers; [ aske ]; + }; + }; + libcloud = buildPythonPackage (rec { name = "libcloud-0.18.0"; @@ -13048,14 +13224,14 @@ in modules // { Mako = buildPythonPackage rec { - name = "Mako-1.0.2"; + name = "Mako-1.0.4"; src = pkgs.fetchurl { url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "17k7jy3byi4hj6ksszib6gxbf6n7snnnirnbrdldn848abjc4l15"; + sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; }; - buildInputs = with self; [ markupsafe nose mock ]; + buildInputs = with self; [ markupsafe nose mock pytest ]; propagatedBuildInputs = with self; [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 @@ -13140,6 +13316,11 @@ in modules // { substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" ''; + postFixup = '' + wrapPythonProgramsIn $out/bin $out + patchPythonScript $out/${python.sitePackages}/mathics/manage.py + ''; + propagatedBuildInputs = with self; [ cython sympy @@ -14821,7 +15002,7 @@ in modules // { configure ''; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -16304,12 +16485,11 @@ in modules // { sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s"; }; - propagatedBuildInputs = with self; [ - kazoo six - ]; - buildInputs = with self; [ - - ]; + propagatedBuildInputs = with self; [ kazoo six ]; + buildInputs = with self; [ testtools ]; + checkPhase = '' + ${python.interpreter} -m unittest discover zake/tests + ''; meta = with stdenv.lib; { homepage = "https://github.com/yahoo/Zake"; @@ -17012,6 +17192,29 @@ in modules // { }; }; + parsel = buildPythonPackage rec { + name = "parsel-${version}"; + version = "1.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/parsel/${name}.tar.gz"; + sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431"; + }; + + buildInputs = with self; [ pytest pytestrunner ]; + propagatedBuildInputs = with self; [ six w3lib lxml cssselect ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = "https://github.com/scrapy/parsel"; + description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; + license = licenses.bsd3; + }; + }; + partd = buildPythonPackage rec { name = "partd-${version}"; version = "0.3.3"; @@ -17886,6 +18089,21 @@ in modules // { }; }; + posix_ipc = buildPythonPackage rec { + name = "posix_ipc-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/posix_ipc/${name}.tar.gz"; + sha256 = "1jzg66708pi5n9w07fbz6rlxx30cjds9hp2yawjjfryafh1hg4ww"; + }; + + meta = { + description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; + license = licenses.bsd3; + homepage = http://semanchuk.com/philip/posix_ipc/; + }; + }; powerline = buildPythonPackage rec { rev = "2.1.4"; @@ -18723,13 +18941,18 @@ in modules // { pydispatcher = buildPythonPackage (rec { version = "2.0.5"; - disabled = isPy35; name = "pydispatcher-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz"; sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; }; + buildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + meta = { homepage = http://pydispatcher.sourceforge.net/; description = "Signal-registration and routing infrastructure for use in multiple contexts"; @@ -19655,11 +19878,11 @@ in modules // { pysocks = buildPythonPackage rec { name = "pysocks-${version}"; - version = "1.5.0"; + version = "1.5.7"; src = pkgs.fetchurl { url = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz"; - sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk"; + sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"; }; doCheck = false; @@ -20250,8 +20473,8 @@ in modules // { preConfigure = '' cd Source - python setup.py backport - python setup.py configure \ + ${python.interpreter} setup.py backport + ${python.interpreter} setup.py configure \ --apr-inc-dir=${pkgs.apr.dev}/include \ --apu-inc-dir=${pkgs.aprutil.dev}/include \ --apr-lib-dir=${pkgs.apr.out}/lib \ @@ -20264,6 +20487,8 @@ in modules // { checkPhase = "make -C ../Tests"; + disabled = isPy3k; + installPhase = '' dest=$(toPythonPath $out)/pysvn mkdir -p $dest @@ -20504,11 +20729,11 @@ in modules // { pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.11"; + name = "PyYAML-3.12"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; + sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s"; }; buildInputs = with self; [ pkgs.pyrex ]; @@ -21296,6 +21521,25 @@ in modules // { }; }; + rootpy = buildPythonPackage rec { + version = "0.8.3"; + name = "rootpy-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz"; + sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ]; + + meta = { + homepage = "http://www.rootpy.org"; + license = licenses.gpl3; + description = "Pythonic interface to the ROOT framework"; + }; + }; rope = buildPythonPackage rec { version = "0.10.2"; @@ -22667,6 +22911,28 @@ in modules // { }; }; + scales = buildPythonPackage rec { + name = "scales-${version}"; + version = "1.0.9"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/scales/${name}.tar.gz"; + sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + }; + + buildInputs = with self; optionals doCheck [ nose ]; + # No tests included + doCheck = false; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "Stats for Python processes"; + homepage = https://www.github.com/Cue/scales; + license = licenses.asl20; + }; + }; + secp256k1 = buildPythonPackage rec { name = "secp256k1-${version}"; version = "0.12.1"; @@ -22802,7 +23068,7 @@ in modules // { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -22918,10 +23184,10 @@ in modules // { sphinx = buildPythonPackage (rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.3.6"; + version = "1.4.6"; src = pkgs.fetchurl { url = "mirror://pypi/S/${pname}/${name}.tar.gz"; - sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; + sha256 = "1lvr39ab5sjp894jshk39xidlxw9vc735882cgcfr4dlm4546hwy"; }; LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales ]; @@ -24353,10 +24619,10 @@ in modules // { twisted = buildPythonPackage rec { name = "Twisted-${version}"; - version = "16.4.0"; + version = "16.4.1"; src = pkgs.fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "cd8820901900542d21fb1dee2cd4d4d334fff130e3fc30b777f81dd7d7f2836e"; + sha256 = "1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816"; }; propagatedBuildInputs = with self; [ zope_interface ]; @@ -25114,14 +25380,19 @@ in modules // { }; willie = buildPythonPackage rec { - name = "willie-5.2.0"; + name = "willie-${version}"; + version = "5.5.1"; src = pkgs.fetchurl { - url = "mirror://pypi/w/willie/willie-5.2.0.tar.gz"; - sha256 = "2da2e91b65c471b4c8e5e5e11471b25887635258d24aaf76b5354147b3ab577d"; + url = "mirror://pypi/w/willie/${name}.tar.gz"; + sha256 = "e03dd26ea694b877a2b3b7b4dcca8e79420e7f346abab34292bff43d992a8cc5"; }; - propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + buildInputs = with self; [ pytest modules.sqlite3 ]; + propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname ]; + checkPhase = '' + py.test test + ''; meta = { description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; @@ -26068,7 +26339,7 @@ in modules // { name = "tornado-${version}"; version = "4.4.1"; - propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname_3_4_0_2 certifi singledispatch ]; + propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -26178,7 +26449,8 @@ in modules // { }; - libarchive = buildPythonPackage rec { + libarchive = self.python-libarchive; # The latter is the name upstream uses + python-libarchive = buildPythonPackage rec { version = "3.1.2-1"; name = "libarchive-${version}"; disabled = isPy3k; @@ -26188,23 +26460,30 @@ in modules // { sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; }; - propagatedBuildInputs = with self; [ pkgs.libarchive ]; + propagatedBuildInputs = with self; [ pkgs.libarchive.lib ]; + meta.broken = true; }; libarchive-c = buildPythonPackage rec { - name = "libarchive-c-2.1"; + name = "libarchive-c-${version}"; + version = "2.5"; src = pkgs.fetchurl { url = "mirror://pypi/l/libarchive-c/${name}.tar.gz"; - sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n"; + sha256 = "98660daa2501d2da51ab6f39893dc24e88916e72b2d80c205641faa5bce66859"; }; - patchPhase = '' + LC_ALL="en_US.UTF-8"; + + postPatch = '' substituteInPlace libarchive/ffi.py --replace \ - "find_library('archive')" "'${pkgs.libarchive}/lib/libarchive.so'" + "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'" + ''; + checkPhase = '' + py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip' ''; - buildInputs = [ pkgs.libarchive ]; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; pybrowserid = buildPythonPackage rec { @@ -27013,15 +27292,16 @@ in modules // { searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "030qkrsj4as9anr8xfpk5n41qzg7w4yyjasb4cqislvyl1l1dvvs"; + sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; }; + patches = [ ../development/python-modules/searx.patch ]; postPatch = '' substituteInPlace requirements.txt \ --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \ @@ -27031,14 +27311,14 @@ in modules // { propagatedBuildInputs = with self; [ pyyaml lxml_3_5 grequests flaskbabel flask requests2 gevent speaklater Babel pytz dateutil pygments_2_0 - pyasn1 pyasn1-modules ndg-httpsclient certifi + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz ]; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; }; }; @@ -27140,47 +27420,8 @@ in modules // { }; }; - udiskie = buildPythonPackage rec { - version = "1.4.8"; - name = "udiskie-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; - sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl"; - }; - - preConfigure = '' - export XDG_RUNTIME_DIR=/tmp - ''; - - buildInputs = [ - pkgs.asciidoc-full # For building man page. - ]; - - propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; - - postBuild = "make -C doc"; - - postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ - ''; - - preFixup = '' - wrapProgram "$out/bin/"* \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - - # tests require dbusmock - doCheck = false; - - meta = { - description = "Removable disk automounter for udisks"; - license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; - maintainers = with maintainers; [ AndersonTorres ]; - }; - }; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = pkgs.udiskie.override { pythonPackages = self; }; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { @@ -28235,6 +28476,9 @@ in modules // { sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"; }; + #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 + doCheck = !isPy3k; + meta = { description = "PEG parser interpreter in Python"; homepage = http://fdik.org/pyPEG; @@ -28416,11 +28660,11 @@ in modules // { pafy = buildPythonPackage rec { name = "pafy-${version}"; - version = "0.5.0"; + version = "0.5.2"; src = pkgs.fetchurl { url = "mirror://pypi/p/pafy/${name}.tar.gz"; - sha256 = "1q699dcnq34nfgm0bg8mp5krhzk9cyirqdcadhs9al4fa5410igw"; + sha256 = "1ckvrypyvb7jbqlgwdz0y337ajagjv7dgxyns326nqwypn1wpq0i"; }; # No tests included in archive @@ -29115,16 +29359,23 @@ in modules // { scrapy = buildPythonPackage rec { name = "Scrapy-${version}"; - version = "1.0.5"; + version = "1.1.2"; - disabled = isPy3k; + buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ]; + propagatedBuildInputs = with self; [ + six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + ]; - buildInputs = with self ; [ pytest ]; - propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ]; + LC_ALL="en_US.UTF-8"; + + checkPhase = '' + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py + # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + ''; src = pkgs.fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96"; + sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4"; }; meta = { @@ -29880,8 +30131,8 @@ in modules // { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; }; - buildInputs = with self; [ unittest2 mock pytest txaio trollius ]; - propagatedBuildInputs = with self; [ six twisted ]; + buildInputs = with self; [ unittest2 mock pytest trollius ]; + propagatedBuildInputs = with self; [ six twisted txaio ]; checkPhase = '' py.test $out ''; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 430c03f51909..ad7d07f44cce 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -39,7 +39,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; dhcp = linux; diffutils = all; e2fsprogs = linux; - emacs24 = gtkSupported; + emacs25 = gtkSupported; enscript = all; file = all; findutils = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 160c19b1d859..d3fb4e646c3b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -90,7 +90,7 @@ let # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 - #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg; + #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg; #rPackages = packagePlatforms pkgs.rPackages; ocamlPackages = { }; perlPackages = { }; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 815ad81dc1e7..f564c67e0d2c 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-08-23"; - rev = "e98ce679ed90bb5b8a64ad9f5bd82f87fd6b641f"; - sha256 = "0dpl071ic3ddknsy98dxm99mznlblhmgjqi9ha6rlbldbjp3gf8j"; + version = "2016-09-20"; + rev = "cf9c8ccb2c7d753491fc26c64b717bb895d0b4ef"; + sha256 = "02fq0f2zc9qhxs7h110g9ndrvmys26kp9hi93gq9vqhcizq2ici3"; src = fetchFromGitHub { inherit rev; |